Changeset 13489 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1_v2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2020-09-17T19:13:57+02:00 (4 years ago)

Author:

dford

Message:

Merge in previous branch.

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1_v2/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (2 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1_v2/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