Changeset 13255 for NEMO/releases/r4.0/r4.0-HEAD/src/OCE/STO

Timestamp:

2020-07-06T17:41:29+02:00 (4 years ago)

Author:

acc

Message:

r4.0-HEAD minor changes to satisfy namelist integrity checks. See #2486 and wiki:Developers/NamelistChecker for details. Fully SETTE tested

File:

• NEMO/releases/r4.0/r4.0-HEAD/src/OCE/STO/stopar.F90 (modified) (2 diffs)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/STO/stopar.F90

@@ -245 +245 @@
       !! ** Purpose :   define the stochastic parameterization
       !!----------------------------------------------------------------------
-      NAMELIST/namsto/ ln_sto_ldf, rn_ldf_std, rn_ldf_tcor, &
-        &              ln_sto_hpg, rn_hpg_std, rn_hpg_tcor, &
-        &              ln_sto_pstar, rn_pstar_std, rn_pstar_tcor, nn_pstar_flt, nn_pstar_ord, &
-        &              ln_sto_trd, rn_trd_std, rn_trd_tcor, &
-        &              ln_sto_eos, nn_sto_eos, rn_eos_stdxy, rn_eos_stdz, &
-        &              rn_eos_tcor, nn_eos_ord, nn_eos_flt, rn_eos_lim, &
-        &              ln_sto_trc, nn_sto_trc, rn_trc_stdxy, rn_trc_stdz, &
-        &              rn_trc_tcor, nn_trc_ord, nn_trc_flt, rn_trc_lim, &
+      ! stochastic equation of state only (for now)
+      NAMELIST/namsto/ ln_sto_eos, nn_sto_eos, rn_eos_stdxy, rn_eos_stdz, &
+        &              rn_eos_tcor, nn_eos_ord, nn_eos_flt, rn_eos_lim,   &
         &              ln_rststo, ln_rstseed, cn_storst_in, cn_storst_out
+      !NAMELIST/namsto/ ln_sto_ldf, rn_ldf_std, rn_ldf_tcor, &
+      !  &              ln_sto_hpg, rn_hpg_std, rn_hpg_tcor, &
+      !  &              ln_sto_pstar, rn_pstar_std, rn_pstar_tcor, nn_pstar_flt, nn_pstar_ord, &
+      !  &              ln_sto_trd, rn_trd_std, rn_trd_tcor, &
+      !  &              ln_sto_trc, nn_sto_trc, rn_trc_stdxy, rn_trc_stdz, &
+      !  &              rn_trc_tcor, nn_trc_ord, nn_trc_flt, rn_trc_lim
       !!----------------------------------------------------------------------
       INTEGER :: jsto, jmem, jarea, jdof, jord, jordm1, jk, jflt
@@ -261 +262 @@
 
       ! Read namsto namelist : stochastic parameterization
-      REWIND( numnam_ref )              ! Namelist namdyn_adv in reference namelist : Momentum advection scheme
+      REWIND( numnam_ref )              ! Namelist namsto in reference namelist : stochastic parameterization
       READ  ( numnam_ref, namsto, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsto in reference namelist' )
 
-      REWIND( numnam_cfg )              ! Namelist namdyn_adv in configuration namelist : Momentum advection scheme
+      REWIND( numnam_cfg )              ! Namelist namsto in configuration namelist : stochastic parameterization
       READ  ( numnam_cfg, namsto, IOSTAT = ios, ERR = 902 )
 902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namsto in configuration namelist' )