Changeset 11142 for NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src

Timestamp:

2019-06-19T18:15:06+02:00 (5 years ago)

Author:

agn

Message:

diahth now initilaized after iom_init

Location:

NEMO/branches/2019/dev_r11078_OSMOSIS_IMMERSE_Nurser/src/OCE

Files:

• C1D/step_c1d.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (1 diff)
• step.F90 (modified) (1 diff)

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

@@ -58 +58 @@
 
                              indic = 0                ! reset to no error condition
-      IF( kstp == nit000 )   CALL iom_init( "nemo")   ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS)
+                             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 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/nemogcm.F90

@@ -485 +485 @@
       IF( lk_diadct    )   CALL dia_dct_init    ! Sections tranports
                            CALL dia_hsb_init    ! heat content, salt content and volume budgets
-                           CALL dia_hth_init    ! extra ML depth diagnostics, thermocline depths
                            CALL     trd_init    ! Mixed-layer/Vorticity/Integral constraints trends
                            CALL dia_obs_init    ! Initialize observational data

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

@@ -101 +101 @@
       IF( kstp == nit000 ) THEN                       ! initialize IOM context (must be done after nemo_init for AGRIF+XIOS+OASIS)
                              CALL iom_init(      cxios_context          )  ! for model grid (including passible AGRIF zoom)
-         IF( ln_crs      )   CALL iom_init( TRIM(cxios_context)//"_crs" )  ! for coarse grid
+                             IF( ln_crs      )   CALL iom_init( TRIM(cxios_context)//"_crs" )  ! for coarse grid
+                             CALL dia_hth_init    ! extra ML depth diagnostics, thermocline depths
       ENDIF
       IF( kstp /= nit000 )   CALL day( kstp )         ! Calendar (day was already called at nit000 in day_init)