Changeset 10922 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/nemogcm.F90

Timestamp:

2019-05-02T17:10:39+02:00 (5 years ago)

Author:

acc

Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Convert IOM, LDF, OBS and SBC directories and compatibility changes elsewhere that these changes enforce. Changes pass SETTE and compare with original trunk results. Outstanding issues (currently with work-arounds) in DIU/step_diu.F90 and fld_bdy_interp within SBC/fldread.F90; proper soltions pending

File:

• NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/nemogcm.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/nemogcm.F90

@@ -428 +428 @@
       !                            
       IF( ln_diurnal_only ) THEN                   ! diurnal only: a subset of the initialisation routines
-         CALL  istate_init                            ! ocean initial state (Dynamics and tracers)
-         CALL     sbc_init                            ! Forcings : surface module
+         CALL  istate_init( Nbb, Nnn )                ! ocean initial state (Dynamics and tracers)
+         CALL     sbc_init( Nbb, Nnn )                ! Forcings : surface module
          CALL tra_qsr_init                            ! penetrative solar radiation qsr
          IF( ln_diaobs ) THEN                         ! Observation & model comparison
-            CALL dia_obs_init                            ! Initialize observational data
-            CALL dia_obs( nit000 - 1 )                   ! Observation operator for restart
+            CALL dia_obs_init( Nnn )                     ! Initialize observational data
+            CALL dia_obs( nit000 - 1, Nnn )              ! Observation operator for restart
          ENDIF     
          IF( lk_asminc )   CALL asm_inc_init          ! Assimilation increments
@@ -440 +440 @@
       ENDIF
       
-                           CALL  istate_init    ! ocean initial state (Dynamics and tracers)
+                           CALL  istate_init( Nbb, Nnn ) ! ocean initial state (Dynamics and tracers)
 
       !                                      ! external forcing 
-                           CALL    tide_init    ! tidal harmonics
-                           CALL     sbc_init    ! surface boundary conditions (including sea-ice)
-                           CALL     bdy_init    ! Open boundaries initialisation
+                           CALL    tide_init             ! tidal harmonics
+                           CALL     sbc_init( Nbb, Nnn ) ! surface boundary conditions (including sea-ice)
+                           CALL     bdy_init             ! Open boundaries initialisation
 
       !                                      ! Ocean physics
@@ -491 +491 @@
                            CALL dia_hsb_init    ! heat content, salt content and volume budgets
                            CALL     trd_init    ! Mixed-layer/Vorticity/Integral constraints trends
-                           CALL dia_obs_init    ! Initialize observational data
+                           CALL dia_obs_init( Nnn )        ! Initialize observational data
                            CALL dia_tmb_init    ! TMB outputs
                            CALL dia_25h_init    ! 25h mean  outputs
-      IF( ln_diaobs    )   CALL dia_obs( nit000-1 )   ! Observation operator for restart
+      IF( ln_diaobs    )   CALL dia_obs( nit000-1, Nnn )   ! Observation operator for restart
 
       !                                      ! Assimilation increments