Browse Source

Update trunk following SVN repo

Pierre-Yves Barriat 7 years ago
parent
commit
3059f5bbbb
2 changed files with 21 additions and 39 deletions
  1. 0 24
      trunk/runtime/classic/config-run.xml
  2. 21 15
      trunk/runtime/classic/ece-ifs+nemo.sh.tmpl

+ 0 - 24
trunk/runtime/classic/config-run.xml

@@ -1133,12 +1133,6 @@
 
     <Model name="OASIS">
 
-        <Parameter name="CPL_FREQ_ATM_OCE_SEC">
-            <Description>Coupling frequency between IFS and NEMO in seconds</Description>
-            <Type>INTEGER</Type>
-            <Value>2700</Value>
-        </Parameter>
-
         <Parameter name="CPL_FREQ_ATM_CHE_HRS">
             <Description>Coupling frequency between IFS and TM5 in hours</Description>
             <Type>INTEGER</Type>
@@ -1155,12 +1149,6 @@
             <Value>T255L91</Value>
         </Parameter>
 
-        <Parameter name="TIME_STEP_SEC">
-            <Description>IFS time step in seconds</Description>
-            <Type>INTEGER</Type>
-            <Value>2700</Value>
-        </Parameter>
-
         <Parameter name="NUMPROC">
             <Description>Number of processors running IFS</Description>
             <Type>INTEGER</Type>
@@ -1225,18 +1213,6 @@
             <Value>ORCA1L75</Value>
         </Parameter>
 
-        <Parameter name="NEM_TIME_STEP_SEC">
-            <Description>NEMO time step in seconds</Description>
-            <Type>INTEGER</Type>
-            <Value>2700</Value>
-        </Parameter>
-
-        <Parameter name="LIM_TIME_STEP_SEC">
-            <Description>LIM time step in seconds</Description>
-            <Type>INTEGER</Type>
-            <Value>2700</Value>
-        </Parameter>
-
         <Parameter name="NUMPROC">
             <Description>Number of processors running NEMO</Description>
             <Type>INTEGER</Type>

+ 21 - 15
trunk/runtime/classic/ece-ifs+nemo.sh.tmpl

@@ -65,9 +65,6 @@ rst_freq="[[[MOD:GENERAL:RST_FREQ]]]"
 # Number of restart legs to be run in one go
 run_num_legs=[[[MOD:GENERAL:RUN_NUM_LEGS]]]
 
-# Coupling frequency between atmosphere and ocean (in seconds)
-cpl_freq_atm_oce_sec=[[[MOD:OASIS:CPL_FREQ_ATM_OCE_SEC]]]
-
 # Directories
 #start_dir=${PWD}
 ctrl_file_dir=${start_dir}/ctrl
@@ -85,14 +82,28 @@ ece_info_file="ece.info"
 
 configure
 
+# -----------------------------------------------------------------------------
+# *** Time step settings
+# -----------------------------------------------------------------------------
+case "${ifs_grid}--${nem_grid}" in
+
+    T255L*--ORCA1L*)
+        ifs_time_step_sec=2700; nem_time_step_sec=2700; lim_time_step_sec=2700; cpl_freq_atm_oce_sec=2700
+        ;;
+    T511L*--ORCA025L*)
+        ifs_time_step_sec=900 ; nem_time_step_sec=900 ; lim_time_step_sec=900 ; cpl_freq_atm_oce_sec=2700
+        ;;
+
+    *)  error "Can't set time steps for unknown combination of horizontal grids: ${ifs_grid}-${nem_grid}"
+        ;;
+esac
+
 # -----------------------------------------------------------------------------
 # *** IFS configuration
 # -----------------------------------------------------------------------------
 
 ifs_version=36r4
 
-ifs_time_step_sec=[[[MOD:IFS:TIME_STEP_SEC]]]
-
 ifs_output_freq=$(( 6 * 3600 / ifs_time_step_sec ))
 ifs_di_freq=$(( 24 * 3600 / ifs_time_step_sec ))
 ifs_ddh_freq=$(( 120 * 3600 / ifs_time_step_sec ))
@@ -130,18 +141,16 @@ ifs_orb_switch=FALSE
 ifs_orb_mode="variable_year"
 ifs_orb_iyear=$(date -u -d "${run_start_date}" +%Y)
 
-# -----------------------------------------------------------------------------
 # *** IFS tuning (the commented values are EC-Earth 3.2beta and IFS cy36r4)
-# -----------------------------------------------------------------------------
-                     # ECE32b     IFS cy36r4                     
+#                      ECE32b     IFS cy36r4                     
 RPRCON=1.51E-3       # 1.2E-3     1.4E-3
 RVICE=0.125          # 0.13       0.15
 RLCRITSNOW=4.2E-5    # 3.0E-5     5.0E-5
 RSNOWLIN2=0.035      # 0.035      0.025
-ENTRORG=1.66E-4       # 1.5E-4     1.8E-4
-DETRPEN=0.69E-4       # 0.75E-4    0.75E-4
+ENTRORG=1.66E-4      # 1.5E-4     1.8E-4
+DETRPEN=0.69E-4      # 0.75E-4    0.75E-4
 ENTRDD=3.6E-4        # 3.0E-4     2.0E-4
-RMFDEPS=0.27          # 0.3        0.35
+RMFDEPS=0.27         # 0.3        0.35
 RCLDIFF=3.E-6        # 3.E-6
 RCLDIFFC=5.0         # 5.0
 
@@ -149,9 +158,6 @@ RCLDIFFC=5.0         # 5.0
 # *** NEMO/LIM configuration
 # -----------------------------------------------------------------------------
 
-nem_time_step_sec=[[[MOD:NEM:NEM_TIME_STEP_SEC]]]
-lim_time_step_sec=[[[MOD:NEM:LIM_TIME_STEP_SEC]]]
-
 # This is only needed if the experiment is started from an existing set of NEMO
 # restart files
 nem_restart_file_path=${start_dir}/nemo-rst
@@ -677,7 +683,7 @@ do
 
     for v in grid_U grid_V grid_W grid_T icemod SBC scalar SBC_scalar
     do
-        for f in ${exp_name}_??_????????_????????_${v}.nc
+        for f in ${exp_name}_*_????????_????????_${v}.nc
         do
             test -f $f && mv $f $outdir/
         done