Changeset 2547 for CONFIG/UNIFORM/v6/IPSLCM6CHT

Timestamp:

06/03/15 11:05:59 (9 years ago)

Author:

acosce

Message:

Change some parameter names in inca configurations

Location:

CONFIG/UNIFORM/v6/IPSLCM6CHT

Files:

• EXPERIMENTS/IPSLCMCHT/DUST/piControl/COMP/inca.card (modified) (1 diff)
• GENERAL/DRIVER/inca.driver (modified) (2 diffs)
• GENERAL/PARAM/inca.def (modified) (1 diff)

CONFIG/UNIFORM/v6/IPSLCM6CHT/EXPERIMENTS/IPSLCMCHT/DUST/piControl/COMP/inca.card

@@ -4 +4 @@
 
 [UserChoices]
-# Set climatological to choose if the simulation will use online 10m wind (=y) or offline (=n)
-climatological=y
-# Set climatological to choose the write_frequency for inca output (inca_avgr, forcage, inca_inst)
+# Set LMDZ_10m_winds to choose if the simulation will use online 10m wind (=y) or offline (=n)
+LMDZ_10m_winds=y
+# Set LMDZ_10m_winds to choose the write_frequency for inca output (inca_avgr, forcage, inca_inst)
 # 86400 = daily output
 freq_write_chem=86400
 # heat fluxes computed with feedback corresponding to 0 --> no aerosol effects, 1--> aerosol effects selected by ok_ade, ok_aie
 feedb=1
-#wind_method (use only if climatological=y) weibull10 or threshold
-wind_method=threshold
+#10m_winds_method (use only if LMDZ_10m_winds=y) weibull10 or threshold
+10m_winds_method=threshold
 
 

CONFIG/UNIFORM/v6/IPSLCM6CHT/GENERAL/DRIVER/inca.driver

@@ -61 +61 @@
         esac
 
-    # inca.def : Activate reading of 10m wind in files if climatological=n in inca.card
-    if [ ! X${inca_UserChoices_climatological} = X ] ; then
-        IGCM_comp_modifyDefFile nonblocker inca.def climatological  ${inca_UserChoices_climatological}
+    # inca.def : Activate reading of 10m wind in files if LMDZ_10m_winds=n in inca.card
+    if [ ! X${inca_UserChoices_LMDZ_10m_winds} = X ] ; then
+        IGCM_comp_modifyDefFile nonblocker inca.def LMDZ_10m_winds  ${inca_UserChoices_LMDZ_10m_winds}
     else
-        IGCM_comp_modifyDefFile nonblocker inca.def climatological  n
+        IGCM_comp_modifyDefFile nonblocker inca.def LMDZ_10m_winds  n
     fi
 
@@ -96 +96 @@
 
 
-    if [  X${inca_UserChoices_wind_method} = X ] ; then
-    IGCM_comp_modifyDefFile nonblocker inca.def  wind_method  threshold
+    if [  X${inca_UserChoices_10m_winds_method} = X ] ; then
+    IGCM_comp_modifyDefFile nonblocker inca.def  10m_winds_method  threshold
     else
-    IGCM_comp_modifyDefFile nonblocker inca.def  wind_method ${inca_UserChoices_wind_method}
+    IGCM_comp_modifyDefFile nonblocker inca.def  10m_winds_method ${inca_UserChoices_10m_winds_method}
     fi
 

CONFIG/UNIFORM/v6/IPSLCM6CHT/GENERAL/PARAM/inca.def

@@ -3 +3 @@
 #######################################################################
 #climatological=y --> use 10m wind from LMDZ, =n --> use 10m wind from output file
-climatological=_AUTO_
-wind_method=_AUTO_
+LMDZ_10m_winds=_AUTO_
+10m_winds_method=_AUTO_
 #freq_write_chem --> write frequency for inca_inst and inca_avgr (86400 = 1/day)
 freq_write_chem=_AUTO_