Changeset 13462 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

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

Author:

dford

Message:

Tidy up.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (2 diffs)

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