Changeset 4148 for branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/SHARED

Timestamp:

2013-11-04T13:54:28+01:00 (11 years ago)

Author:

cetlod

Message:

merge in trunk changes between r3853 and r3940 and commit the changes, see ticket #1169

Location:

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/SHARED

Files:

• field_def.xml (modified) (1 diff)
• namelist_ice_lim2_ref (modified) (1 diff)
• namelist_top_ref (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/SHARED/field_def.xml

@@ -53 +53 @@
 
          <field id="empmr"        long_name="Net Upward Water Flux"                                        unit="kg/m2/s"  />
-         <field id="saltflx"      long_name="Downward salt flux"                                          unit="PSU/m2/s"  />
+         <field id="saltflx"      long_name="Downward salt flux"                                           unit="PSU/m2/s"  />
+         <field id="fmmflx"       long_name="Water flux due to freezing/melting"                           unit="kg/m2/s"  />
          <field id="snowpre"      long_name="Snow precipitation"                                           unit="kg/m2/s"  />
          <field id="runoffs"      long_name="River Runoffs"                                                unit="Kg/m2/s"  />

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/SHARED/namelist_ice_lim2_ref

@@ -89 +89 @@
 !              !              !  (if <0  months)  !   name   !  (logical)   !  (T/F) ! 'monthly' ! filename ! pairing  !
    sn_hicif    = 'ice_damping',  -1.              , 'hicif'  ,   .true.     , .true. , 'yearly'  , ''       , ''
-   sn_cnf      = 'ice_damping',  -1.              , 'frld'   ,   .true.     , .true. , 'yearly'  , ''       , ''
+   sn_frld     = 'ice_damping',  -1.              , 'frld'   ,   .true.     , .true. , 'yearly'  , ''       , ''
 !
    cn_dir      = './'      !  root directory for the location of the runoff files

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/SHARED/namelist_top_ref

@@ -14 +14 @@
    nn_dttrc      =  1        !  time step frequency for passive sn_tracers      
    nn_writetrc   =  5475     !  time step frequency for sn_tracer outputs
+   ln_top_euler  = .false.   !  use Euler time-stepping for TOP
    ln_rsttr      = .false.   !  start from a restart file (T) or not (F)
    nn_rsttr      =   0       !  restart control = 0 initial time step is not compared to the restart file value
@@ -33 +34 @@
 !-----------------------------------------------------------------------
    ln_trcadv_cen2    =  .false.  !  2nd order centered scheme   
-   ln_trcadv_tvd     =  .false.  !  TVD scheme
-   ln_trcadv_muscl   =  .true.   !  MUSCL scheme
+   ln_trcadv_tvd     =  .true.  !  TVD scheme
+   ln_trcadv_muscl   =  .false.   !  MUSCL scheme
    ln_trcadv_muscl2  =  .false.  !  MUSCL2 scheme + cen2 at boundaries
    ln_trcadv_ubs     =  .false.  !  UBS scheme