Changeset 15274

Timestamp:

2021-09-21T12:12:29+02:00 (3 years ago)

Author:

jwhile

Message:

Update per Rob's review

File:

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

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

@@ -151 +151 @@
       istp = nit000
 
+#if defined key_c1d
+
+      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
+         ENDIF
+      ENDIF
+
+      DO WHILE ( istp <= nitend .AND. nstop == 0 )
+         CALL stp_c1d( istp )
+         istp = istp + 1
+      END DO
+#else
+
       IF( lk_asminc ) THEN
          IF( ln_bkgwri ) CALL asm_bkg_wri( nit000 - 1 )    ! Output background fields
@@ -160 +175 @@
          ENDIF
       ENDIF
-
-#if defined key_c1d
-      DO WHILE ( istp <= nitend .AND. nstop == 0 )
-         CALL stp_c1d( istp )
-         istp = istp + 1
-      END DO
-#else
 
 #if defined key_agrif