Index: trunk/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg
===================================================================
--- trunk/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg	(revision 6489)
+++ trunk/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist_cfg	(revision 7646)
@@ -22,47 +22,16 @@
 &namcfg     !   parameters of the configuration   
 !-----------------------------------------------------------------------
-   cp_cfg      =  "gyre"                 !  name of the configuration
-   jp_cfg      =       1                 !  resolution of the configuration
-   jpidta      =      32                 !  1st lateral dimension ( >= jpi ) = 30*jp_cfg+2
-   jpjdta      =      22                 !  2nd    "         "    ( >= jpj ) = 20*jp_cfg+2 
-   jpkdta      =      31                 !  number of levels      ( >= jpk )
-   jpiglo      =      32                 !  1st dimension of global domain --> i  = jpidta
-   jpjglo      =      22                 !  2nd    -                  -    --> j  = jpjdta
-   jpizoom     =       1                 !  left bottom (i,j) indices of the zoom
-   jpjzoom     =       1                 !  in data domain indices
-   jperio      =       0                 !  lateral cond. type (between 0 and 6)
-/
-&namzgr        !   vertical coordinate
-!-----------------------------------------------------------------------
-   ln_zco      = .true.    !  z-coordinate - full    steps
-   ln_linssh   = .true.   !  linear free surface
-/
-!-----------------------------------------------------------------------
-&namzgr_sco    !   s-coordinate or hybrid z-s-coordinate
-!-----------------------------------------------------------------------
+   ln_read_cfg = .false.   !  (=T) read the domain configuration file
+      !                    !  (=F) user defined configuration  ==>>>  see usrdef(_...) modules
+   ln_write_cfg= .false.   !  (=T) create the domain configuration file
 /
 !-----------------------------------------------------------------------
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------
-   nn_bathy    =    0      !  compute (=0) or read (=1) the bathymetry file
-   rn_rdt      = 7200.     !  time step for the dynamics 
-   jphgr_msh   =       5                 !  type of horizontal mesh
-   ppglam0     =       0.0               !  longitude of first raw and column T-point (jphgr_msh = 1)
-   ppgphi0     =      29.0               ! latitude  of first raw and column T-point (jphgr_msh = 1)
-   ppe1_deg    =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_deg    =  999999.0               !  meridional grid-spacing (degrees)
-   ppe1_m      =  999999.0               !  zonal      grid-spacing (degrees)
-   ppe2_m      =  999999.0               !  meridional grid-spacing (degrees)
-   ppsur       =   -2033.194295283385    !  ORCA r4, r2 and r05 coefficients
-   ppa0        =     155.8325369664153   ! (default coefficients)
-   ppa1        =     146.3615918601890   !
-   ppkth       =      17.28520372419791  !
-   ppacr       =       5.0               !
-   ppdzmin     =  999999.0               !  Minimum vertical spacing
-   pphmax      =  999999.0               !  Maximum depth
-   ldbletanh   =  .FALSE.                !  Use/do not use double tanf function for vertical coordinates
-   ppa2        =  999999.0               !  Double tanh function parameters
-   ppkth2      =  999999.0               !
-   ppacr2      =  999999.0               !
+   ln_linssh   = .true.    !  =T  linear free surface  ==>>  model level are fixed in time
+   !
+   nn_msh      =    0      !  create (>0) a mesh file or not (=0)
+   !
+   rn_rdt      = 7200.     !  time step for the dynamics (and tracer if nn_acc=0)
 /
 !-----------------------------------------------------------------------
@@ -85,6 +54,6 @@
    nn_fsbc     = 1         !  frequency of surface boundary condition computation
                            !     (also = the frequency of sea-ice model call)
-   ln_ana      = .true.    !  analytical formulation                    (T => fill namsbc_ana )
-   ln_blk_core = .false.   !  CORE bulk formulation                     (T => fill namsbc_core)
+   ln_usr      = .true.    !  user defined formulation                  (T => check usrdef_sbc)
+   ln_blk      = .false.   !  Bulk formulation                          (T => fill namsbc_blk )
    nn_ice      = 0         !  =0 no ice boundary condition   ,
    ln_rnf      = .false.   !  runoffs                                   (T => fill namsbc_rnf)
@@ -93,30 +62,4 @@
 /
 !-----------------------------------------------------------------------
-&namsbc_ana    !   analytical surface boundary condition
-!-----------------------------------------------------------------------
-   nn_tau000   =   100     !  gently increase the stress over the first ntau_rst time-steps
-   rn_utau0    =   0.1e0   !  uniform value for the i-stress
-/
-!-----------------------------------------------------------------------
-&namsbc_flx    !   surface boundary condition : flux formulation
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_clio   !   namsbc_clio  CLIO bulk formulae
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_core   !   namsbc_core  CORE bulk formulae
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_mfs   !   namsbc_mfs  MFS bulk formulae
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&namsbc_cpl    !   coupled ocean/atmosphere model                       ("key_oasis3")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
 &namtra_qsr    !   penetrative solar radiation
 !-----------------------------------------------------------------------
@@ -159,13 +102,13 @@
 /
 !-----------------------------------------------------------------------
-&nam_tide      !    tide parameters (#ifdef key_tide)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambdy        !  unstructured open boundaries                          ("key_bdy")
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
-&nambdy_dta      !  open boundaries - external data           ("key_bdy")
+&nam_tide      !    tide parameters
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambdy        !  unstructured open boundaries                          
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
+&nambdy_dta      !  open boundaries - external data           
 !-----------------------------------------------------------------------
 /
@@ -191,17 +134,4 @@
 !-----------------------------------------------------------------------
    ln_eos80    = .true.         !  = Use EOS80 equation of state
-   !                             !
-   !                      ! S-EOS coefficients :
-   !                             !  rd(T,S,Z)*rau0 = -a0*(1+.5*lambda*dT+mu*Z+nu*dS)*dT+b0*dS
-   rn_a0       =  1.6550e-1      !  thermal expension coefficient (nn_eos= 1)
-   rn_b0       =  7.6554e-1      !  saline  expension coefficient (nn_eos= 1)
-   rn_lambda1  =  5.9520e-2      !  cabbeling coeff in T^2  (=0 for linear eos)
-   rn_lambda2  =  7.4914e-4      !  cabbeling coeff in S^2  (=0 for linear eos)
-   rn_mu1      =  1.4970e-4      !  thermobaric coeff. in T (=0 for linear eos)
-   rn_mu2      =  1.1090e-5      !  thermobaric coeff. in S (=0 for linear eos)
-   rn_nu       =  2.4341e-3      !  cabbeling coeff in T*S  (=0 for linear eos)
-!!org GYRE   rn_alpha    =   2.0e-4  !  thermal expension coefficient (nn_eos= 1 or 2)
-!!org GYRE   rn_beta     =   7.7e-4  !  saline  expension coefficient (nn_eos= 2)
-!!org  caution  now a0 = alpha / rau0   with rau0 = 1026
 /
 !-----------------------------------------------------------------------
