Changeset 13462

Timestamp:

2020-09-14T16:59:38+02:00 (4 years ago)

Author:

dford

Message:

Tidy up.

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC

Files:

• nemogcm.F90 (modified) (2 diffs)
• step.F90 (modified) (2 diffs)
• step_oce.F90 (modified) (1 diff)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -158 +158 @@
          END DO
 #else
-          !IF( lk_asminc ) THEN
-          !   IF( ln_bkgwri ) CALL asm_bkg_wri( nit000 - 1 )    ! Output background fields
-          !   IF( ln_asmdin ) THEN                        ! Direct initialization
-          !      IF( ln_trainc ) CALL tra_asm_inc( nit000 - 1 )    ! Tracers
-          !      IF( ln_dyninc ) CALL dyn_asm_inc( nit000 - 1 )    ! Dynamics
-          !      IF( ln_sshinc ) CALL ssh_asm_inc( nit000 - 1 )    ! SSH
-          !      IF( lk_bgcinc ) CALL bgc_asm_inc( nit000 - 1 )    ! BGC
-          !   ENDIF
-          !ENDIF
+          ! Initial call to assimilation routines moved to stp
 
 #if defined key_agrif
@@ -493 +485 @@
       IF( lk_diaobs     ) THEN                  ! Observation & model comparison
                             CALL dia_obs_init            ! Initialize observational data
-                            !CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
-      ENDIF
-
-      !                                     ! Assimilation increments
-!      IF( lk_asminc ) THEN 
-!#if defined key_shelf 
-!         CALL  zdf_mxl_tref()     ! Initialization of hmld_tref
-!#endif 
-!         CALL asm_inc_init     ! Initialize assimilation increments 
-!      ENDIF
+                            ! Initial call to dia_obs moved to stp
+      ENDIF
+
+      ! Initialisation of assimilation moved to stp
 
       IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler
-                            !CALL dia_tmb_init  ! TMB outputs
-                            !CALL dia_25h_init  ! 25h mean  outputs
-                            !CALL dia_diaopfoam_init  ! FOAM operational output
+      
+      ! Initialisation of tmb/25h/diaopfoam outputs moved to stp
+      
       !
    END SUBROUTINE nemo_init

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -96 +96 @@
                       CALL iom_init(      cxios_context          )  ! iom_put initialization
          IF( ln_crs ) CALL iom_init( TRIM(cxios_context)//"_crs" )  ! initialize context for coarse grid
-                      IF ( lk_fabm ) CALL nemo_fabm_start
-                      CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
+         
+#if defined key_fabm
+         ! FABM can only finish initialising once IOM has
+         IF ( lk_fabm ) CALL nemo_fabm_start
+#endif
+         
+         ! First call to dia_* and asm_inc_init must wait for FABM to be initialised
+         ! (if running with FABM, but no harm moving the calls to here from nemo_init either way)
+         CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
+         
          IF( lk_asminc ) THEN 
 #if defined key_shelf
@@ -111 +119 @@
             ENDIF
          ENDIF
-                      CALL dia_tmb_init  ! TMB outputs
-                      CALL dia_25h_init  ! 25h mean  outputs
-                      CALL dia_diaopfoam_init  ! FOAM operational output
+         
+         CALL dia_tmb_init        ! TMB outputs
+         CALL dia_25h_init        ! 25h mean  outputs
+         CALL dia_diaopfoam_init  ! FOAM operational output
       ENDIF
 

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -127 +127 @@
 #endif
 #if defined key_fabm
-   USE par_fabm, ONLY: lk_fabm
-   USE trcsms_fabm, ONLY: nemo_fabm_start
+   USE par_fabm, ONLY: &    ! FABM parameters
+      & lk_fabm
+   USE trcsms_fabm, ONLY: & ! FABM routines
+      & nemo_fabm_start
 #endif
    USE diatmb          ! Top,middle,bottom output