Changeset 7953 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2017-04-23T09:30:41+02:00 (7 years ago)

Author:

gm

Message:

#1880 (HPC-09): add zdfphy (the ZDF manager) + remove all key_...

File:

• branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (6 diffs)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -55 +55 @@
    USE ldfdyn         ! lateral viscosity setting      (ldfdyn_init routine)
    USE ldftra         ! lateral diffusivity setting    (ldftra_init routine)
-   USE zdfini         ! vertical physics setting          (zdf_init routine)
+!!gm   USE zdfphy         ! vertical physics manager      (zdf_phy_init routine)
    USE trdini         ! dyn/tra trends initialization     (trd_init routine)
    USE asminc         ! assimilation increments     
@@ -429 +429 @@
       IF( ln_ctl        )   CALL prt_ctl_init   ! Print control
       
-      CALL diurnal_sst_bulk_init            ! diurnal sst
+      CALL diurnal_sst_bulk_init             ! diurnal sst
       IF ( ln_diurnal ) CALL diurnal_sst_coolskin_init   ! cool skin   
       
@@ -455 +455 @@
                             CALL     sbc_init   ! surface boundary conditions (including sea-ice)
                             CALL     bdy_init   ! Open boundaries initialisation
+
       !                                      ! Ocean physics
-      !                                         ! Vertical physics
-                            CALL     zdf_init      ! namelist read
-                            CALL zdf_bfr_init      ! bottom friction
-      IF( lk_zdfric     )   CALL zdf_ric_init      ! Richardson number dependent Kz
-      IF( lk_zdftke     )   CALL zdf_tke_init      ! TKE closure scheme
-      IF( lk_zdfgls     )   CALL zdf_gls_init      ! GLS closure scheme
-      IF( lk_zdftmx     )   CALL zdf_tmx_init      ! tidal vertical mixing
-!!gm      IF( ln_zdfddm     )   CALL zdf_ddm_init      ! double diffusive mixing
-         
+                            CALL zdf_phy_init   ! Vertical physics
+                                     
       !                                         ! Lateral physics
                             CALL ldf_tra_init      ! Lateral ocean tracer physics
@@ -470 +464 @@
                             CALL ldf_dyn_init      ! Lateral ocean momentum physics
 
-      !                                         ! Active tracers
+      !                                      ! Active tracers
                             CALL tra_qsr_init      ! penetrative solar radiation qsr
                             CALL tra_bbc_init      ! bottom heat flux
@@ -479 +473 @@
                             CALL tra_zdf_init      ! vertical mixing and after tracer fields
 
-      !                                         ! Dynamics
+      !                                      ! Dynamics
       IF( lk_c1d        )   CALL dyn_dmp_init      ! internal momentum damping
                             CALL dyn_adv_init      ! advection (vector or flux form)
@@ -511 +505 @@
       IF( ln_diaobs     )   CALL dia_obs( nit000 - 1 )   ! Observation operator for restart
 
-      !                                         ! Assimilation increments
+      !                                      ! Assimilation increments
       IF( lk_asminc     )   CALL asm_inc_init   ! Initialize assimilation increments
       IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler