Changeset 2647 for CONFIG/UNIFORM/v6/NEMO_v6/GENERAL

Timestamp:

10/17/15 15:28:39 (9 years ago)

Author:

cetlod

Message:

update namelist and card for NEMO_v6 configurations

Location:

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL

Files:

• DRIVER/opa9.driver (modified) (4 diffs)
• PARAM/iodef_ORCA_lim2.xml (deleted)
• PARAM/iodef_ORCA_lim3.xml (deleted)
• PARAM/iodef_lim2.xml (added)
• PARAM/iodef_lim3.xml (added)
• PARAM/namelist_ORCA2_cfg (modified) (2 diffs)
• PARAM/namelist_ice_lim2_ORCA2_cfg (deleted)
• PARAM/namelist_ice_lim2_ref (deleted)
• PARAM/namelist_ice_lim3_ORCA1_cfg (deleted)
• PARAM/namelist_ice_lim3_ref (deleted)
• PARAM/namelist_lim2_ORCA2_cfg (added)
• PARAM/namelist_lim2_ref (added)
• PARAM/namelist_lim3_ORCA1_cfg (added)
• PARAM/namelist_lim3_ORCA2_cfg (added)
• PARAM/namelist_lim3_ref (added)
• PARAM/namelist_top_ORCA2_cfg (modified) (2 diffs)

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/DRIVER/opa9.driver

@@ -5 +5 @@
     IGCM_debug_PushStack "OCE_Initialize"
 
-    JOB_NAME=${config_UserChoices_JobName}
-
-#?? RESOL_OCE=$( echo $RESOL | awk "-Fx" '{print $2}' | awk "-F-" '{print $1}')
-#?? [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_OCE_3D ${SUBMIT_DIR}/../.resol) || RESOL_OCE_3D=96x95x39
-
-    OPA_NDT_DAY=${opa9_UserChoices_OPA_NDT_DAY:=24}
+    RESOL_OCE=$( echo ${config_UserChoices_ExperimentName} | cut -c1-5 )
 
 # Local function to find namelists parameters
@@ -17 +12 @@
 }
 
-    OPA_RDT=$( supergrep rn_rdt  ${SUBMIT_DIR}/PARAM/namelist_cfg | sed 's/ *rn_rdt *=//' | sed 's/\. *,//' )
+    OPA_RDT=$( supergrep rn_rdt  ${SUBMIT_DIR}/PARAM/namelist_${RESOL_OCE}_cfg | sed 's/ *rn_rdt *=//' | sed 's/\. *,//' )
 
     # Period Length In Days between DateBegin and first day of calendar 0001 01 01
     # /!\ Needed by OPA namelist to compute file names /!\
     (( DaysSinceJC = $( IGCM_date_DaysSinceJC ${DateBegin} ) + 1 ))
+
+    (( OPA_NDT_DAY  =  86400 / OPA_RDT ))
 
     # Definition from opa9.card of List_jobsbc and List_runsbc used to do to interannual and climatological runs 
@@ -129 +126 @@
     # TEST year for EMPave_old.dat file
     # Needed if in namelist fwb=2 after firts year, because in EMPave_old.dat file first year is 0
-    eval year_EMPave_old=`awk '{ print $1 }' ${RUN_DIR}/EMPave_old.dat`
-    (( PeriodCumulPeriod =  ${CumulPeriod} - 1 )) 
-    (( PeriodInitYear =${InitYear} + ${PeriodCumulPeriod} * ${PeriodLengthInYears} ))
-    echo "value year: X${year}"
-    echo "value PeriodInitYear: X${PeriodInitYear}"
+#    eval year_EMPave_old=`awk '{ print $1 }' ${RUN_DIR}/EMPave_old.dat`
+#    (( PeriodCumulPeriod =  ${CumulPeriod} - 1 )) 
+#    (( PeriodInitYear =${InitYear} + ${PeriodCumulPeriod} * ${PeriodLengthInYears} ))
+#    echo "value year: X${year}"
+#    echo "value PeriodInitYear: X${PeriodInitYear}"
 #    if [ "${CumulPeriod}" -ne 1 ] ; then
 #       if [ ${year_m1} = ${year_EMPave_old} ] ; then
@@ -242 +239 @@
    IGCM_comp_modifyNamelist blocker    namelist_cfg nn_leapy  ${OPA_NLEAPY}  
 
-
-
-
-    # update xmlio_server.def
-
-#SF: commented for now, thinking at it for new version wityh xio server, sed in iodef.xml
-  #  if [ X${opa9_UserChoices_io_server} = Xy ] ; then
-  #      sed -e "s/${PAT_SERVER}/  using_server = .TRUE./" \
-  #      xmlio_server.def > xmlio_server.def.tmp
-  #      IGCM_sys_Mv xmlio_server.def.tmp xmlio_server.def
-  #  fi
-        
+   # update domain_def.xml file
+   case ${RESOL_OCE} in
+       ( *ORCA2* ) 
+          sed -e 's/<domain id="1point" zoom_ibegin="150" zoom_jbegin="150"/<domain id="1point" zoom_ibegin="10" zoom_jbegin="10"/' domain_def.xml > domain_def.xml.tmp 
+          IGCM_sys_Mv domain_def.xml.tmp domain_def.xml  ;
+   esac
+
     IGCM_debug_PopStack "OCE_Update"
 }

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_ORCA2_cfg

@@ -6 +6 @@
 &namrun        !   parameters of the run
 !-----------------------------------------------------------------------
+   cn_exp      =  _AUTO_
+   nn_date0    =  _AUTO_   !  date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
+   nn_leapy    =  _AUTO_   !  Leap year calendar (1) or not (0)
+   ln_rstart   =  _AUTO_
+   nn_rstctl   =  _AUTO_
+   nn_it000    =  _AUTO_
+   nn_itend    =  _AUTO_
+   nn_stock    =  _AUTO_
+   nn_write    =    720
+   ln_mskland  = .true.
+   ln_clobber  = .true.
 /
 !-----------------------------------------------------------------------
@@ -46 +57 @@
    ppkth2      =  999999.              !
    ppacr2      =  999999.              !
+   rn_rdt      = 5760.     !  time step for the dynamics (and tracer if nn_acc=0)
+   rn_atfp     =    0.1    !  asselin time filter parameter
+   nn_acc      =    0      !  acceleration of convergence : =1      used, rdt < rdttra(k)
+                                 !                          =0, not used, rdt = rdttra
+   rn_rdtmin   = 28800.          !  minimum time step on tracers (used if nn_acc=1)
+   rn_rdtmax   = 28800.          !  maximum time step on tracers (used if nn_acc=1)
+   rn_rdth     =  800.           !  depth variation of tracer time step  (used if nn_acc=1)
+   nn_msh      =  0 
 /
 !-----------------------------------------------------------------------

CONFIG/UNIFORM/v6/NEMO_v6/GENERAL/PARAM/namelist_top_ORCA2_cfg

@@ -5 +5 @@
 &namtrc_run     !   run information
 !-----------------------------------------------------------------------
+   ln_rsttr      = _AUTO_
+   nn_rsttr      = _AUTO_
+   ln_top_euler   = .true.
 /
 !-----------------------------------------------------------------------
@@ -40 +43 @@
 &namtrc_dta      !    Initialisation from data input file
 !-----------------------------------------------------------------------
-!          !  file name  ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
-!          !             !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
-   sn_trcdta(1)  = 'data_DIC_nomask'        ,        -12        ,  'DIC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(2)  = 'data_Alkalini_nomask'   ,        -12        ,  'Alkalini',    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(3)  = 'data_O2_nomask'         ,        -1         ,  'O2'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(5)  = 'data_PO4_nomask'        ,        -1         ,  'PO4'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(7)  = 'data_Si_nomask'         ,        -1         ,  'Si'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(10) = 'data_DOC_nomask'        ,        -12        ,  'DOC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(14) = 'data_Fer_nomask'        ,        -12        ,  'Fer'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
-   sn_trcdta(23) = 'data_NO3_nomask'        ,        -1         ,  'NO3'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
+!                !  file name                           ! frequency (hours) ! variable  ! time interp. !  clim  ! 'yearly'/ ! weights  ! rotation ! land/sea mask !
+!                !                                      !  (if <0  months)  !   name    !   (logical)  !  (T/F) ! 'monthly' ! filename ! pairing  ! filename      !
+   sn_trcdta(1)  = 'DIC_GLODAP_annual_ORCA_R2.nc'       ,        -12        ,  'DIC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(2)  = 'Alkalini_GLODAP_annual_ORCA_R2.nc'  ,        -12        ,  'Alkalini',    .false.   , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(3)  = 'O2_WOA2009_monthly_ORCA_R2.nc'      ,        -1         ,  'O2'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(5)  = 'PO4_WOA2009_monthly_ORCA_R2.nc'     ,        -1         ,  'PO4'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(7)  = 'Si_WOA2009_monthly_ORCA_R2.nc'      ,        -1         ,  'Si'      ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(10) = 'DOC_PISCES_monthly_ORCA_R2.nc'      ,        -12        ,  'DOC'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(14) = 'Fer_PISCES_monthly_ORCA_R2.nc'      ,        -12        ,  'Fer'     ,    .false.   , .true. , 'yearly'  , ''       , ''   , ''
+   sn_trcdta(23) = 'NO3_WOA2009_monthly_ORCA_R2.nc'     ,        -1         ,  'NO3'     ,    .true.    , .true. , 'yearly'  , ''       , ''   , ''
    rn_trfac(1)   =   1.0e-06  !  multiplicative factor
    rn_trfac(2)   =   1.0e-06  !  -      -      -     -