Changeset 13453

Timestamp:

2020-09-08T12:38:36+02:00 (4 years ago)

Author:

dford

Message:

Move more DA calls due to FABM changes.

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC

Files:

• nemogcm.F90 (modified) (2 diffs)
• step.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
+          !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
 
 #if defined key_agrif
@@ -497 +497 @@
 
       !                                     ! 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
+!      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
 
       IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler

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

@@ -98 +98 @@
                       IF ( lk_fabm ) CALL nemo_fabm_start
                       CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
+         IF( lk_asminc ) THEN 
+#if defined key_shelf
+            CALL  zdf_mxl_tref()     ! Initialization of hmld_tref
+#endif 
+            CALL asm_inc_init     ! Initialize assimilation increments 
+            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
                       CALL dia_tmb_init  ! TMB outputs
                       CALL dia_25h_init  ! 25h mean  outputs