Changeset 7646 for trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg (modified) (3 diffs)

trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/namelist_cfg

@@ -15 +15 @@
 &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
+   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)
 /
 !-----------------------------------------------------------------------
@@ -73 +45 @@
    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)
@@ -86 +58 @@
    ln_qsr_2bd  = .true.    !  2 bands              light penetration
    nn_chldta   =      0    !  RGB : Chl data (=1) or cst value (=0)
-/
-
-!-----------------------------------------------------------------------
-&namberg       !   iceberg parameters
-!-----------------------------------------------------------------------
 /
 !-----------------------------------------------------------------------