Changeset 12934 for NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser

Timestamp:

2020-05-15T11:05:29+02:00 (4 years ago)

Author:

smueller

Message:

Correction of the synchronization with ^{/NEMO/trunk@12925 (ticket #2170)}

Location:

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser

Files:

• cfgs/SHARED/grid_def_nemo.xml (modified) (1 diff)
• src/OCE/C1D/step_c1d.F90 (modified) (1 diff)
• src/OCE/step.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/cfgs/SHARED/grid_def_nemo.xml

@@ -343 +343 @@
          </scalar>
        </grid>
-     </grid_definition>
 
       <!-- ABL grid definition -->

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/C1D/step_c1d.F90

@@ -60 +60 @@
 
                              indic = 0                ! reset to no error condition
-                             IF( kstp == nit000 )   THEN
-                                CALL iom_init( "nemo")   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
-                                CALL dia_hth_init    ! extra ML depth diagnostics, thermocline depths
-                             END IF
+      IF( kstp == nit000 )   CALL iom_init( "nemo")   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
       IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init)
                              CALL iom_setkt( kstp - nit000 + 1, "nemo" )   ! say to iom that we are at time step kstp

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE/step.F90

@@ -121 +121 @@
          IF( lk_diamlr   )   CALL dia_mlr_iom_init    ! with additional setup for multiple-linear-regression analysis
                              CALL iom_init_closedef
-                             IF( ln_crs      )   CALL iom_init( TRIM(cxios_context)//"_crs" )  ! for coarse grid
-                             CALL dia_hth_init    ! extra ML depth diagnostics, thermocline depths
+         IF( ln_crs      )   CALL iom_init( TRIM(cxios_context)//"_crs" )  ! for coarse grid
       ENDIF
       IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init)