Changeset 3319 for CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL

Timestamp:

07/21/17 15:33:34 (7 years ago)

Author:

acosce

Message:

Inca configuration :
allowed inca.card to manage the parameter value for threshold or weibull10m method

Location:

CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL

Files:

• DRIVER/inca.driver (modified) (2 diffs)
• PARAM/inca.def (modified) (1 diff)

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

@@ -201 +201 @@
     fi
 
+    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  10m_winds_method ${inca_UserChoices_10m_winds_method}
+    fi
+
+
+    if [ ! X${inca_UserChoices_wind_parameter} = X ] ; then 
+        if [  X${inca_UserChoices_10m_winds_method} = Xthreshold ] ; then 
+            IGCM_comp_modifyDefFile nonblocker inca.def  tref ${inca_UserChoices_wind_parameter}
+            IGCM_comp_modifyDefFile nonblocker inca.def  kref DEFAULT
+        else
+            IGCM_comp_modifyDefFile nonblocker inca.def  kref ${inca_UserChoices_wind_parameter}
+            IGCM_comp_modifyDefFile nonblocker inca.def  tref DEFAULT
+        fi
+    else
+            IGCM_comp_modifyDefFile nonblocker inca.def  kref DEFAULT
+            IGCM_comp_modifyDefFile nonblocker inca.def  tref DEFAULT
+    fi
+
+
     # inca.def : choose write frequency for inca_avgr in inca.card
     if [ ! X${inca_UserChoices_freq_write_chem} = X ] ; then
@@ -263 +284 @@
     fi
 
-
-    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  10m_winds_method ${inca_UserChoices_10m_winds_method}
-    fi
 
 

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

@@ -10 +10 @@
 XIOS_INCA_OK=_AUTO_
 IOIPSL_INCA_OK=_AUTO_
-#weibull 10m wind parameter
-kref=4.0
-#threshold 10m wind parameter
-tref=0.85
+#weibull 10m wind parameter / def 4
+kref=_AUTO_: DEFAULT =4
+#threshold 10m wind parameter / def 0.78
+tref=_AUTO_: DEFAULT =0.78
 #sedimentation 
 multilayer_sediment=_AUTO_