Changeset 8291 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED

Timestamp:

2017-07-06T11:49:56+02:00 (7 years ago)

Author:

clem

Message:

correct last commit changes. This is the start version for the modifications of the ice model. All sette tests passed except restartability for agrif and sas (though sas_biper is restartable). Configurations CREG, SPITZ, FER & SASBIPER are running.

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED

Files:

• field_def_nemo-lim.xml (modified) (1 diff)
• namelist_ref (modified) (2 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/field_def_nemo-lim.xml

@@ -232 +232 @@
          <field id="e3t_m"    unit="m"    />
          <field id="frq_m"    unit="-"    />
+
+         <!-- specific for rheology -->
+         <field id="isig1"        long_name="1st principal stress component for EVP rhg"                   unit="unitless" />
+         <field id="isig2"        long_name="2nd principal stress component for EVP rhg"                   unit="unitless" />
+         <field id="isig3"        long_name="convergence measure for EVP rheology (must be =1)"            unit="unitless" />
 
       </field_group>

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -313 +313 @@
 !              !             !  (if <0  months)  !   name    !  (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
    l_sasread   = .TRUE.   ! Read fields in a file if .TRUE. , or initialize to 0. in sbcssm.F90 if .FALSE.
-   sn_usp      = 'sas_grid_U',     120           , 'vozocrtx',   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
-   sn_vsp      = 'sas_grid_V',     120           , 'vomecrty',   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
+   sn_usp      = 'sas_grid_U',     120           ,    'uos'  ,   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
+   sn_vsp      = 'sas_grid_V',     120           ,    'vos'  ,   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
    sn_tem      = 'sas_grid_T',     120           , 'sosstsst',   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
    sn_sal      = 'sas_grid_T',     120           , 'sosaline',   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
@@ -321 +321 @@
    sn_frq      = 'sas_grid_T',     120           , 'frq_m'   ,   .true.    , .true. , 'yearly'  ,    ''    ,    ''    ,    ''
 
-   ln_3d_uve   = .true.    !  specify whether we are supplying a 3D u,v and e3 field
+   ln_3d_uve   = .false.   !  specify whether we are supplying a 3D u,v and e3 field
    ln_read_frq = .false.   !  specify whether we must read frq or not
    cn_dir      = './'      !  root directory for the location of the bulk files are