Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/1_namelist_cfg (revision 9526)
@@ -10,6 +10,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!!======================================================================
@@ -38,5 +38,5 @@
/
!-----------------------------------------------------------------------
-&namtsd ! Temperature & Salinity Data (default: NO)
+&namtsd ! Temperature & Salinity Data (default: OFF)
!-----------------------------------------------------------------------
! with AGRIF ("key_agrif") child are initialized with parent values
@@ -133,8 +133,8 @@
!! namlbc lateral momentum boundary condition (no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -162,5 +162,5 @@
/
!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
+&nambbc ! bottom temperature boundary condition (default: OFF)
!-----------------------------------------------------------------------
ln_trabbc = .true. ! Apply a geothermal heating at the ocean bottom
@@ -168,5 +168,5 @@
/
!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
+&nambbl ! bottom boundary layer scheme (default: OFF)
!-----------------------------------------------------------------------
ln_trabbl = .true. ! Bottom Boundary Layer parameterisation flag
@@ -182,8 +182,8 @@
!! nameos equation of state (default: NO selection)
!! namtra_adv advection scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -200,5 +200,5 @@
/
!-----------------------------------------------------------------------
-&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: NO)
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: OFF)
!-----------------------------------------------------------------------
ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation
@@ -207,13 +207,13 @@
&namtra_ldf ! lateral diffusion scheme for tracers (default: NO selection)
!-----------------------------------------------------------------------
- ln_traldf_NONE = .true. ! No operator (no explicit advection)
-/
-!-----------------------------------------------------------------------
-&namtra_eiv ! eddy induced velocity param. (default: NO)
+ ln_traldf_OFF = .true. ! No operator (no explicit advection)
+/
+!-----------------------------------------------------------------------
+&namtra_eiv ! eddy induced velocity param. (default: OFF)
!-----------------------------------------------------------------------
! not used in this zoom
/
!-----------------------------------------------------------------------
-&namtra_dmp ! tracer: T & S newtonian damping (default: NO)
+&namtra_dmp ! tracer: T & S newtonian damping (default: OFF)
!-----------------------------------------------------------------------
! not used in this zoom
@@ -259,5 +259,5 @@
&namdyn_ldf ! lateral diffusion on momentum (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
/
@@ -302,14 +302,14 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
@@ -319,5 +319,5 @@
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/2_namelist_cfg (revision 9526)
@@ -10,6 +10,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!!======================================================================
@@ -38,5 +38,5 @@
/
!-----------------------------------------------------------------------
-&namtsd ! Temperature & Salinity Data (default: NO)
+&namtsd ! Temperature & Salinity Data (default: OFF)
!-----------------------------------------------------------------------
! with AGRIF ("key_agrif") child are initialized with parent values
@@ -133,8 +133,8 @@
!! namlbc lateral momentum boundary condition (no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -162,5 +162,5 @@
/
!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
+&nambbc ! bottom temperature boundary condition (default: OFF)
!-----------------------------------------------------------------------
ln_trabbc = .true. ! Apply a geothermal heating at the ocean bottom
@@ -168,5 +168,5 @@
/
!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
+&nambbl ! bottom boundary layer scheme (default: OFF)
!-----------------------------------------------------------------------
ln_trabbl = .true. ! Bottom Boundary Layer parameterisation flag
@@ -182,8 +182,8 @@
!! nameos equation of state (default: NO selection)
!! namtra_adv advection scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -200,5 +200,5 @@
/
!-----------------------------------------------------------------------
-&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: NO)
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: OFF)
!-----------------------------------------------------------------------
ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation
@@ -207,13 +207,13 @@
&namtra_ldf ! lateral diffusion scheme for tracers (default: NO selection)
!-----------------------------------------------------------------------
- ln_traldf_NONE = .true. ! No operator (no explicit advection)
-/
-!-----------------------------------------------------------------------
-&namtra_eiv ! eddy induced velocity param. (default: NO)
+ ln_traldf_OFF = .true. ! No operator (no explicit advection)
+/
+!-----------------------------------------------------------------------
+&namtra_eiv ! eddy induced velocity param. (default: OFF)
!-----------------------------------------------------------------------
! not used in this zoom
/
!-----------------------------------------------------------------------
-&namtra_dmp ! tracer: T & S newtonian damping (default: NO)
+&namtra_dmp ! tracer: T & S newtonian damping (default: OFF)
!-----------------------------------------------------------------------
! not used in this zoom
@@ -259,5 +259,5 @@
&namdyn_ldf ! lateral diffusion on momentum (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
/
@@ -302,14 +302,14 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
@@ -319,5 +319,5 @@
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AGRIF_NORDIC/EXP00/namelist_cfg (revision 9526)
@@ -10,6 +10,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!!======================================================================
@@ -40,5 +40,5 @@
/
!-----------------------------------------------------------------------
-&namtsd ! Temperature & Salinity Data (default: NO)
+&namtsd ! Temperature & Salinity Data (default: OFF)
!-----------------------------------------------------------------------
! ! =T read T-S fields for:
@@ -160,8 +160,8 @@
!! namlbc lateral momentum boundary condition (no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -175,4 +175,15 @@
!-----------------------------------------------------------------------
/
+
+!!======================================================================
+!! *** Top/Bottom boundary condition *** !!
+!! !!
+!! namdrg top/bottom drag coefficient (default: NO selection)
+!! namdrg_top top friction (ln_OFF=F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF=F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
+!!======================================================================
+!
!-----------------------------------------------------------------------
&namdrg ! top/bottom drag coefficient (default: NO selection)
@@ -185,5 +196,5 @@
/
!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
+&nambbc ! bottom temperature boundary condition (default: OFF)
!-----------------------------------------------------------------------
ln_trabbc = .true. ! Apply a geothermal heating at the ocean bottom
@@ -197,5 +208,5 @@
/
!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
+&nambbl ! bottom boundary layer scheme (default: OFF)
!-----------------------------------------------------------------------
ln_trabbl = .true. ! Bottom Boundary Layer parameterisation flag
@@ -211,8 +222,8 @@
!! nameos equation of state (default: NO selection)
!! namtra_adv advection scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -230,5 +241,5 @@
/
!-----------------------------------------------------------------------
-&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: NO)
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: OFF)
!-----------------------------------------------------------------------
ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation
@@ -250,5 +261,5 @@
/
!-----------------------------------------------------------------------
-&namtra_eiv ! eddy induced velocity param. (default: NO)
+&namtra_eiv ! eddy induced velocity param. (default: OFF)
!-----------------------------------------------------------------------
ln_ldfeiv =.true. ! use eddy induced velocity parameterization
@@ -263,5 +274,5 @@
/
!-----------------------------------------------------------------------
-&namtra_dmp ! tracer: T & S newtonian damping (default: NO)
+&namtra_dmp ! tracer: T & S newtonian damping (default: OFF)
!-----------------------------------------------------------------------
ln_tradmp = .true. ! add a damping term (using resto.nc coef.)
@@ -355,14 +366,14 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
@@ -372,6 +383,15 @@
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
!
+
+!!======================================================================
+!! *** Miscellaneous namelists *** !!
+!! !!
+!! nammpp Massively Parallel Processing ("key_mpp_mpi")
+!! namctl Control prints (default: OFF)
+!! namsto Stochastic parametrization of EOS (default: OFF)
+!!======================================================================
+!
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg (revision 9526)
@@ -10,6 +10,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!!======================================================================
@@ -140,8 +140,8 @@
!! namlbc lateral momentum boundary condition (no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -152,5 +152,5 @@
/
!-----------------------------------------------------------------------
-&nam_tide ! tide parameters (default: NO)
+&nam_tide ! tide parameters (default: OFF)
!-----------------------------------------------------------------------
ln_tide = .true. ! Activate tides
@@ -174,5 +174,5 @@
/
!-----------------------------------------------------------------------
-&nambdy ! unstructured open boundaries (default: NO)
+&nambdy ! unstructured open boundaries (default: OFF)
!-----------------------------------------------------------------------
ln_bdy = .true. ! Use unstructured open boundaries
@@ -211,8 +211,8 @@
!! !!
!! namdrg top/bottom drag coefficient (default: NO selection)
-!! namdrg_top top friction (ln_NONE=F & ln_isfcav=T)
-!! namdrg_bot bottom friction (ln_NONE=F)
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! namdrg_top top friction (ln_OFF =F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF =F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -238,7 +238,7 @@
!! namtra_adv advection scheme (default: NO selection)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -347,14 +347,14 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
@@ -374,5 +374,5 @@
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def.xml (revision 9525)
+++ (revision )
@@ -1,1 +1,0 @@
-link ../../SHARED/domain_def.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def_nemo.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def_nemo.xml (revision 9526)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/domain_def_nemo.xml (revision 9526)
@@ -0,0 +1,1 @@
+link ../../SHARED/domain_def_nemo.xml
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def.xml (revision 9525)
+++ (revision )
@@ -1,1 +1,0 @@
-link ../../SHARED/field_def.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def_nemo-opa.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def_nemo-opa.xml (revision 9526)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/field_def_nemo-opa.xml (revision 9526)
@@ -0,0 +1,1 @@
+link ../../SHARED/field_def_nemo-opa.xml
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/C1D_PAPA/EXP00/namelist_cfg (revision 9526)
@@ -9,6 +9,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!! namc1d 1D configuration options ("key_c1d")
@@ -82,13 +82,13 @@
/
!-----------------------------------------------------------------------
-&namc1d_uvd ! data: U & V currents ("key_c1d" default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d_dyndmp ! U & V newtonian damping ("key_c1d" default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtsd ! Temperature & Salinity Data (default: NO)
+&namc1d_uvd ! data: U & V currents ("key_c1d" default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namc1d_dyndmp ! U & V newtonian damping ("key_c1d" default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namtsd ! Temperature & Salinity Data (default: OFF)
!-----------------------------------------------------------------------
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
@@ -172,10 +172,10 @@
&namtra_adv ! advection scheme for tracer (default: NO selection)
!-----------------------------------------------------------------------
- ln_traadv_NONE= .true. ! No tracer advection
+ ln_traadv_OFF = .true. ! No tracer advection
/
!-----------------------------------------------------------------------
&namtra_ldf ! lateral diffusion scheme for tracers
!-----------------------------------------------------------------------
- ln_traldf_NONE= .true. ! No operator (no explicit diffusion)
+ ln_traldf_OFF = .true. ! No operator (no explicit diffusion)
/
@@ -191,5 +191,5 @@
&namdyn_adv ! formulation of the momentum advection (default: selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .true. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .true. ! linear dynamics (no momentum advection)
/
!-----------------------------------------------------------------------
@@ -203,5 +203,5 @@
/
!-----------------------------------------------------------------------
-&namdyn_spg ! surface pressure gradient (default: NO)
+&namdyn_spg ! surface pressure gradient (default: OFF)
!-----------------------------------------------------------------------
/
@@ -209,5 +209,5 @@
&namdyn_ldf ! lateral diffusion on momentum
!-----------------------------------------------------------------------
- ln_dynldf_NONE= .true. ! No operator (no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (no explicit diffusion)
/
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg (revision 9526)
@@ -9,6 +9,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!! namc1d 1D configuration options ("key_c1d")
@@ -86,8 +86,8 @@
!! namlbc lateral momentum boundary condition (default: no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -96,8 +96,8 @@
!! !!
!! namdrg top/bottom drag coefficient (default: NO selection)
-!! namdrg_top top friction (ln_NONE=F & ln_isfcav=T)
-!! namdrg_bot bottom friction (ln_NONE=F)
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! namdrg_top top friction (ln_OFF=F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF=F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -114,7 +114,7 @@
!! namtra_adv advection scheme (default: NO selection)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -217,14 +217,14 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
@@ -233,5 +233,5 @@
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (revision 9526)
@@ -9,6 +9,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!! namc1d 1D configuration options ("key_c1d")
@@ -86,8 +86,8 @@
!! namlbc lateral momentum boundary condition (default: no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -96,8 +96,8 @@
!! !!
!! namdrg top/bottom drag coefficient (default: NO selection)
-!! namdrg_top top friction (ln_NONE=F & ln_isfcav=T)
-!! namdrg_bot bottom friction (ln_NONE=F)
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! namdrg_top top friction (ln_OFF=F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF=F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -114,7 +114,7 @@
!! namtra_adv advection scheme (default: NO selection)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -217,14 +217,14 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
@@ -233,5 +233,5 @@
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_context_nemo.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_context_nemo.xml (revision 9525)
+++ (revision )
@@ -1,120 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (revision 9525)
+++ (revision )
@@ -1,332 +1,0 @@
-!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-!! NEMO/OPA Configuration namelist : overwrite some defaults values defined in SHARED/1_namelist_ref
-!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-! ORCA2 - SI3 configuration !
-
-!!======================================================================
-!! *** Domain & Run management namelists *** !!
-!! !!
-!! namrun parameters of the run
-!! namdom space and time domain
-!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
-!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&namrun ! parameters of the run
-!-----------------------------------------------------------------------
- cn_exp = "Agulhas" ! experience name
- nn_it000 = 1 ! first time step
- nn_itend = 10950 ! last time step
- nn_stock = 10950 ! frequency of creation of a restart file (modulo referenced to 1)
- nn_write = 10950 ! frequency of write in the output file (modulo referenced to nn_it000)
- nn_istate = 0 ! output the initial state (1) or not (0)
- ln_clobber = .true. ! clobber (overwrite) an existing file
-/
-!-----------------------------------------------------------------------
-&namdom ! time and space domain
-!-----------------------------------------------------------------------
- rn_rdt = 2880. ! time step for the dynamics (and tracer if nn_acc=0)
-/
-!-----------------------------------------------------------------------
-&namcfg ! parameters of the configuration (default: user defined GYRE)
-!-----------------------------------------------------------------------
- ln_read_cfg = .true. ! (=T) read the domain configuration file
- cn_domcfg = "AGRIF_AGULHAS_domain_cfg" ! domain configuration filename
-/
-!-----------------------------------------------------------------------
-&namtsd ! Temperature & Salinity Data (default: NO)
-!-----------------------------------------------------------------------
- ! with AGRIF ("key_agrif") child are initialized with parent values
-/
-
-!!======================================================================
-!! *** Surface Boundary Condition namelists *** !!
-!! !!
-!! namsbc surface boundary condition manager (default: NO selection)
-!! namsbc_flx flux formulation (ln_flx =T)
-!! namsbc_blk Bulk formulae formulation (ln_blk =T)
-!! namsbc_cpl CouPLed formulation ("key_oasis3" )
-!! namsbc_sas Stand-Alone Surface module (SAS_SRC only)
-!! namsbc_iif Ice-IF: use observed ice cover (nn_ice = 1 )
-!! namtra_qsr penetrative solar radiation (ln_traqsr =T)
-!! namsbc_ssr sea surface restoring term (for T and/or S) (ln_ssr =T)
-!! namsbc_rnf river runoffs (ln_rnf =T)
-!! namsbc_apr Atmospheric Pressure (ln_apr_dyn =T)
-!! namsbc_isf ice shelf melting/freezing (ln_isfcav =T : read (ln_read_cfg=T) or set or usr_def_zgr )
-!! namsbc_iscpl coupling option between land ice model and ocean (ln_isfcav =T)
-!! namsbc_wave external fields from wave model (ln_wave =T)
-!! namberg iceberg floats (ln_icebergs=T)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&namsbc ! Surface Boundary Condition (surface module)
-!-----------------------------------------------------------------------
- nn_fsbc = 5 ! frequency of SBC module call
- ln_blk = .true. ! Bulk formulation (T => fill namsbc_blk )
- nn_ice = 0 ! =0 no ice boundary condition
- ln_traqsr = .true. ! Light penetration in the ocean (T => fill namtra_qsr)
- ln_rnf = .false. ! runoffs (T => fill namsbc_rnf)
- ln_ssr = .false. ! Sea Surface Restoring on T and/or S (T => fill namsbc_ssr)
- nn_fwb = 0 ! FreshWater Budget: =0 unchecked
-/
-!-----------------------------------------------------------------------
-&namsbc_blk ! namsbc_blk generic Bulk formula (ln_blk =T)
-!-----------------------------------------------------------------------
- ! ! bulk algorithm :
- ln_NCAR = .true. ! "NCAR" algorithm (Large and Yeager 2008)
-
- cn_dir = './' ! root directory for the bulk data location
- !___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________!
- ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
- sn_wndi = 'u_10.15JUNE2009_fill' , 6 , 'U_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bicubic.nc' , 'Uwnd' , ''
- sn_wndj = 'v_10.15JUNE2009_fill' , 6 , 'V_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bicubic.nc' , 'Vwnd' , ''
- sn_qsr = 'ncar_rad.15JUNE2009_fill' , 24 , 'SWDN_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
- sn_qlw = 'ncar_rad.15JUNE2009_fill' , 24 , 'LWDN_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
- sn_tair = 't_10.15JUNE2009_fill' , 6 , 'T_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
- sn_humi = 'q_10.15JUNE2009_fill' , 6 , 'Q_10_MOD', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
- sn_prec = 'ncar_precip.15JUNE2009_fill', -1 , 'PRC_MOD1', .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
- sn_snow = 'ncar_precip.15JUNE2009_fill', -1 , 'SNOW' , .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
- sn_slp = 'slp.15JUNE2009_fill' , 6 , 'SLP' , .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
- sn_tdif = 'taudif_core' , 24 , 'taudif' , .false. , .true. , 'yearly' , 'weights_core2_agrif_bilinear.nc' , '' , ''
-
-/
-!-----------------------------------------------------------------------
-&namtra_qsr ! penetrative solar radiation (ln_traqsr =T)
-!-----------------------------------------------------------------------
- ! ! type of penetration (default: NO selection)
- ln_qsr_rgb = .true. ! RGB light penetration (Red-Green-Blue)
- !
- nn_chldta = 1 ! RGB : Chl data (=1) or cst value (=0)
-
- cn_dir = './' ! root directory for the chlorophyl data location
- !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
- ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
- sn_chl ='chlorophyll' , -1 , 'CHLA' , .true. , .true. , 'yearly' ,'weights_bilin.nc', '' , ''
-/
-!-----------------------------------------------------------------------
-&namsbc_ssr ! surface boundary condition : sea surface restoring (ln_ssr =T)
-!-----------------------------------------------------------------------
- ! not used in this zoom
-/
-!-----------------------------------------------------------------------
-&namsbc_rnf ! runoffs (ln_rnf =T)
-!-----------------------------------------------------------------------
- ! not used in this zoom
-/
-!-----------------------------------------------------------------------
-&namberg ! iceberg parameters (default: No iceberg)
-!-----------------------------------------------------------------------
- ! iceberg floats are not currently available with AGRIF
- ! ===>> forced deactivation in icbini.F90
-/
-
-!!======================================================================
-!! *** Lateral boundary condition *** !!
-!! !!
-!! namlbc lateral momentum boundary condition (no slip)
-!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
-!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&namagrif ! AGRIF zoom ("key_agrif")
-!-----------------------------------------------------------------------
- ln_spc_dyn = .true. ! use 0 as special value for dynamics
- rn_sponge_tra = 2880. ! coefficient for tracer sponge layer [m2/s]
- rn_sponge_dyn = 2880. ! coefficient for dynamics sponge layer [m2/s]
- ln_chk_bathy = .false. ! =T check the parent bathymetry
-/
-!-----------------------------------------------------------------------
-&namdrg ! top/bottom drag coefficient (default: NO selection)
-!-----------------------------------------------------------------------
- ln_lin = .true. ! linear drag: Cd = Cd0 Uc0
-/
-!-----------------------------------------------------------------------
-&namdrg_bot ! BOTTOM friction
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
-!-----------------------------------------------------------------------
- ln_trabbc = .true. ! Apply a geothermal heating at the ocean bottom
- nn_geoflx = 1 ! geothermal heat flux: = 1 constant flux
-!!gm nn_geoflx = 2 ! geothermal heat flux: = 2 read variable flux [mW/m2]
-
- cn_dir = './' ! root directory for the geothermal data location
- !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
- ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
- sn_qgh ='geothermal_heating.nc' , -12. , 'heatflow', .false. , .true. , 'yearly' ,'weights_bilin.nc', '' , ''
-/
-!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
-!-----------------------------------------------------------------------
- ln_trabbl = .true. ! Bottom Boundary Layer parameterisation flag
- nn_bbl_ldf = 1 ! diffusive bbl (=1) or not (=0)
- nn_bbl_adv = 0 ! advective bbl (=1/2) or not (=0)
- rn_ahtbbl = 1000. ! lateral mixing coefficient in the bbl [m2/s]
- rn_gambbl = 10. ! advective bbl coefficient [s]
-/
-
-!!======================================================================
-!! Tracer (T & S) namelists !!
-!! !!
-!! nameos equation of state (default: NO selection)
-!! namtra_adv advection scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO selection)
-!-----------------------------------------------------------------------
- ln_eos80 = .true. ! = Use EOS80
-/
-!-----------------------------------------------------------------------
-&namtra_adv ! advection scheme for tracer (default: NO selection)
-!-----------------------------------------------------------------------
- ln_traadv_fct = .true. ! FCT scheme
- nn_fct_h = 2 ! =2/4, horizontal 2nd / 4th order
- nn_fct_v = 2 ! =2/4, vertical 2nd / COMPACT 4th order
-/
-!-----------------------------------------------------------------------
-&namtra_ldf ! lateral diffusion scheme for tracers (default: NO selection)
-!-----------------------------------------------------------------------
- ln_traldf_lap = .true. ! laplacian operator
- ln_traldf_iso = .true. ! iso-neutral (Standard operator)
- nn_aht_ijk_t = 20 ! = 20 F(i,j) = 1/2 Ud*max(e1,e2) (lap case)
- rn_Ud = 0.018 ! lateral diffusive velocity [m/s]
- rn_Ld = 50.e+3 ! lateral diffusive length [m]
-/
-!-----------------------------------------------------------------------
-&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: NO)
-!-----------------------------------------------------------------------
- ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation
-/
-!-----------------------------------------------------------------------
-&namtra_eiv ! eddy induced velocity param. (default: NO)
-!-----------------------------------------------------------------------
- ! not used in this zoom
-/
-!-----------------------------------------------------------------------
-&namtra_dmp ! tracer: T & S newtonian damping (default: NO)
-!-----------------------------------------------------------------------
- ! not used in this zoom
-/
-
-!!======================================================================
-!! *** Dynamics namelists *** !!
-!! !!
-!! nam_vvl vertical coordinate options (default: z-star)
-!! namdyn_adv formulation of the momentum advection (default: NO selection)
-!! namdyn_vor advection scheme (default: NO selection)
-!! namdyn_hpg hydrostatic pressure gradient (default: NO selection)
-!! namdyn_spg surface pressure gradient (default: NO selection)
-!! namdyn_ldf lateral diffusion scheme (default: NO selection)
-!! namdta_dyn offline TOP: dynamics read in files (OFF_SRC only)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&namdyn_adv ! formulation of the momentum advection (default: NO selection)
-!-----------------------------------------------------------------------
- ln_dynadv_vec = .true. ! vector form - 2nd centered scheme
- nn_dynkeg = 0 ! =0 : C2 grad(KE) scheme
-/
-!-----------------------------------------------------------------------
-&namdyn_vor ! Vorticity / Coriolis scheme (default: NO selection)
-!-----------------------------------------------------------------------
- ln_dynvor_een = .true. ! energy & enstrophy scheme
- nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)
-/
-!-----------------------------------------------------------------------
-&namdyn_hpg ! Hydrostatic pressure gradient option (default: NO selection)
-!-----------------------------------------------------------------------
- ln_hpg_sco = .true. ! s-coordinate (standard jacobian formulation)
-/
-!-----------------------------------------------------------------------
-&namdyn_spg ! surface pressure gradient (default: NO selection)
-!-----------------------------------------------------------------------
- ln_dynspg_ts = .true. ! split-explicit free surface
-/
-!-----------------------------------------------------------------------
-&namdyn_ldf ! lateral diffusion on momentum (default: NO selection)
-!-----------------------------------------------------------------------
- ln_dynldf_blp = .true. ! bilaplacian operator
- ln_dynldf_lev = .true. ! iso-level
- nn_ahm_ijk_t = 0 ! = 0 constant = 1/12 Uv*Lv^3 (blp case)
- rn_Uv = 0.0816 ! lateral viscous velocity [m/s]
- rn_Lv = 100.e+3 ! lateral viscous length [m]
-/
-
-!!======================================================================
-!! vertical physics namelists !!
-!! !!
-!! namzdf vertical physics manager (default: NO selection)
-!! namzdf_ric richardson number vertical mixing (ln_zdfric=T)
-!! namzdf_tke TKE vertical mixing (ln_zdftke=T)
-!! namzdf_gls GLS vertical mixing (ln_zdfgls=T)
-!! namzdf_osm OSM vertical diffusion (ln_zdfosm=T)
-!! namzdf_iwm tidal mixing parameterization (ln_zdfiwm=T)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&namzdf ! vertical physics (default: NO selection)
-!-----------------------------------------------------------------------
- ln_zdftke = .true. ! Turbulent Kinetic Energy closure (T => fill namzdf_tke)
- ln_zdfevd = .true. ! Enhanced Vertical Diffusion scheme
- nn_evdm = 0 ! evd apply on tracer (=0) or on tracer and momentum (=1)
- rn_evd = 100. ! evd mixing coefficient [m2/s]
- ln_zdfddm = .true. ! double diffusive mixing
- rn_avts = 1.e-4 ! maximum avs (vertical mixing on salinity)
- rn_hsbfr = 1.6 ! heat/salt buoyancy flux ratio
- ln_zdfiwm = .false. ! internal wave-induced mixing (T => fill namzdf_iwm)
- ! ! Coefficients
- rn_avm0 = 1.2e-4 ! vertical eddy viscosity [m2/s] (background Kz if ln_zdfcst=F)
- rn_avt0 = 1.2e-5 ! vertical eddy diffusivity [m2/s] (background Kz if ln_zdfcst=F)
- nn_avb = 0 ! profile for background avt & avm (=1) or not (=0)
- nn_havtb = 1 ! horizontal shape for avtb (=1) or not (=0)
-/
-!-----------------------------------------------------------------------
-&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion (ln_zdftke =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_iwm ! internal wave-driven mixing parameterization (ln_zdfiwm =T)
-!-----------------------------------------------------------------------
- ! not used in this zoom
-/
-
-!!======================================================================
-!! *** Diagnostics namelists *** !!
-!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namflo float parameters ("key_float")
-!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
-!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
-!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
-!!======================================================================
-!
-
-!!======================================================================
-!! *** Observation & Assimilation *** !!
-!! !!
-!! namobs observation and model comparison (default: NO)
-!! nam_asminc assimilation increments ('key_asminc')
-!!======================================================================
-!
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ice_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ice_cfg (revision 9525)
+++ (revision )
@@ -1,64 +1,0 @@
-!------------------------------------------------------------------------------
-&nampar ! Generic parameters
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namitd ! Ice discretization
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namdyn ! Ice dynamics
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namdyn_rdgrft ! Ice ridging/rafting
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namdyn_rhg ! Ice rheology
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namdyn_adv ! Ice advection
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namforcing ! Ice surface forcing
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namthd ! Ice thermodynamics
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namthd_zdf ! Ice heat diffusion
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namthd_da ! Ice lateral melting
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namthd_do ! Ice growth in open water
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namthd_sal ! Ice salinity
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namthd_pnd ! Melt ponds
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namini ! Ice initialization
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namalb ! albedo parameters
-!------------------------------------------------------------------------------
-/
-!------------------------------------------------------------------------------
-&namdia ! Diagnostics
-!------------------------------------------------------------------------------
-/
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ice_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ice_ref (revision 9525)
+++ (revision )
@@ -1,1 +1,0 @@
-link ../../SHARED/1_namelist_ice_ref
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_ref (revision 9525)
+++ (revision )
@@ -1,1 +1,0 @@
-link ../../SHARED/1_namelist_ref
Index: anches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/AGRIF_FixedGrids.in
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/AGRIF_FixedGrids.in (revision 9525)
+++ (revision )
@@ -1,3 +1,0 @@
-1
-125 170 36 63 4 4 2
-0
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/iodef.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/iodef.xml (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/iodef.xml (revision 9526)
@@ -23,5 +23,4 @@
-
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (revision 9526)
@@ -10,6 +10,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!! namc1d 1D configuration options ("key_c1d")
@@ -41,5 +41,5 @@
/
!-----------------------------------------------------------------------
-&namtsd ! Temperature & Salinity Data (init/dmp) (default: NO)
+&namtsd ! Temperature & Salinity Data (init/dmp) (default: OFF)
!-----------------------------------------------------------------------
! ! =T read T-S fields for:
@@ -55,5 +55,5 @@
/
!-----------------------------------------------------------------------
-&namwad ! Wetting and Drying (WaD) (default: NO)
+&namwad ! Wetting and Drying (WaD) (default: OFF)
!-----------------------------------------------------------------------
/
@@ -67,9 +67,9 @@
/
!-----------------------------------------------------------------------
-&namc1d_dyndmp ! U & V newtonian damping ("key_c1d" default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d_uvd ! data: U & V currents ("key_c1d" default: NO)
+&namc1d_dyndmp ! U & V newtonian damping ("key_c1d" default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namc1d_uvd ! data: U & V currents ("key_c1d" default: OFF)
!-----------------------------------------------------------------------
/
@@ -205,5 +205,5 @@
/
!-----------------------------------------------------------------------
-&namberg ! iceberg parameters (default: NO)
+&namberg ! iceberg parameters (default: OFF)
!-----------------------------------------------------------------------
ln_icebergs = .true. ! activate iceberg floats (force =F with "key_agrif")
@@ -221,8 +221,8 @@
!! namlbc lateral momentum boundary condition (no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -240,9 +240,9 @@
/
!-----------------------------------------------------------------------
-&nam_tide ! tide parameters (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambdy ! unstructured open boundaries (default: NO)
+&nam_tide ! tide parameters (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambdy ! unstructured open boundaries (default: OFF)
!-----------------------------------------------------------------------
/
@@ -252,5 +252,5 @@
/
!-----------------------------------------------------------------------
-&nambdy_tide ! tidal forcing at open boundaries (default: NO)
+&nambdy_tide ! tidal forcing at open boundaries (default: OFF)
!-----------------------------------------------------------------------
/
@@ -260,8 +260,8 @@
!! !!
!! namdrg top/bottom drag coefficient (default: NO selection)
-!! namdrg_top top friction (ln_NONE=F & ln_isfcav=T)
-!! namdrg_bot bottom friction (ln_NONE=F)
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! namdrg_top top friction (ln_OFF=F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF=F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -272,13 +272,13 @@
/
!-----------------------------------------------------------------------
-&namdrg_top ! TOP friction (ln_NONE=F & ln_isfcav=T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdrg_bot ! BOTTOM friction (ln_NONE=F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
+&namdrg_top ! TOP friction (ln_OFF=F & ln_isfcav=T)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdrg_bot ! BOTTOM friction (ln_OFF=F)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbc ! bottom temperature boundary condition (default: OFF)
!-----------------------------------------------------------------------
ln_trabbc = .true. ! Apply a geothermal heating at the ocean bottom
@@ -292,5 +292,5 @@
/
!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
+&nambbl ! bottom boundary layer scheme (default: OFF)
!-----------------------------------------------------------------------
ln_trabbl = .true. ! Bottom Boundary Layer parameterisation flag
@@ -307,7 +307,7 @@
!! namtra_adv advection scheme (default: NO selection)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -327,10 +327,6 @@
&namtra_ldf ! lateral diffusion scheme for tracers (default: NO selection)
!-----------------------------------------------------------------------
- ! ! Operator type:
- ln_traldf_lap = .true. ! laplacian operator
- ! ! Direction of action:
- ln_traldf_iso = .true. ! iso-neutral (Standard operator)
- ! !
- ! ! iso-neutral options:
+ ln_traldf_lap = .true. ! laplacian operator
+ ln_traldf_iso = .true. ! iso-neutral (Standard operator)
ln_traldf_msc = .true. ! Method of Stabilizing Correction (both operators)
! ! Coefficients:
@@ -341,10 +337,10 @@
/
!-----------------------------------------------------------------------
-&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: NO)
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: OFF)
!-----------------------------------------------------------------------
ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation
/
!-----------------------------------------------------------------------
-&namtra_eiv ! eddy induced velocity param. (default: NO)
+&namtra_eiv ! eddy induced velocity param. (default: OFF)
!-----------------------------------------------------------------------
ln_ldfeiv = .true. ! use eddy induced velocity parameterization
@@ -359,5 +355,5 @@
/
!-----------------------------------------------------------------------
-&namtra_dmp ! tracer: T & S newtonian damping (default: NO)
+&namtra_dmp ! tracer: T & S newtonian damping (default: OFF)
!-----------------------------------------------------------------------
ln_tradmp = .true. ! add a damping term (using resto.nc coef.)
@@ -470,31 +466,31 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
!
!-----------------------------------------------------------------------
-&namtrd ! trend diagnostics (default NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namptr ! Poleward Transport Diagnostic (default NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namhsb ! Heat and salt budgets (default NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdiu ! Cool skin and warm layer models (default NO)
+&namtrd ! trend diagnostics (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namptr ! Poleward Transport Diagnostic (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namhsb ! Heat and salt budgets (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namdiu ! Cool skin and warm layer models (default: OFF)
!-----------------------------------------------------------------------
/
@@ -512,9 +508,9 @@
/
!-----------------------------------------------------------------------
-&nam_diatmb ! Top Middle Bottom Output (default NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_dia25h ! 25h Mean Output (default NO)
+&nam_diatmb ! Top Middle Bottom Output (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nam_dia25h ! 25h Mean Output (default: OFF)
!-----------------------------------------------------------------------
/
@@ -528,6 +524,6 @@
!! !!
!! nammpp Massively Parallel Processing ("key_mpp_mpi")
-!! namctl Control prints (default NO)
-!! namsto Stochastic parametrization of EOS (default NO)
+!! namctl Control prints (default: OFF)
+!! namsto Stochastic parametrization of EOS (default: OFF)
!!======================================================================
!
@@ -537,9 +533,9 @@
/
!-----------------------------------------------------------------------
-&namctl ! Control prints (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsto ! Stochastic parametrization of EOS (default: NO)
+&namctl ! Control prints (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namsto ! Stochastic parametrization of EOS (default: OFF)
!-----------------------------------------------------------------------
/
@@ -548,10 +544,10 @@
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
!
!-----------------------------------------------------------------------
-&namobs ! observation usage switch (default: NO)
+&namobs ! observation usage switch (default: OFF)
!-----------------------------------------------------------------------
/
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_cfg (revision 9526)
@@ -57,4 +57,5 @@
nn_fsbc = 1 ! frequency of SBC module call
ln_blk = .true. ! Bulk formulation (T => fill namsbc_blk )
+ ln_traqsr = .true. ! Light penetration in the ocean (T => fill namtra_qsr)
/
!-----------------------------------------------------------------------
@@ -78,4 +79,18 @@
sn_tdif = 'taudif_core' , 24 , 'taudif' , .false. , .true. , 'yearly' , 'weights_core_orca2_bilinear_noc.nc' , '' , ''
/
+!-----------------------------------------------------------------------
+&namtra_qsr ! penetrative solar radiation (ln_traqsr =T)
+!-----------------------------------------------------------------------
+ ! ! type of penetration (default: NO selection)
+ ln_qsr_rgb = .true. ! RGB light penetration (Red-Green-Blue)
+ !
+ nn_chldta = 1 ! RGB : Chl data (=1) or cst value (=0)
+
+ cn_dir = './' ! root directory for the chlorophyl data location
+ !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+ ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+ ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! ! pairing ! filename !
+ sn_chl ='chlorophyll' , -1 , 'CHLA' , .true. , .true. , 'yearly' , '' , '' , ''
+/
!!======================================================================
@@ -83,11 +98,24 @@
!! !!
!! nameos equation of state (default: NO selection)
+!! namtra_ldf lateral diffusion scheme (default: NO selection)
!! namdta_dyn offline TOP: ocean state read in files (OFF_SRC only)
!!======================================================================
!
!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_teos10 = .true. ! = Use TEOS-10 equation of state
+/
+!-----------------------------------------------------------------------
+&namtra_ldf ! lateral diffusion scheme for tracers (default: NO selection)
+!-----------------------------------------------------------------------
+ ln_traldf_lap = .true. ! laplacian operator
+ ln_traldf_iso = .true. ! iso-neutral (Standard operator)
+ ln_traldf_msc = .true. ! Method of Stabilizing Correction (both operators)
+ ! ! Coefficients:
+ nn_aht_ijk_t = 20 ! space/time variation of eddy coef
+ ! ! = 20 aht = 1/2 Ud. max(e1,e2)
+ rn_Ud = 0.018 ! lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+ rn_Ld = 200.e+3 ! lateral diffusive length [m] (nn_aht_ijk_t= 0, 10)
/
!-----------------------------------------------------------------------
@@ -97,5 +125,4 @@
ln_dynrnf_depth = .false. ! runoffs is spread in vertical (T) or not (F)
! fwbcorr = 3.786e-06 ! annual global mean of empmr for ssh correction
-
cn_dir = './' ! root directory for the ocean data location
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_OFF_TRC/EXP00/namelist_cfg (revision 9526)
@@ -83,11 +83,24 @@
!! !!
!! nameos equation of state (default: NO selection)
+!! namtra_ldf lateral diffusion scheme (default: NO selection)
!! namdta_dyn offline TOP: ocean state read in files (OFF_SRC only)
!!======================================================================
!
!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_teos10 = .true. ! = Use TEOS-10 equation of state
+/
+!-----------------------------------------------------------------------
+&namtra_ldf ! lateral diffusion scheme for tracers (default: NO selection)
+!-----------------------------------------------------------------------
+ ln_traldf_lap = .true. ! laplacian operator
+ ln_traldf_iso = .true. ! iso-neutral (Standard operator)
+ ln_traldf_msc = .true. ! Method of Stabilizing Correction (both operators)
+ ! ! Coefficients:
+ nn_aht_ijk_t = 20 ! space/time variation of eddy coef
+ ! ! = 20 aht = 1/2 Ud. max(e1,e2)
+ rn_Ud = 0.018 ! lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
+ rn_Ld = 200.e+3 ! lateral diffusive length [m] (nn_aht_ijk_t= 0, 10)
/
!-----------------------------------------------------------------------
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg (revision 9526)
@@ -107,5 +107,5 @@
!! nameos equation of state (default: NO selection)
!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_teos10 = .true. ! = Use TEOS-10 equation of state
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/field_def_nemo-opa.xml (revision 9526)
@@ -344,5 +344,5 @@
-
+
@@ -394,5 +394,5 @@
-
+
@@ -747,5 +747,5 @@
-
+
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (revision 9526)
@@ -24,6 +24,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
!! namc1d 1D configuration options ("key_c1d")
@@ -98,5 +98,5 @@
/
!-----------------------------------------------------------------------
-&namtsd ! Temperature & Salinity Data (init/dmp) (default: NO)
+&namtsd ! Temperature & Salinity Data (init/dmp) (default: OFF)
!-----------------------------------------------------------------------
! ! =T read T-S fields for:
@@ -112,5 +112,5 @@
/
!-----------------------------------------------------------------------
-&namwad ! Wetting and Drying (WaD) (default: NO)
+&namwad ! Wetting and Drying (WaD) (default: OFF)
!-----------------------------------------------------------------------
ln_wd_il = .false ! T/F activation of iterative limiter
@@ -142,15 +142,15 @@
&namc1d ! 1D configuration options ("key_c1d" default: PAPA station)
!-----------------------------------------------------------------------
- rn_lat1d = 50 ! Column latitude (default at PAPA station)
- rn_lon1d = -145 ! Column longitude (default at PAPA station)
+ rn_lat1d = 50 ! Column latitude
+ rn_lon1d = -145 ! Column longitude
ln_c1d_locpt= .true. ! Localization of 1D config in a grid (T) or independant point (F)
/
!-----------------------------------------------------------------------
-&namc1d_dyndmp ! U & V newtonian damping ("key_c1d" default: NO)
+&namc1d_dyndmp ! U & V newtonian damping ("key_c1d" default: OFF)
!-----------------------------------------------------------------------
ln_dyndmp = .false. ! add a damping term (T) or not (F)
/
!-----------------------------------------------------------------------
-&namc1d_uvd ! data: U & V currents ("key_c1d" default: NO)
+&namc1d_uvd ! data: U & V currents ("key_c1d" default: OFF)
!-----------------------------------------------------------------------
! ! =T read U-V fields for:
@@ -494,5 +494,5 @@
/
!-----------------------------------------------------------------------
-&namberg ! iceberg parameters (default: NO)
+&namberg ! iceberg parameters (default: OFF)
!-----------------------------------------------------------------------
ln_icebergs = .false. ! activate iceberg floats (force =F with "key_agrif")
@@ -538,8 +538,8 @@
!! namlbc lateral momentum boundary condition (default: no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -560,5 +560,5 @@
/
!-----------------------------------------------------------------------
-&nam_tide ! tide parameters (default: NO)
+&nam_tide ! tide parameters (default: OFF)
!-----------------------------------------------------------------------
ln_tide = .false. ! Activate tides
@@ -574,5 +574,5 @@
/
!-----------------------------------------------------------------------
-&nambdy ! unstructured open boundaries (default: NO)
+&nambdy ! unstructured open boundaries (default: OFF)
!-----------------------------------------------------------------------
ln_bdy = .false. ! Use unstructured open boundaries
@@ -631,5 +631,5 @@
/
!-----------------------------------------------------------------------
-&nambdy_tide ! tidal forcing at open boundaries (default: NO)
+&nambdy_tide ! tidal forcing at open boundaries (default: OFF)
!-----------------------------------------------------------------------
filtide = 'bdydta/amm12_bdytide_' ! file name root of tidal forcing files
@@ -642,8 +642,8 @@
!! !!
!! namdrg top/bottom drag coefficient (default: NO selection)
-!! namdrg_top top friction (ln_NONE=F & ln_isfcav=T)
-!! namdrg_bot bottom friction (ln_NONE=F)
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! namdrg_top top friction (ln_OFF=F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF=F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -651,5 +651,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .false. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .false. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -659,5 +659,5 @@
/
!-----------------------------------------------------------------------
-&namdrg_top ! TOP friction (ln_NONE=F & ln_isfcav=T)
+&namdrg_top ! TOP friction (ln_OFF =F & ln_isfcav=T)
!-----------------------------------------------------------------------
rn_Cd0 = 1.e-3 ! drag coefficient [-]
@@ -670,5 +670,5 @@
/
!-----------------------------------------------------------------------
-&namdrg_bot ! BOTTOM friction (ln_NONE=F)
+&namdrg_bot ! BOTTOM friction (ln_OFF =F)
!-----------------------------------------------------------------------
rn_Cd0 = 1.e-3 ! drag coefficient [-]
@@ -681,5 +681,5 @@
/
!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
+&nambbc ! bottom temperature boundary condition (default: OFF)
!-----------------------------------------------------------------------
ln_trabbc = .false. ! Apply a geothermal heating at the ocean bottom
@@ -695,5 +695,5 @@
/
!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
+&nambbl ! bottom boundary layer scheme (default: OFF)
!-----------------------------------------------------------------------
ln_trabbl = .false. ! Bottom Boundary Layer parameterisation flag
@@ -705,12 +705,12 @@
!!======================================================================
-!! Tracer (T & S) namelists !!
+!! Tracer (T-S) namelists !!
!! !!
!! nameos equation of state (default: NO selection)
!! namtra_adv advection scheme (default: NO selection)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -735,5 +735,5 @@
&namtra_adv ! advection scheme for tracer (default: NO selection)
!-----------------------------------------------------------------------
- ln_traadv_NONE= .false. ! No tracer advection
+ ln_traadv_OFF = .false. ! No tracer advection
ln_traadv_cen = .false. ! 2nd order centered scheme
nn_cen_h = 4 ! =2/4, horizontal 2nd order CEN / 4th order CEN
@@ -752,5 +752,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .false. ! No explicit diffusion
+ ln_traldf_OFF = .false. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -784,5 +784,5 @@
/
!-----------------------------------------------------------------------
-&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: NO)
+&namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper) (default: OFF)
!-----------------------------------------------------------------------
ln_mle = .false. ! (T) use the Mixed Layer Eddy (MLE) parameterisation
@@ -797,5 +797,5 @@
/
!-----------------------------------------------------------------------
-&namtra_eiv ! eddy induced velocity param. (default: NO)
+&namtra_eiv ! eddy induced velocity param. (default: OFF)
!-----------------------------------------------------------------------
ln_ldfeiv = .false. ! use eddy induced velocity parameterization
@@ -816,5 +816,5 @@
/
!-----------------------------------------------------------------------
-&namtra_dmp ! tracer: T & S newtonian damping (default: NO)
+&namtra_dmp ! tracer: T & S newtonian damping (default: OFF)
!-----------------------------------------------------------------------
ln_tradmp = .false. ! add a damping term (using resto.nc coef.)
@@ -854,5 +854,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form - 2nd centered scheme
nn_dynkeg = 0 ! grad(KE) scheme: =0 C2 ; =1 Hollingsworth correction
@@ -900,5 +900,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .false. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .false. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
@@ -1073,7 +1073,7 @@
rn_difconv = 1. ! diffusivity when unstable below BL (m2/s)
nn_osm_wave = 0 ! Method used to calculate Stokes drift
- ! = 2: Use ECMWF wave fields
- ! = 1: Pierson Moskowitz wave spectrum
- ! = 0: Constant La# = 0.3
+ ! ! = 2: Use ECMWF wave fields
+ ! ! = 1: Pierson Moskowitz wave spectrum
+ ! ! = 0: Constant La# = 0.3
/
!-----------------------------------------------------------------------
@@ -1084,22 +1084,23 @@
ln_tsdiff = .true. ! account for differential T/S mixing (T) or not (F)
/
+
!!======================================================================
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
!
!-----------------------------------------------------------------------
-&namtrd ! trend diagnostics (default NO)
+&namtrd ! trend diagnostics (default: OFF)
!-----------------------------------------------------------------------
ln_glo_trd = .false. ! (T) global domain averaged diag for T, T^2, KE, and PE
@@ -1121,5 +1122,5 @@
!!gm
!-----------------------------------------------------------------------
-&namptr ! Poleward Transport Diagnostic (default NO)
+&namptr ! Poleward Transport Diagnostic (default: OFF)
!-----------------------------------------------------------------------
ln_diaptr = .false. ! Poleward heat and salt transport (T) or not (F)
@@ -1127,10 +1128,10 @@
/
!-----------------------------------------------------------------------
-&namhsb ! Heat and salt budgets (default NO)
+&namhsb ! Heat and salt budgets (default: OFF)
!-----------------------------------------------------------------------
ln_diahsb = .false. ! check the heat and salt budgets (T) or not (F)
/
!-----------------------------------------------------------------------
-&namdiu ! Cool skin and warm layer models (default NO)
+&namdiu ! Cool skin and warm layer models (default: OFF)
!-----------------------------------------------------------------------
ln_diurnal = .false. !
@@ -1170,10 +1171,10 @@
/
!-----------------------------------------------------------------------
-&nam_diatmb ! Top Middle Bottom Output (default NO)
+&nam_diatmb ! Top Middle Bottom Output (default: OFF)
!-----------------------------------------------------------------------
ln_diatmb = .false. ! Choose Top Middle and Bottom output or not
/
!-----------------------------------------------------------------------
-&nam_dia25h ! 25h Mean Output (default NO)
+&nam_dia25h ! 25h Mean Output (default: OFF)
!-----------------------------------------------------------------------
ln_dia25h = .false. ! Choose 25h mean output or not
@@ -1192,62 +1193,12 @@
!!======================================================================
-!! *** Miscellaneous namelists *** !!
-!! !!
-!! nammpp Massively Parallel Processing ("key_mpp_mpi")
-!! namctl Control prints (default NO)
-!! namsto Stochastic parametrization of EOS (default NO)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&nammpp ! Massively Parallel Processing ("key_mpp_mpi")
-!-----------------------------------------------------------------------
- cn_mpi_send = 'I' ! mpi send/recieve type ='S', 'B', or 'I' for standard send,
- ! ! buffer blocking send or immediate non-blocking sends, resp.
- nn_buffer = 0 ! size in bytes of exported buffer ('B' case), 0 no exportation
- ln_nnogather= .false. ! activate code to avoid mpi_allgather use at the northfold
- jpni = 0 ! jpni number of processors following i (set automatically if < 1)
- jpnj = 0 ! jpnj number of processors following j (set automatically if < 1)
- jpnij = 0 ! jpnij number of local domains (set automatically if < 1)
-/
-!-----------------------------------------------------------------------
-&namctl ! Control prints (default: NO)
-!-----------------------------------------------------------------------
- ln_ctl = .false. ! trends control print (expensive!)
- nn_print = 0 ! level of print (0 no extra print)
- nn_ictls = 0 ! start i indice of control sum (use to compare mono versus
- nn_ictle = 0 ! end i indice of control sum multi processor runs
- nn_jctls = 0 ! start j indice of control over a subdomain)
- nn_jctle = 0 ! end j indice of control
- nn_isplt = 1 ! number of processors in i-direction
- nn_jsplt = 1 ! number of processors in j-direction
- ln_timing = .false. ! timing by routine write out in timing.output file
- ln_diacfl = .false. ! CFL diagnostics write out in cfl_diagnostics.ascii
-/
-!-----------------------------------------------------------------------
-&namsto ! Stochastic parametrization of EOS (default: NO)
-!-----------------------------------------------------------------------
- ln_sto_eos = .false. ! stochastic equation of state
- nn_sto_eos = 1 ! number of independent random walks
- rn_eos_stdxy= 1.4 ! random walk horz. standard deviation (in grid points)
- rn_eos_stdz = 0.7 ! random walk vert. standard deviation (in grid points)
- rn_eos_tcor = 1440. ! random walk time correlation (in timesteps)
- nn_eos_ord = 1 ! order of autoregressive processes
- nn_eos_flt = 0 ! passes of Laplacian filter
- rn_eos_lim = 2.0 ! limitation factor (default = 3.0)
- ln_rststo = .false. ! start from mean parameter (F) or from restart file (T)
- ln_rstseed = .true. ! read seed of RNG from restart file
- cn_storst_in = "restart_sto" ! suffix of stochastic parameter restart file (input)
- cn_storst_out = "restart_sto" ! suffix of stochastic parameter restart file (output)
-/
-
-!!======================================================================
!! *** Observation & Assimilation *** !!
!! !!
-!! namobs observation and model comparison (default: NO)
+!! namobs observation and model comparison (default: OFF)
!! nam_asminc assimilation increments ('key_asminc')
!!======================================================================
!
!-----------------------------------------------------------------------
-&namobs ! observation usage switch (default: NO)
+&namobs ! observation usage switch (default: OFF)
!-----------------------------------------------------------------------
ln_diaobs = .false. ! Logical switch for the observation operator
@@ -1322,2 +1273,52 @@
nn_divdmp = 0 ! Number of iterations of divergence damping operator
/
+
+!!======================================================================
+!! *** Miscellaneous namelists *** !!
+!! !!
+!! nammpp Massively Parallel Processing ("key_mpp_mpi")
+!! namctl Control prints (default: OFF)
+!! namsto Stochastic parametrization of EOS (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nammpp ! Massively Parallel Processing ("key_mpp_mpi")
+!-----------------------------------------------------------------------
+ cn_mpi_send = 'I' ! mpi send/recieve type ='S', 'B', or 'I' for standard send,
+ ! ! buffer blocking send or immediate non-blocking sends, resp.
+ nn_buffer = 0 ! size in bytes of exported buffer ('B' case), 0 no exportation
+ ln_nnogather= .false. ! activate code to avoid mpi_allgather use at the northfold
+ jpni = 0 ! jpni number of processors following i (set automatically if < 1)
+ jpnj = 0 ! jpnj number of processors following j (set automatically if < 1)
+ jpnij = 0 ! jpnij number of local domains (set automatically if < 1)
+/
+!-----------------------------------------------------------------------
+&namctl ! Control prints (default: OFF)
+!-----------------------------------------------------------------------
+ ln_ctl = .false. ! trends control print (expensive!)
+ nn_print = 0 ! level of print (0 no extra print)
+ nn_ictls = 0 ! start i indice of control sum (use to compare mono versus
+ nn_ictle = 0 ! end i indice of control sum multi processor runs
+ nn_jctls = 0 ! start j indice of control over a subdomain)
+ nn_jctle = 0 ! end j indice of control
+ nn_isplt = 1 ! number of processors in i-direction
+ nn_jsplt = 1 ! number of processors in j-direction
+ ln_timing = .false. ! timing by routine write out in timing.output file
+ ln_diacfl = .false. ! CFL diagnostics write out in cfl_diagnostics.ascii
+/
+!-----------------------------------------------------------------------
+&namsto ! Stochastic parametrization of EOS (default: OFF)
+!-----------------------------------------------------------------------
+ ln_sto_eos = .false. ! stochastic equation of state
+ nn_sto_eos = 1 ! number of independent random walks
+ rn_eos_stdxy= 1.4 ! random walk horz. standard deviation (in grid points)
+ rn_eos_stdz = 0.7 ! random walk vert. standard deviation (in grid points)
+ rn_eos_tcor = 1440. ! random walk time correlation (in timesteps)
+ nn_eos_ord = 1 ! order of autoregressive processes
+ nn_eos_flt = 0 ! passes of Laplacian filter
+ rn_eos_lim = 2.0 ! limitation factor (default = 3.0)
+ ln_rststo = .false. ! start from mean parameter (F) or from restart file (T)
+ ln_rstseed = .true. ! read seed of RNG from restart file
+ cn_storst_in = "restart_sto" ! suffix of stochastic parameter restart file (input)
+ cn_storst_out = "restart_sto" ! suffix of stochastic parameter restart file (output)
+/
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_top_ref
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_top_ref (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_top_ref (revision 9526)
@@ -66,5 +66,5 @@
&namtrc_adv ! advection scheme for passive tracer (default: NO selection)
!-----------------------------------------------------------------------
- ln_trcadv_NONE= .false. ! No passive tracer advection
+ ln_trcadv_OFF = .false. ! No passive tracer advection
ln_trcadv_cen = .false. ! 2nd order centered scheme
nn_cen_h = 4 ! =2/4, horizontal 2nd order CEN / 4th order CEN
@@ -83,5 +83,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator:
- ln_trcldf_NONE = .false. ! No explicit diffusion
+ ln_trcldf_OFF = .false. ! No explicit diffusion
ln_trcldf_tra = .false. ! use active tracer setting
! ! Coefficient (defined with namtra_ldf coefficient)
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/field_def_nemo-opa.xml
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/field_def_nemo-opa.xml (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/field_def_nemo-opa.xml (revision 9526)
@@ -352,5 +352,5 @@
-
+
@@ -402,5 +402,5 @@
-
+
@@ -755,5 +755,5 @@
-
+
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/EXP00/namelist_cfg (revision 9526)
@@ -9,6 +9,6 @@
!! namdom space and time domain
!! namcfg parameters of the configuration (default: user defined GYRE)
-!! namwad Wetting and drying (default NO)
-!! namtsd data: temperature & salinity (default NO)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
!!======================================================================
!
@@ -90,8 +90,8 @@
!! namlbc lateral momentum boundary condition (default: no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -105,8 +105,8 @@
!! !!
!! namdrg top/bottom drag coefficient (default: NO selection)
-!! namdrg_top top friction (ln_NONE=F & ln_isfcav=T)
-!! namdrg_bot bottom friction (ln_NONE=F)
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! namdrg_top top friction (ln_OFF =F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF =F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -114,5 +114,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
@@ -123,7 +123,7 @@
!! namtra_adv advection scheme (default: NO selection)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
!!======================================================================
!
@@ -144,5 +144,5 @@
&namtra_adv ! advection scheme for tracer (default: NO selection)
!-----------------------------------------------------------------------
- ln_traadv_NONE= .false. ! No tracer advection
+ ln_traadv_OFF = .false. ! No tracer advection
ln_traadv_cen = .false. ! 2nd order centered scheme
nn_cen_h = 4 ! =2/4, horizontal 2nd order CEN / 4th order CEN
@@ -160,5 +160,5 @@
&namtra_ldf ! lateral diffusion scheme for tracers (default: NO selection)
!-----------------------------------------------------------------------
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
/
@@ -178,5 +178,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -216,5 +216,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
@@ -269,19 +269,19 @@
!! *** Diagnostics namelists *** !!
!! !!
-!! namtrd dynamics and/or tracer trends (default NO)
-!! namptr Poleward Transport Diagnostics (default NO)
-!! namhsb Heat and salt budgets (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
-!! namdiu Cool skin and warm layer models (default NO)
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
!! namflo float parameters ("key_float")
!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
!! namdct transports through some sections ("key_diadct")
-!! nam_diatmb Top Middle Bottom Output (default NO)
-!! nam_dia25h 25h Mean Output (default NO)
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
!!======================================================================
!
!-----------------------------------------------------------------------
-&namtrd ! trend diagnostics (default F)
+&namtrd ! trend diagnostics (default: OFF)
!-----------------------------------------------------------------------
ln_glo_trd = .false. ! (T) global domain averaged diag for T, T^2, KE, and PE
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/ISOMIP/EXP00/namelist_cfg (revision 9526)
@@ -108,8 +108,8 @@
!! namlbc lateral momentum boundary condition (default: no slip)
!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
-!! nam_tide Tidal forcing (default: NO)
-!! nambdy Unstructured open boundaries (default: NO)
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
-!! nambdy_tide tidal forcing at open boundaries (default: NO)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
!!======================================================================
!
@@ -123,8 +123,8 @@
!! !!
!! namdrg top/bottom drag coefficient (default: NO selection)
-!! namdrg_top top friction (ln_NONE=F & ln_isfcav=T)
-!! namdrg_bot bottom friction (ln_NONE=F)
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! namdrg_top top friction (ln_OFF =F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF =F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -132,5 +132,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .false. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .false. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .true. ! non-linear drag: Cd = Cd0 |U|
@@ -168,11 +168,11 @@
!! namtra_adv advection scheme (default: NO selection)
!! namtra_ldf lateral diffusion scheme (default: NO selection)
-!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: NO)
-!! namtra_eiv eddy induced velocity param. (default: NO)
-!! namtra_dmp T & S newtonian damping (default: NO)
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_eos80 = .true. ! = Use EOS80 equation of state
@@ -215,5 +215,5 @@
/
!-----------------------------------------------------------------------
-&namdyn_vor ! Vorticity / Coriolis scheme (default: NO)
+&namdyn_vor ! Vorticity / Coriolis scheme (default: OFF)
!-----------------------------------------------------------------------
ln_dynvor_ene = .true. ! energy conserving scheme
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_cen2_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_flux_ubs_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -156,5 +156,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_eenH_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_een_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ene_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT2_vect_ens_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_cen2_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_flux_ubs_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -156,5 +156,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_eenH_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_een_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ene_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/LOCK_EXCHANGE/EXP00/namelist_FCT4_vect_ens_cfg (revision 9526)
@@ -68,5 +68,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -103,5 +103,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_cen-ahm1000_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_cen-ahm1000_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_cen-ahm1000_cfg (revision 9526)
@@ -65,6 +65,6 @@
!! namdrg_top top friction (ln_isfcav=T)
!! namdrg_bot bottom friction
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -72,5 +72,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -111,5 +111,5 @@
!-----------------------------------------------------------------------
! ! Operator type: both false = No lateral diffusion
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -123,5 +123,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -165,5 +165,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .false. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .false. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .true. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT2_flux_ubs_cfg (revision 9526)
@@ -65,6 +65,6 @@
!! namdrg_top top friction (ln_isfcav=T)
!! namdrg_bot bottom friction
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -72,5 +72,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -111,5 +111,5 @@
!-----------------------------------------------------------------------
! ! Operator type: both false = No lateral diffusion
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -123,5 +123,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -165,5 +165,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_cen-ahm1000_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_cen-ahm1000_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_cen-ahm1000_cfg (revision 9526)
@@ -67,6 +67,6 @@
!! namdrg_top top friction (ln_isfcav=T)
!! namdrg_bot bottom friction
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -74,5 +74,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -113,5 +113,5 @@
!-----------------------------------------------------------------------
! ! Operator type: both false = No lateral diffusion
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -125,5 +125,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -167,5 +167,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .false. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .false. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .true. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_ubs_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_ubs_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_sco_FCT4_flux_ubs_cfg (revision 9526)
@@ -67,6 +67,6 @@
!! namdrg_top top friction (ln_isfcav=T)
!! namdrg_bot bottom friction
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -74,5 +74,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -113,5 +113,5 @@
!-----------------------------------------------------------------------
! ! Operator type: both false = No lateral diffusion
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -125,5 +125,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -167,5 +167,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT2_flux_ubs_cfg (revision 9526)
@@ -65,6 +65,6 @@
!! namdrg_top top friction (ln_isfcav=T)
!! namdrg_bot bottom friction
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -72,5 +72,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -111,5 +111,5 @@
!-----------------------------------------------------------------------
! ! Operator type: both false = No lateral diffusion
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -123,5 +123,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -165,5 +165,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_flux_ubs_cfg (revision 9526)
@@ -65,6 +65,6 @@
!! namdrg_top top friction (ln_isfcav=T)
!! namdrg_bot bottom friction
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -72,5 +72,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -111,5 +111,5 @@
!-----------------------------------------------------------------------
! ! Operator type: both false = No lateral diffusion
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -123,5 +123,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .false. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -165,5 +165,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/OVERFLOW/EXP00/namelist_zps_FCT4_vect_een_cfg (revision 9526)
@@ -65,6 +65,6 @@
!! namdrg_top top friction (ln_isfcav=T)
!! namdrg_bot bottom friction
-!! nambbc bottom temperature boundary condition (default: NO)
-!! nambbl bottom boundary layer scheme (default: NO)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -72,5 +72,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
+ ln_OFF = .true. ! free-slip : Cd = 0 (F => fill namdrg_bot
ln_lin = .false. ! linear drag: Cd = Cd0 Uc0 & namdrg_top)
ln_non_lin = .false. ! non-linear drag: Cd = Cd0 |U|
@@ -111,5 +111,5 @@
!-----------------------------------------------------------------------
! ! Operator type: both false = No lateral diffusion
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -123,5 +123,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .true. ! vector form (T) or flux form (F)
nn_dynkeg = 0 ! scheme for grad(KE): =0 C2 ; =1 Hollingsworth correction
@@ -165,5 +165,5 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .false. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .false. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .true. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/1_namelist_cfg (revision 9526)
@@ -147,5 +147,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .true. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .true. ! linear dynamics (no momentum advection)
/
!-----------------------------------------------------------------------
@@ -166,5 +166,5 @@
&namdyn_ldf ! lateral diffusion on momentum (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
/
!-----------------------------------------------------------------------
@@ -174,86 +174,2 @@
ln_zdfcst = .true. ! constant mixing
/
-!-----------------------------------------------------------------------
-&namzdf_ric ! richardson number dependent vertical diffusion (ln_zdfric =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion (ln_zdftke =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_gls ! GLS vertical diffusion (ln_zdfgls =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_osm ! OSM vertical diffusion (ln_zdfosm =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_iwm ! internal wave-driven mixing parameterization (ln_zdfiwm =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nammpp ! Massively Parallel Processing ("key_mpp_mpi")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namctl ! Control prints
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsto ! Stochastic parametrization of EOS (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtrd ! trend diagnostics (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namptr ! Poleward Transport Diagnostic (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namhsb ! Heat and salt budgets (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdiu ! Cool skin and warm layer models (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namflo ! float parameters ("key_float")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_diaharm ! Harmonic analysis of tidal constituents ("key_diaharm")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdct ! transports through some sections ("key_diadct")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_diatmb ! Top Middle Bottom Output (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_dia25h ! 25h Mean Output (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namnc4 ! netcdf4 chunking and compression settings ("key_netcdf4")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namobs ! observation usage switch
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_asminc ! assimilation increments ('key_asminc')
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdta_dyn ! offline dynamics read in files ("key_offline")
-!-----------------------------------------------------------------------
-/
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (revision 9526)
@@ -148,5 +148,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -159,13 +159,13 @@
/
!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+&nambbc ! bottom temperature boundary condition (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbl ! bottom boundary layer scheme (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_teos10 = .true. ! = Use TEOS-10 equation of state
@@ -181,5 +181,5 @@
&namtra_ldf ! lateral diffusion scheme for tracers
!----------------------------------------------------------------------------------
- ln_traldf_NONE = .true. ! laplacian operator
+ ln_traldf_OFF = .true. ! laplacian operator
/
@@ -187,5 +187,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .true. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .true. ! linear dynamics (no momentum advection)
/
!-----------------------------------------------------------------------
@@ -206,5 +206,5 @@
&namdyn_ldf ! lateral diffusion on momentum (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
/
!-----------------------------------------------------------------------
@@ -242,5 +242,5 @@
/
!-----------------------------------------------------------------------
-&namsto ! Stochastic parametrization of EOS (default: NO)
+&namsto ! Stochastic parametrization of EOS (default: OFF)
!-----------------------------------------------------------------------
/
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/1_namelist_cfg (revision 9526)
@@ -156,5 +156,5 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
+ ln_OFF = .true. ! free-slip : Cd = 0
/
!-----------------------------------------------------------------------
@@ -167,13 +167,13 @@
/
!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+&nambbc ! bottom temperature boundary condition (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambbl ! bottom boundary layer scheme (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
@@ -206,5 +206,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -229,5 +229,5 @@
/
!-----------------------------------------------------------------------
-&namdyn_vor ! Vorticity / Coriolis scheme (default: NO)
+&namdyn_vor ! Vorticity / Coriolis scheme (default: OFF)
!-----------------------------------------------------------------------
ln_dynvor_ene = .false. ! enstrophy conserving scheme
@@ -244,5 +244,5 @@
/
!-----------------------------------------------------------------------
-&namdyn_spg ! surface pressure gradient (default: NO)
+&namdyn_spg ! surface pressure gradient (default: OFF)
!-----------------------------------------------------------------------
ln_dynspg_exp = .false.
@@ -260,10 +260,10 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
! ! Direction of action :
ln_dynldf_lev = .false. ! iso-level
- ln_dynldf_hor = .true. ! horizontal (geopotential)
+ ln_dynldf_hor = .true. ! horizontal (geopotential)
ln_dynldf_iso = .false. ! iso-neutral
! ! Coefficient
@@ -292,86 +292,3 @@
nn_havtb = 0 ! horizontal shape for avtb (=1) or not (=0)
/
-!-----------------------------------------------------------------------
-&namzdf_ric ! richardson number dependent vertical diffusion (ln_zdfric =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion (ln_zdftke =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_gls ! GLS vertical diffusion (ln_zdfgls =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_osm ! OSM vertical diffusion (ln_zdfosm =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_iwm ! internal wave-driven mixing parameterization (ln_zdfiwm =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nammpp ! Massively Parallel Processing ("key_mpp_mpi")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namctl ! Control prints
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsto ! Stochastic parametrization of EOS (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtrd ! trend diagnostics (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namptr ! Poleward Transport Diagnostic (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namhsb ! Heat and salt budgets (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdiu ! Cool skin and warm layer models (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namflo ! float parameters ("key_float")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_diaharm ! Harmonic analysis of tidal constituents ("key_diaharm")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdct ! transports through some sections ("key_diadct")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_diatmb ! Top Middle Bottom Output (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_dia25h ! 25h Mean Output (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namnc4 ! netcdf4 chunking and compression settings ("key_netcdf4")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namobs ! observation usage switch
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_asminc ! assimilation increments ('key_asminc')
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdta_dyn ! offline dynamics read in files ("key_offline")
-!-----------------------------------------------------------------------
-/
+
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX/EXP00/namelist_cfg (revision 9526)
@@ -3,12 +3,17 @@
!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
!
-!-----------------------------------------------------------------------
-&namusr_def ! User defined : VORTEX configuration: Flat bottom, beta-plane
-!-----------------------------------------------------------------------
- rn_dx = 30000. ! x horizontal resolution [meters]
- rn_dy = 30000. ! y horizontal resolution [meters]
- rn_dz = 500. ! z vertical resolution [meters]
- rn_ppgphi0 = 38.5 ! Reference latitude [degrees]
-/
+!!======================================================================
+!! *** Domain & Run management namelists *** !!
+!! !!
+!! namrun parameters of the run
+!! namdom space and time domain
+!! namcfg parameters of the configuration (default: user defined GYRE)
+!! namwad Wetting and drying (default: OFF)
+!! namtsd data: temperature & salinity (default: OFF)
+!! namcrs coarsened grid (for outputs and/or TOP) (ln_crs =T)
+!! namc1d 1D configuration options ("key_c1d")
+!! namc1d_dyndmp 1D newtonian damping applied on currents ("key_c1d")
+!! namc1d_uvd 1D data (currents) ("key_c1d")
+!!======================================================================
!
!-----------------------------------------------------------------------
@@ -24,8 +29,4 @@
/
!-----------------------------------------------------------------------
-&namcfg ! parameters of the configuration (default: user defined GYRE)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
&namdom ! time and space domain
!-----------------------------------------------------------------------
@@ -35,30 +36,37 @@
/
!-----------------------------------------------------------------------
+&namcfg ! parameters of the configuration (default: use namusr_def in namelist_cfg)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&namusr_def ! User defined : VORTEX configuration: Flat bottom, beta-plane
+!-----------------------------------------------------------------------
+ rn_dx = 30000. ! x horizontal resolution [meters]
+ rn_dy = 30000. ! y horizontal resolution [meters]
+ rn_dz = 500. ! z vertical resolution [meters]
+ rn_ppgphi0 = 38.5 ! Reference latitude [degrees]
+/
+!-----------------------------------------------------------------------
&namtsd ! data : Temperature & Salinity
!-----------------------------------------------------------------------
/
-!-----------------------------------------------------------------------
-&namwad ! Wetting and drying default is no WAD
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namcrs ! coarsened grid (for outputs and/or TOP) (ln_crs =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d ! 1D configuration options ("key_c1d")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d_dyndmp ! U & V newtonian damping ("key_c1d")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namc1d_uvd ! data: U & V currents ("key_c1d")
-!-----------------------------------------------------------------------
-/
-
-!!======================================================================
-!! *** Surface Boundary Condition namelists ***
+
+!!======================================================================
+!! *** Surface Boundary Condition namelists *** !!
+!! !!
+!! namsbc surface boundary condition manager (default: NO selection)
+!! namsbc_flx flux formulation (ln_flx =T)
+!! namsbc_blk Bulk formulae formulation (ln_blk =T)
+!! namsbc_cpl CouPLed formulation ("key_oasis3" )
+!! namsbc_sas Stand-Alone Surface module (SAS_SRC only)
+!! namsbc_iif Ice-IF: use observed ice cover (nn_ice = 1 )
+!! namtra_qsr penetrative solar radiation (ln_traqsr =T)
+!! namsbc_ssr sea surface restoring term (for T and/or S) (ln_ssr =T)
+!! namsbc_rnf river runoffs (ln_rnf =T)
+!! namsbc_apr Atmospheric Pressure (ln_apr_dyn =T)
+!! namsbc_isf ice shelf melting/freezing (ln_isfcav =T : read (ln_read_cfg=T) or set or usr_def_zgr )
+!! namsbc_iscpl coupling option between land ice model and ocean (ln_isfcav =T)
+!! namsbc_wave external fields from wave model (ln_wave =T)
+!! namberg iceberg floats (ln_icebergs=T)
!!======================================================================
!
@@ -76,89 +84,30 @@
nn_fwb = 0 ! FreshWater Budget: =0 unchecked
/
-!-----------------------------------------------------------------------
-&namsbc_flx ! surface boundary condition : flux formulation
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_blk ! namsbc_blk generic Bulk formula (ln_blk =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_cpl ! coupled ocean/atmosphere model ("key_oasis3")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_sas ! Stand-Alone Surface boundary condition
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_iif ! Ice-IF : use observed ice cover (nn_ice = 1)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtra_qsr ! penetrative solar radiation (ln_traqsr =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_rnf ! runoffs namelist surface boundary condition (ln_rnf =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_isf ! Top boundary layer (ISF) (nn_isf >0)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_iscpl ! land ice / ocean coupling option
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_apr ! Atmospheric pressure used as ocean forcing (ln_apr_dyn =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_ssr ! surface boundary condition : sea surface restoring (ln_ssr =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_wave ! External fields from wave model (ln_wave=T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namberg ! iceberg parameters (default: No iceberg)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namlbc ! lateral momentum boundary condition
-!-----------------------------------------------------------------------
-! ! free slip ! partial slip ! no slip ! strong slip
- rn_shlat = 0. ! shlat = 0 ! 0 < shlat < 2 ! shlat = 2 ! 2 < shlat
-/
-!-----------------------------------------------------------------------
-&namagrif ! AGRIF zoom ("key_agrif")
-!-----------------------------------------------------------------------
- ln_spc_dyn = .true. ! use 0 as special value for dynamics
- rn_sponge_tra = 800. ! coefficient for tracer sponge layer [m2/s]
- rn_sponge_dyn = 800. ! coefficient for dynamics sponge layer [m2/s]
- ln_chk_bathy = .FALSE. !
-/
-!-----------------------------------------------------------------------
-&nam_tide ! tide parameters
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambdy ! unstructured open boundaries
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambdy_dta ! open boundaries - external data
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambdy_tide ! tidal forcing at open boundaries
-!-----------------------------------------------------------------------
+
+!!======================================================================
+!! *** Lateral boundary condition *** !!
+!! !!
+!! namlbc lateral momentum boundary condition (default: no slip)
+!! namagrif agrif nested grid ( read by child model only ) ("key_agrif")
+!! nam_tide Tidal forcing (default: OFF)
+!! nambdy Unstructured open boundaries (default: OFF)
+!! nambdy_dta Unstructured open boundaries - external data (see nambdy)
+!! nambdy_tide tidal forcing at open boundaries (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&namlbc ! lateral momentum boundary condition (default: no slip)
+!-----------------------------------------------------------------------
+ rn_shlat = 0. ! free slip
/
!!======================================================================
!! *** Top/Bottom boundary condition *** !!
+!! !!
+!! namdrg top/bottom drag coefficient (default: NO selection)
+!! namdrg_top top friction (ln_OFF=F & ln_isfcav=T)
+!! namdrg_bot bottom friction (ln_OFF=F)
+!! nambbc bottom temperature boundary condition (default: OFF)
+!! nambbl bottom boundary layer scheme (default: OFF)
!!======================================================================
!
@@ -166,29 +115,20 @@
&namdrg ! top/bottom drag coefficient (default: NO selection)
!-----------------------------------------------------------------------
- ln_NONE = .true. ! free-slip : Cd = 0
-/
-!-----------------------------------------------------------------------
-&namdrg_top ! TOP friction (ln_isfcav=T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdrg_bot ! BOTTOM friction
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
-!-----------------------------------------------------------------------
-/
-
-!!======================================================================
-!! Tracer (T & S) namelists !!
-!!======================================================================
-!
-!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+ ln_OFF = .true. ! free-slip : Cd = 0
+/
+
+!!======================================================================
+!! Tracer (T-S) namelists !!
+!! !!
+!! nameos equation of state (default: NO selection)
+!! namtra_adv advection scheme (default: NO selection)
+!! namtra_ldf lateral diffusion scheme (default: NO selection)
+!! namtra_adv_mle mixed layer eddy param. (Fox-Kemper param.) (default: OFF)
+!! namtra_eiv eddy induced velocity param. (default: OFF)
+!! namtra_dmp T & S newtonian damping (default: OFF)
+!!======================================================================
+!
+!-----------------------------------------------------------------------
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_seos = .true. ! = Use simplified equation of state (S-EOS)
@@ -221,5 +161,5 @@
!-----------------------------------------------------------------------
! ! Operator type:
- ln_traldf_NONE = .true. ! No explicit diffusion
+ ln_traldf_OFF = .true. ! No explicit diffusion
ln_traldf_lap = .false. ! laplacian operator
ln_traldf_blp = .false. ! bilaplacian operator
@@ -227,5 +167,13 @@
!!======================================================================
-!! vertical physics namelists !!
+!! *** Dynamics namelists *** !!
+!! !!
+!! nam_vvl vertical coordinate options (default: z-star)
+!! namdyn_adv formulation of the momentum advection (default: NO selection)
+!! namdyn_vor advection scheme (default: NO selection)
+!! namdyn_hpg hydrostatic pressure gradient (default: NO selection)
+!! namdyn_spg surface pressure gradient (default: NO selection)
+!! namdyn_ldf lateral diffusion scheme (default: NO selection)
+!! namdta_dyn offline TOP: dynamics read in files (OFF_SRC only)
!!======================================================================
!
@@ -244,5 +192,5 @@
/
!-----------------------------------------------------------------------
-&namdyn_vor ! Vorticity / Coriolis scheme (default: NO)
+&namdyn_vor ! Vorticity / Coriolis scheme (default: OFF)
!-----------------------------------------------------------------------
ln_dynvor_ene = .false. ! enstrophy conserving scheme
@@ -259,7 +207,7 @@
/
!-----------------------------------------------------------------------
-&namdyn_spg ! surface pressure gradient (default: NO)
-!-----------------------------------------------------------------------
- ln_dynspg_exp = .false.
+&namdyn_spg ! surface pressure gradient (default: OFF)
+!-----------------------------------------------------------------------
+ ln_dynspg_exp = .false.
ln_dynspg_ts = .true. ! split-explicit free surface
ln_bt_fw = .true. ! Forward integration of barotropic Eqs.
@@ -275,10 +223,10 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
- ln_dynldf_NONE= .true. ! No operator (i.e. no explicit diffusion)
+ ln_dynldf_OFF = .true. ! No operator (i.e. no explicit diffusion)
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
! ! Direction of action :
ln_dynldf_lev = .false. ! iso-level
- ln_dynldf_hor = .true. ! horizontal (geopotential)
+ ln_dynldf_hor = .true. ! horizontal (geopotential)
ln_dynldf_iso = .false. ! iso-neutral
! ! Coefficient
@@ -291,4 +239,15 @@
/
+!!======================================================================
+!! vertical physics namelists !!
+!! !!
+!! namzdf vertical physics manager (default: NO selection)
+!! namzdf_ric richardson number vertical mixing (ln_zdfric=T)
+!! namzdf_tke TKE vertical mixing (ln_zdftke=T)
+!! namzdf_gls GLS vertical mixing (ln_zdfgls=T)
+!! namzdf_osm OSM vertical diffusion (ln_zdfosm=T)
+!! namzdf_iwm tidal mixing parameterization (ln_zdfiwm=T)
+!!======================================================================
+!
!-----------------------------------------------------------------------
&namzdf ! vertical physics (default: NO selection)
@@ -307,86 +266,34 @@
nn_havtb = 0 ! horizontal shape for avtb (=1) or not (=0)
/
-!-----------------------------------------------------------------------
-&namzdf_ric ! richardson number dependent vertical diffusion (ln_zdfric =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_tke ! turbulent eddy kinetic dependent vertical diffusion (ln_zdftke =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_gls ! GLS vertical diffusion (ln_zdfgls =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_osm ! OSM vertical diffusion (ln_zdfosm =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namzdf_iwm ! internal wave-driven mixing parameterization (ln_zdfiwm =T)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nammpp ! Massively Parallel Processing ("key_mpp_mpi")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namctl ! Control prints
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsto ! Stochastic parametrization of EOS (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namtrd ! trend diagnostics (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namptr ! Poleward Transport Diagnostic (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namhsb ! Heat and salt budgets (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdiu ! Cool skin and warm layer models (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namflo ! float parameters ("key_float")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_diaharm ! Harmonic analysis of tidal constituents ("key_diaharm")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdct ! transports through some sections ("key_diadct")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_diatmb ! Top Middle Bottom Output (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_dia25h ! 25h Mean Output (default F)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namnc4 ! netcdf4 chunking and compression settings ("key_netcdf4")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namobs ! observation usage switch
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nam_asminc ! assimilation increments ('key_asminc')
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namdta_dyn ! offline dynamics read in files ("key_offline")
-!-----------------------------------------------------------------------
-/
+
+!!======================================================================
+!! *** Diagnostics namelists *** !!
+!! !!
+!! namtrd dynamics and/or tracer trends (default: OFF)
+!! namptr Poleward Transport Diagnostics (default: OFF)
+!! namhsb Heat and salt budgets (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namdiu Cool skin and warm layer models (default: OFF)
+!! namflo float parameters ("key_float")
+!! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")
+!! namdct transports through some sections ("key_diadct")
+!! nam_diatmb Top Middle Bottom Output (default: OFF)
+!! nam_dia25h 25h Mean Output (default: OFF)
+!! namnc4 netcdf4 chunking and compression settings ("key_netcdf4")
+!!======================================================================
+!
+!!======================================================================
+!! *** Observation & Assimilation *** !!
+!! !!
+!! namobs observation and model comparison (default: OFF)
+!! nam_asminc assimilation increments ('key_asminc')
+!!======================================================================
+!
+!!======================================================================
+!! *** Miscellaneous namelists *** !!
+!! !!
+!! nammpp Massively Parallel Processing ("key_mpp_mpi")
+!! namctl Control prints (default: OFF)
+!! namsto Stochastic parametrization of EOS (default: OFF)
+!!======================================================================
+!
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (revision 9526)
@@ -39,5 +39,5 @@
/
!-----------------------------------------------------------------------
-&namwad ! Wetting and Drying (WaD) (default: NO)
+&namwad ! Wetting and Drying (WaD) (default: OFF)
!-----------------------------------------------------------------------
ln_wd_il = .false ! T/F activation of iterative limiter
@@ -222,5 +222,5 @@
/
!-----------------------------------------------------------------------
-&nambbc ! bottom temperature boundary condition (default: NO)
+&nambbc ! bottom temperature boundary condition (default: OFF)
!-----------------------------------------------------------------------
ln_trabbc = .false. ! Apply a geothermal heating at the ocean bottom
@@ -228,9 +228,9 @@
/
!-----------------------------------------------------------------------
-&nambbl ! bottom boundary layer scheme (default: NO)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nameos ! ocean Equation Of Seawater (default: NO)
+&nambbl ! bottom boundary layer scheme (default: OFF)
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nameos ! ocean Equation Of Seawater (default: OFF)
!-----------------------------------------------------------------------
ln_teos10 = .false. ! = Use TEOS-10 equation of state
@@ -254,5 +254,5 @@
&namtra_adv ! advection scheme for tracer (default: NO selection)
!-----------------------------------------------------------------------
- ln_traadv_NONE= .false. ! No tracer advection
+ ln_traadv_OFF = .false. ! No tracer advection
ln_traadv_cen = .false. ! 2nd order centered scheme
ln_traadv_mus = .false. ! MUSCL scheme
@@ -300,5 +300,5 @@
&namdyn_adv ! formulation of the momentum advection (default: NO selection)
!-----------------------------------------------------------------------
- ln_dynadv_NONE= .false. ! linear dynamics (no momentum advection)
+ ln_dynadv_OFF = .false. ! linear dynamics (no momentum advection)
ln_dynadv_vec = .true. ! vector form - 2nd centered scheme
nn_dynkeg = 0 ! grad(KE) scheme: =0 C2 ; =1 Hollingsworth correction
@@ -307,5 +307,5 @@
/
!-----------------------------------------------------------------------
-&namdyn_vor ! Vorticity / Coriolis scheme (default: NO)
+&namdyn_vor ! Vorticity / Coriolis scheme (default: OFF)
!-----------------------------------------------------------------------
ln_dynvor_ene = .false. ! enstrophy conserving scheme
@@ -323,5 +323,5 @@
/
!-----------------------------------------------------------------------
-&namdyn_spg ! surface pressure gradient (default: NO)
+&namdyn_spg ! surface pressure gradient (default: OFF)
!-----------------------------------------------------------------------
ln_dynspg_ts = .true. ! split-explicit free surface
@@ -420,5 +420,5 @@
/
!-----------------------------------------------------------------------
-&namsto ! Stochastic parametrization of EOS (default: NO)
+&namsto ! Stochastic parametrization of EOS (default: OFF)
!-----------------------------------------------------------------------
/
Index: /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (revision 9526)
@@ -10,4 +10,4 @@
ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC
AGRIF_NORDIC OPA_SRC LIM_SRC_3 NST_SRC
+ORCA2_LIM3_PISCES OPA_SRC LIM_SRC_3 TOP_SRC NST_SRC
GYRE_PISCES OPA_SRC TOP_SRC
-ORCA2_LIM3_PISCES OPA_SRC LIM_SRC_3 TOP_SRC NST_SRC
Index: /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90 (revision 9526)
@@ -30,6 +30,6 @@
PUBLIC dyn_adv_init ! routine called by opa module
- ! !* namdyn_adv namelist *
- LOGICAL, PUBLIC :: ln_dynadv_NONE !: linear dynamics (no momentum advection)
+ ! !!* namdyn_adv namelist *
+ LOGICAL, PUBLIC :: ln_dynadv_OFF !: linear dynamics (no momentum advection)
LOGICAL, PUBLIC :: ln_dynadv_vec !: vector form
INTEGER, PUBLIC :: nn_dynkeg !: scheme of grad(KE): =0 C2 ; =1 Hollingsworth
@@ -95,5 +95,5 @@
INTEGER :: ioptio, ios ! Local integer
!
- NAMELIST/namdyn_adv/ ln_dynadv_NONE, ln_dynadv_vec, nn_dynkeg, ln_dynadv_cen2, ln_dynadv_ubs
+ NAMELIST/namdyn_adv/ ln_dynadv_OFF, ln_dynadv_vec, nn_dynkeg, ln_dynadv_cen2, ln_dynadv_ubs
!!----------------------------------------------------------------------
!
@@ -114,5 +114,5 @@
IF(lwp) THEN ! Namelist print
WRITE(numout,*) ' Namelist namdyn_adv : chose a advection formulation & scheme for momentum'
- WRITE(numout,*) ' linear dynamics : no momentum advection ln_dynadv_NONE = ', ln_dynadv_NONE
+ WRITE(numout,*) ' linear dynamics : no momentum advection ln_dynadv_OFF = ', ln_dynadv_OFF
WRITE(numout,*) ' Vector form: 2nd order centered scheme ln_dynadv_vec = ', ln_dynadv_vec
WRITE(numout,*) ' with Hollingsworth scheme (=1) or not (=0) nn_dynkeg = ', nn_dynkeg
@@ -122,5 +122,5 @@
ioptio = 0 ! parameter control and set n_dynadv
- IF( ln_dynadv_NONE ) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_LIN_dyn ; ENDIF
+ IF( ln_dynadv_OFF ) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_LIN_dyn ; ENDIF
IF( ln_dynadv_vec ) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_VEC_c2 ; ENDIF
IF( ln_dynadv_cen2 ) THEN ; ioptio = ioptio + 1 ; n_dynadv = np_FLX_c2 ; ENDIF
Index: /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90 (revision 9526)
@@ -33,5 +33,5 @@
! !!* Namelist namdyn_ldf : lateral mixing on momentum *
- LOGICAL , PUBLIC :: ln_dynldf_NONE !: No operator (i.e. no explicit diffusion)
+ LOGICAL , PUBLIC :: ln_dynldf_OFF !: No operator (i.e. no explicit diffusion)
LOGICAL , PUBLIC :: ln_dynldf_lap !: laplacian operator
LOGICAL , PUBLIC :: ln_dynldf_blp !: bilaplacian operator
@@ -109,8 +109,8 @@
CHARACTER(len=5) :: cl_Units ! units (m2/s or m4/s)
!!
- NAMELIST/namdyn_ldf/ ln_dynldf_NONE, ln_dynldf_lap, ln_dynldf_blp, & ! type of operator
- & ln_dynldf_lev , ln_dynldf_hor, ln_dynldf_iso, & ! acting direction of the operator
- & nn_ahm_ijk_t , rn_Uv , rn_Lv, rn_ahm_b, & ! lateral eddy coefficient
- & rn_csmc , rn_minfac , rn_maxfac ! Smagorinsky settings
+ NAMELIST/namdyn_ldf/ ln_dynldf_OFF, ln_dynldf_lap, ln_dynldf_blp, & ! type of operator
+ & ln_dynldf_lev, ln_dynldf_hor, ln_dynldf_iso, & ! acting direction of the operator
+ & nn_ahm_ijk_t , rn_Uv , rn_Lv, rn_ahm_b, & ! lateral eddy coefficient
+ & rn_csmc , rn_minfac , rn_maxfac ! Smagorinsky settings
!!----------------------------------------------------------------------
!
@@ -131,5 +131,5 @@
!
WRITE(numout,*) ' type :'
- WRITE(numout,*) ' no explicit diffusion ln_dynldf_NONE= ', ln_dynldf_NONE
+ WRITE(numout,*) ' no explicit diffusion ln_dynldf_OFF = ', ln_dynldf_OFF
WRITE(numout,*) ' laplacian operator ln_dynldf_lap = ', ln_dynldf_lap
WRITE(numout,*) ' bilaplacian operator ln_dynldf_blp = ', ln_dynldf_blp
@@ -159,10 +159,10 @@
nldf_dyn = np_ERROR
ioptio = 0
- IF( ln_dynldf_NONE ) THEN ; nldf_dyn = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF
- IF( ln_dynldf_lap ) THEN ; ioptio = ioptio + 1 ; ENDIF
- IF( ln_dynldf_blp ) THEN ; ioptio = ioptio + 1 ; ENDIF
- IF( ioptio /= 1 ) CALL ctl_stop( 'dyn_ldf_init: use ONE of the 3 operator options (NONE/lap/blp)' )
- !
- IF(.NOT.ln_dynldf_NONE ) THEN !== direction ==>> type of operator ==!
+ IF( ln_dynldf_OFF ) THEN ; nldf_dyn = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF
+ IF( ln_dynldf_lap ) THEN ; ioptio = ioptio + 1 ; ENDIF
+ IF( ln_dynldf_blp ) THEN ; ioptio = ioptio + 1 ; ENDIF
+ IF( ioptio /= 1 ) CALL ctl_stop( 'dyn_ldf_init: use ONE of the 3 operator options (NONE/lap/blp)' )
+ !
+ IF(.NOT.ln_dynldf_OFF ) THEN !== direction ==>> type of operator ==!
ioptio = 0
IF( ln_dynldf_lev ) ioptio = ioptio + 1
@@ -232,5 +232,5 @@
l_ldfdyn_time = .FALSE. ! no time variation except in case defined below
!
- IF( ln_dynldf_NONE ) THEN
+ IF( ln_dynldf_OFF ) THEN
IF(lwp) WRITE(numout,*) ' ==>>> No viscous operator selected. ahmt and ahmf are not allocated'
RETURN
Index: /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90 (revision 9526)
@@ -43,5 +43,5 @@
! !!* Namelist namtra_ldf : lateral mixing on tracers *
! != Operator type =!
- LOGICAL , PUBLIC :: ln_traldf_NONE !: no operator: No explicit diffusion
+ LOGICAL , PUBLIC :: ln_traldf_OFF !: no operator: No explicit diffusion
LOGICAL , PUBLIC :: ln_traldf_lap !: laplacian operator
LOGICAL , PUBLIC :: ln_traldf_blp !: bilaplacian operator
@@ -135,9 +135,9 @@
CHARACTER(len=5) :: cl_Units ! units (m2/s or m4/s)
!!
- NAMELIST/namtra_ldf/ ln_traldf_NONE, ln_traldf_lap , ln_traldf_blp , & ! type of operator
- & ln_traldf_lev , ln_traldf_hor , ln_traldf_triad, & ! acting direction of the operator
- & ln_traldf_iso , ln_traldf_msc , rn_slpmax , & ! option for iso-neutral operator
- & ln_triad_iso , ln_botmix_triad, rn_sw_triad , & ! option for triad operator
- & nn_aht_ijk_t , rn_Ud , rn_Ld ! lateral eddy coefficient
+ NAMELIST/namtra_ldf/ ln_traldf_OFF, ln_traldf_lap , ln_traldf_blp , & ! type of operator
+ & ln_traldf_lev, ln_traldf_hor , ln_traldf_triad, & ! acting direction of the operator
+ & ln_traldf_iso, ln_traldf_msc , rn_slpmax , & ! option for iso-neutral operator
+ & ln_triad_iso , ln_botmix_triad, rn_sw_triad , & ! option for triad operator
+ & nn_aht_ijk_t , rn_Ud , rn_Ld ! lateral eddy coefficient
!!----------------------------------------------------------------------
!
@@ -163,5 +163,5 @@
WRITE(numout,*) ' Namelist : namtra_ldf --- lateral mixing parameters (type, direction, coefficients)'
WRITE(numout,*) ' type :'
- WRITE(numout,*) ' no explicit diffusion ln_traldf_NONE = ', ln_traldf_NONE
+ WRITE(numout,*) ' no explicit diffusion ln_traldf_OFF = ', ln_traldf_OFF
WRITE(numout,*) ' laplacian operator ln_traldf_lap = ', ln_traldf_lap
WRITE(numout,*) ' bilaplacian operator ln_traldf_blp = ', ln_traldf_blp
@@ -188,10 +188,10 @@
nldf_tra = np_ERROR
ioptio = 0
- IF( ln_traldf_NONE ) THEN ; nldf_tra = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF
- IF( ln_traldf_lap ) THEN ; ioptio = ioptio + 1 ; ENDIF
- IF( ln_traldf_blp ) THEN ; ioptio = ioptio + 1 ; ENDIF
- IF( ioptio /= 1 ) CALL ctl_stop( 'tra_ldf_init: use ONE of the 3 operator options (NONE/lap/blp)' )
- !
- IF( .NOT.ln_traldf_NONE ) THEN !== direction ==>> type of operator ==!
+ IF( ln_traldf_OFF ) THEN ; nldf_tra = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF
+ IF( ln_traldf_lap ) THEN ; ioptio = ioptio + 1 ; ENDIF
+ IF( ln_traldf_blp ) THEN ; ioptio = ioptio + 1 ; ENDIF
+ IF( ioptio /= 1 ) CALL ctl_stop( 'tra_ldf_init: use ONE of the 3 operator options (NONE/lap/blp)' )
+ !
+ IF( .NOT.ln_traldf_OFF ) THEN !== direction ==>> type of operator ==!
ioptio = 0
IF( ln_traldf_lev ) ioptio = ioptio + 1
@@ -278,5 +278,5 @@
l_ldftra_time = .FALSE. ! no time variation except in case defined below
!
- IF( ln_traldf_NONE ) THEN !== no explicit diffusive operator ==!
+ IF( ln_traldf_OFF ) THEN !== no explicit diffusive operator ==!
!
IF(lwp) WRITE(numout,*) ' ==>>> No diffusive operator selected. ahtu and ahtv are not allocated'
Index: /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (revision 9526)
@@ -46,5 +46,5 @@
! !!* Namelist namtra_adv *
- LOGICAL :: ln_traadv_NONE ! no advection on T and S
+ LOGICAL :: ln_traadv_OFF ! no advection on T and S
LOGICAL :: ln_traadv_cen ! centered scheme flag
INTEGER :: nn_cen_h, nn_cen_v ! =2/4 : horizontal and vertical choices of the order of CEN scheme
@@ -185,5 +185,5 @@
INTEGER :: ioptio, ios ! Local integers
!
- NAMELIST/namtra_adv/ ln_traadv_NONE, & ! No advection
+ NAMELIST/namtra_adv/ ln_traadv_OFF, & ! No advection
& ln_traadv_cen , nn_cen_h, nn_cen_v, & ! CEN
& ln_traadv_fct , nn_fct_h, nn_fct_v, & ! FCT
@@ -208,5 +208,5 @@
WRITE(numout,*) '~~~~~~~~~~~~'
WRITE(numout,*) ' Namelist namtra_adv : chose a advection scheme for tracers'
- WRITE(numout,*) ' No advection on T & S ln_traadv_NONE= ', ln_traadv_NONE
+ WRITE(numout,*) ' No advection on T & S ln_traadv_OFF = ', ln_traadv_OFF
WRITE(numout,*) ' centered scheme ln_traadv_cen = ', ln_traadv_cen
WRITE(numout,*) ' horizontal 2nd/4th order nn_cen_h = ', nn_fct_h
@@ -224,10 +224,10 @@
! !== Parameter control & set nadv ==!
ioptio = 0
- IF( ln_traadv_NONE ) THEN ; ioptio = ioptio + 1 ; nadv = np_NO_adv ; ENDIF
- IF( ln_traadv_cen ) THEN ; ioptio = ioptio + 1 ; nadv = np_CEN ; ENDIF
- IF( ln_traadv_fct ) THEN ; ioptio = ioptio + 1 ; nadv = np_FCT ; ENDIF
- IF( ln_traadv_mus ) THEN ; ioptio = ioptio + 1 ; nadv = np_MUS ; ENDIF
- IF( ln_traadv_ubs ) THEN ; ioptio = ioptio + 1 ; nadv = np_UBS ; ENDIF
- IF( ln_traadv_qck ) THEN ; ioptio = ioptio + 1 ; nadv = np_QCK ; ENDIF
+ IF( ln_traadv_OFF ) THEN ; ioptio = ioptio + 1 ; nadv = np_NO_adv ; ENDIF
+ IF( ln_traadv_cen ) THEN ; ioptio = ioptio + 1 ; nadv = np_CEN ; ENDIF
+ IF( ln_traadv_fct ) THEN ; ioptio = ioptio + 1 ; nadv = np_FCT ; ENDIF
+ IF( ln_traadv_mus ) THEN ; ioptio = ioptio + 1 ; nadv = np_MUS ; ENDIF
+ IF( ln_traadv_ubs ) THEN ; ioptio = ioptio + 1 ; nadv = np_UBS ; ENDIF
+ IF( ln_traadv_qck ) THEN ; ioptio = ioptio + 1 ; nadv = np_QCK ; ENDIF
!
IF( ioptio /= 1 ) CALL ctl_stop( 'tra_adv_init: Choose ONE advection option in namelist namtra_adv' )
Index: /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfdrg.F90 (revision 9526)
@@ -41,5 +41,5 @@
! !!* Namelist namdrg: nature of drag coefficient namelist *
- LOGICAL :: ln_NONE ! free-slip : Cd = 0
+ LOGICAL :: ln_OFF ! free-slip : Cd = 0
LOGICAL :: ln_lin ! linear drag: Cd = Cd0_lin
LOGICAL :: ln_non_lin ! non-linear drag: Cd = Cd0_nl |U|
@@ -61,5 +61,5 @@
INTEGER :: ndrg ! choice of the type of drag coefficient
! ! associated indices:
- INTEGER, PARAMETER :: np_NONE = 0 ! free-slip: drag set to zero
+ INTEGER, PARAMETER :: np_OFF = 0 ! free-slip: drag set to zero
INTEGER, PARAMETER :: np_lin = 1 ! linear drag: Cd = Cd0_lin
INTEGER, PARAMETER :: np_non_lin = 2 ! non-linear drag: Cd = Cd0_nl |U|
@@ -231,5 +231,5 @@
INTEGER :: ios, ioptio ! local integers
!!
- NAMELIST/namdrg/ ln_NONE, ln_lin, ln_non_lin, ln_loglayer, ln_drgimp
+ NAMELIST/namdrg/ ln_OFF, ln_lin, ln_non_lin, ln_loglayer, ln_drgimp
!!----------------------------------------------------------------------
!
@@ -249,5 +249,5 @@
WRITE(numout,*) '~~~~~~~~~~~~'
WRITE(numout,*) ' Namelist namdrg : top/bottom friction choices'
- WRITE(numout,*) ' free-slip : Cd = 0 ln_NONE = ', ln_NONE
+ WRITE(numout,*) ' free-slip : Cd = 0 ln_OFF = ', ln_OFF
WRITE(numout,*) ' linear drag : Cd = Cd0 ln_lin = ', ln_lin
WRITE(numout,*) ' non-linear drag: Cd = Cd0_nl |U| ln_non_lin = ', ln_non_lin
@@ -257,5 +257,5 @@
!
ioptio = 0 ! set ndrg and control check
- IF( ln_NONE ) THEN ; ndrg = np_NONE ; ioptio = ioptio + 1 ; ENDIF
+ IF( ln_OFF ) THEN ; ndrg = np_OFF ; ioptio = ioptio + 1 ; ENDIF
IF( ln_lin ) THEN ; ndrg = np_lin ; ioptio = ioptio + 1 ; ENDIF
IF( ln_non_lin ) THEN ; ndrg = np_non_lin ; ioptio = ioptio + 1 ; ENDIF
@@ -386,5 +386,5 @@
SELECT CASE( ndrg )
!
- CASE( np_NONE ) !== No top/bottom friction ==! (pCdU = 0)
+ CASE( np_OFF ) !== No top/bottom friction ==! (pCdU = 0)
IF(lwp) WRITE(numout,*)
IF(lwp) WRITE(numout,*) ' ==>>> ',TRIM(cd_topbot),' free-slip, friction set to zero'
Index: /branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90 (revision 9526)
@@ -39,5 +39,5 @@
! !!* Namelist namtrc_adv *
- LOGICAL :: ln_trcadv_NONE ! no advection on passive tracers
+ LOGICAL :: ln_trcadv_OFF ! no advection on passive tracers
LOGICAL :: ln_trcadv_cen ! centered scheme flag
INTEGER :: nn_cen_h, nn_cen_v ! =2/4 : horizontal and vertical choices of the order of CEN scheme
@@ -155,5 +155,5 @@
INTEGER :: ioptio, ios ! Local integer
!!
- NAMELIST/namtrc_adv/ ln_trcadv_NONE, & ! No advection
+ NAMELIST/namtrc_adv/ ln_trcadv_OFF, & ! No advection
& ln_trcadv_cen, nn_cen_h, nn_cen_v, & ! CEN
& ln_trcadv_fct, nn_fct_h, nn_fct_v, & ! FCT
@@ -177,5 +177,5 @@
WRITE(numout,*) '~~~~~~~~~~~'
WRITE(numout,*) ' Namelist namtrc_adv : chose a advection scheme for tracers'
- WRITE(numout,*) ' No advection on passive tracers ln_trcadv_NONE= ', ln_trcadv_NONE
+ WRITE(numout,*) ' No advection on passive tracers ln_trcadv_OFF = ', ln_trcadv_OFF
WRITE(numout,*) ' centered scheme ln_trcadv_cen = ', ln_trcadv_cen
WRITE(numout,*) ' horizontal 2nd/4th order nn_cen_h = ', nn_fct_h
@@ -193,10 +193,10 @@
! !== Parameter control & set nadv ==!
ioptio = 0
- IF( ln_trcadv_NONE ) THEN ; ioptio = ioptio + 1 ; nadv = np_NO_adv ; ENDIF
- IF( ln_trcadv_cen ) THEN ; ioptio = ioptio + 1 ; nadv = np_CEN ; ENDIF
- IF( ln_trcadv_fct ) THEN ; ioptio = ioptio + 1 ; nadv = np_FCT ; ENDIF
- IF( ln_trcadv_mus ) THEN ; ioptio = ioptio + 1 ; nadv = np_MUS ; ENDIF
- IF( ln_trcadv_ubs ) THEN ; ioptio = ioptio + 1 ; nadv = np_UBS ; ENDIF
- IF( ln_trcadv_qck ) THEN ; ioptio = ioptio + 1 ; nadv = np_QCK ; ENDIF
+ IF( ln_trcadv_OFF ) THEN ; ioptio = ioptio + 1 ; nadv = np_NO_adv ; ENDIF
+ IF( ln_trcadv_cen ) THEN ; ioptio = ioptio + 1 ; nadv = np_CEN ; ENDIF
+ IF( ln_trcadv_fct ) THEN ; ioptio = ioptio + 1 ; nadv = np_FCT ; ENDIF
+ IF( ln_trcadv_mus ) THEN ; ioptio = ioptio + 1 ; nadv = np_MUS ; ENDIF
+ IF( ln_trcadv_ubs ) THEN ; ioptio = ioptio + 1 ; nadv = np_UBS ; ENDIF
+ IF( ln_trcadv_qck ) THEN ; ioptio = ioptio + 1 ; nadv = np_QCK ; ENDIF
!
IF( ioptio /= 1 ) CALL ctl_stop( 'trc_adv_ini: Choose ONE advection option in namelist namtrc_adv' )
Index: /branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
===================================================================
--- /branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (revision 9525)
+++ /branches/2017/dev_merge_2017/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90 (revision 9526)
@@ -34,5 +34,5 @@
!
! !!: ** lateral mixing namelist (nam_trcldf) **
- LOGICAL , PUBLIC :: ln_trcldf_NONE !: No operator (no explicit lateral diffusion)
+ LOGICAL , PUBLIC :: ln_trcldf_OFF !: No operator (no explicit lateral diffusion)
LOGICAL , PUBLIC :: ln_trcldf_tra !: use active tracer operator
REAL(wp), PUBLIC :: rn_ldf_multi !: multiplier of T-S eddy diffusivity to obtain the passive tracer one
@@ -67,5 +67,5 @@
!!----------------------------------------------------------------------
!
- IF( ln_trcldf_NONE ) RETURN ! not lateral diffusion applied on passive tracers
+ IF( ln_trcldf_OFF ) RETURN ! not lateral diffusion applied on passive tracers
!
IF( ln_timing ) CALL timing_start('trc_ldf')
@@ -127,11 +127,11 @@
!! ** Purpose : Define the operator for the lateral diffusion
!!
- !! ** Method : - ln_trcldf_tra =T : use nldf_tra set in ldftra module
+ !! ** Method : - ln_trcldf_tra=T : use nldf_tra set in ldftra module
!! to defined the passive tracer lateral diffusive operator
- !! - ln_trcldf_NONE=T : no explicit diffusion used
+ !! - ln_trcldf_OFF=T : no explicit diffusion used
!!----------------------------------------------------------------------
INTEGER :: ios, ioptio ! local integers
!!
- NAMELIST/namtrc_ldf/ ln_trcldf_NONE, ln_trcldf_tra, & ! operator & direction
+ NAMELIST/namtrc_ldf/ ln_trcldf_OFF , ln_trcldf_tra, & ! operator & direction
& rn_ldf_multi , rn_fact_lap ! coefficient
!!----------------------------------------------------------------------
@@ -154,9 +154,9 @@
IF(lwp) THEN ! Namelist print
WRITE(numout,*) ' Namelist namtrc_ldf : set lateral mixing parameters (type, direction, coefficients)'
- WRITE(numout,*) ' no explicit diffusion ln_trcldf_NONE = ', ln_trcldf_NONE
+ WRITE(numout,*) ' no explicit diffusion ln_trcldf_OFF = ', ln_trcldf_OFF
WRITE(numout,*) ' use active tracer operator ln_trcldf_tra = ', ln_trcldf_tra
WRITE(numout,*) ' diffusivity coefficient :'
- WRITE(numout,*) ' multiplier of TRA coef. for TRC rn_ldf_multi = ', rn_ldf_multi
- WRITE(numout,*) ' enhanced zonal Eq. laplacian coef. rn_fact_lap = ', rn_fact_lap
+ WRITE(numout,*) ' multiplier of TRA coef. for TRC rn_ldf_multi = ', rn_ldf_multi
+ WRITE(numout,*) ' enhanced zonal Eq. laplacian coef. rn_fact_lap = ', rn_fact_lap
ENDIF
@@ -165,5 +165,5 @@
nldf_trc = np_ERROR
ioptio = 0
- IF( ln_trcldf_NONE ) THEN ; nldf_trc = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF
+ IF( ln_trcldf_OFF ) THEN ; nldf_trc = np_no_ldf ; ioptio = ioptio + 1 ; ENDIF
IF( ln_trcldf_tra ) THEN ; nldf_trc = nldf_tra ; ioptio = ioptio + 1 ; ENDIF
IF( ioptio /= 1 ) CALL ctl_stop( 'trc_ldf_ini: use ONE of the 2 operator options (NONE/tra)' )