Changeset 2399 for CONFIG/UNIFORM/v6/LMDZORINCA_v6

Timestamp:

01/26/15 15:55:41 (9 years ago)

Author:

acosce

Message:

In LMDZORINCA_v6 config

• Add possibility to choose between xios and/or ioipsl for output library
• Correct a path for limit.nc files
• Add input files for nitrate on p86ispl/rpsl035 login

Location:

CONFIG/UNIFORM/v6/LMDZORINCA_v6

Files:

• EXPERIMENTS/LMDZORINCA/AER/COMP/inca.card (modified) (2 diffs)
• EXPERIMENTS/LMDZORINCA/AER/COMP/lmdz.card (modified) (1 diff)
• EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/inca.card (modified) (2 diffs)
• EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/lmdz.card (modified) (1 diff)
• GENERAL/DRIVER/inca.driver (modified) (1 diff)
• GENERAL/PARAM/inca.def (modified) (1 diff)

CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/inca.card

@@ -12 +12 @@
 feedb=0
 
-# Use XIOS as output library
+# Use XIOS and/or IOIPSL as output library
 XIOS=y
+IOIPSL=n
 
 [InitialStateFiles]
@@ -26 +27 @@
 ListNonDel= (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/npp.nc           ,   npp.nc              )\
             (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/oxydants.nc      ,   oxydants.nc         )\
-            (/ccc/work/cont003/dsm/p86cozic/INPUT_NITRATE/aircraft_ar5_2000.nc          ,   aircraft.nc    )\
-            (/ccc/work/cont003/dsm/p86cozic/INPUT_NITRATE/sflx_ar5_2000.nc              ,   sflx.nc        )\
+            (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/aircraft.nc      ,   aircraft.nc         )\
+            (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/sflx_nitrate.nc  ,   sflx.nc             )\
             (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/landuse.nc       ,   landuse.nc          )\
             (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/rhvEC.txt        ,   rhvEC.txt           )\

CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/AER/COMP/lmdz.card

@@ -71 +71 @@
 
 [BoundaryFiles]
-List=   (${R_BC}/ATM/LMDZORINCA/${RESOL_ATM}/LIMIT/ERAI/limit_${year}.nc , limit.nc)
+List=   (${R_BC}/ATM/LMDZORINCA/${RESOL_ATM}/LIMIT/ERAI/leap/limit_${year}.nc , limit.nc)
 
 #       (${R_BC}/ATM/LMDZORINCA/${RESOL_ATM}/NUDGE_FILES/ERAI/AN${year}/u_ecmwf_${year}${month}.nc      , u.nc          ),\

CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/inca.card

@@ -12 +12 @@
 feedb=0
 
-# Use XIOS as output library
+# Use XIOS and/or IOIPSL as output library
 XIOS=y
+IOIPSL=n
 
 [InitialStateFiles]
@@ -27 +28 @@
             (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/o3clim.nc        ,   o3clim.nc           )\
             (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/so4.nc           ,   so4.nc              )\
-            (/ccc/work/cont003/dsm/p86cozic/INPUT_NITRATE/aircraft_ar5_2000.nc          ,   aircraft.nc    )\
-            (/ccc/work/cont003/dsm/p86cozic/INPUT_NITRATE/sflx_ar5_2000.nc              ,   sflx.nc        )\
+            (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/aircraft.nc      ,   aircraft.nc         )\
+            (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/sflx_nitrate.nc  ,   sflx.nc             )\
             (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/landuse.nc       ,   landuse.nc          )\
             (${R_INIT}/CHM/LMDZORINCA/INCA${RESOL_CHM}/rhvEC.txt        ,   rhvEC.txt           )\

CONFIG/UNIFORM/v6/LMDZORINCA_v6/EXPERIMENTS/LMDZORINCA/NMHC_AER/COMP/lmdz.card

@@ -70 +70 @@
 
 [BoundaryFiles]
-List=   (${R_BC}/ATM/LMDZORINCA/${RESOL_ATM}/LIMIT/ERAI/limit_${year}.nc , limit.nc)
+List=   (${R_BC}/ATM/LMDZORINCA/${RESOL_ATM}/LIMIT/ERAI/leap/limit_${year}.nc , limit.nc)
 
 #       (${R_BC}/ATM/LMDZORINCA/${RESOL_ATM}/NUDGE_FILES/ERAI/AN${year}/u_ecmwf_${year}${month}.nc      , u.nc          ),\

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

@@ -60 +60 @@
     # 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 blocker inca.def climatological  ${inca_UserChoices_climatological}
+        IGCM_comp_modifyDefFile nonblocker inca.def climatological  ${inca_UserChoices_climatological}
     else
-        IGCM_comp_modifyDefFile blocker inca.def climatological  n
+        IGCM_comp_modifyDefFile nonblocker inca.def climatological  n
     fi
 
     # inca.def : choose write frequency for inca_avgr in inca.card
     if [ ! X${inca_UserChoices_freq_write_chem} = X ] ; then
-        IGCM_comp_modifyDefFile blocker inca.def freq_write_chem  ${inca_UserChoices_freq_write_chem}
+        IGCM_comp_modifyDefFile nonblocker inca.def freq_write_chem  ${inca_UserChoices_freq_write_chem}
     else
-        IGCM_comp_modifyDefFile blocker inca.def  freq_write_chem  86400
+        IGCM_comp_modifyDefFile nonblocker inca.def  freq_write_chem  86400
     fi
 
     #inca.def : choose aerosol effect with feedback variable
     if [ ! X${inca_UserChoices_feedb} = X ] ; then
-        IGCM_comp_modifyDefFile blocker inca.def  feedb  ${inca_UserChoices_feedb}
+        IGCM_comp_modifyDefFile nonblocker inca.def  feedb  ${inca_UserChoices_feedb}
     else
-        IGCM_comp_modifyDefFile blocker inca.def feedb  0
+        IGCM_comp_modifyDefFile nonblocker inca.def feedb  0
     fi
     
-    #inca.def : choose aerosol effect with feedback variable
+    #inca.def : choose output library 
     if [  X${inca_UserChoices_XIOS} = Xy ] ; then
-        IGCM_comp_modifyDefFile blocker inca.def  XIOS_INCA_OK  y
+        IGCM_comp_modifyDefFile nonblocker inca.def  XIOS_INCA_OK  y
     else
-        IGCM_comp_modifyDefFile blocker inca.def  XIOS_INCA_OK n
+        IGCM_comp_modifyDefFile nonblocker inca.def  XIOS_INCA_OK n
+    fi
+
+    if [  X${inca_UserChoices_IOIPSL} = Xy ] ; then
+        IGCM_comp_modifyDefFile nonblocker inca.def  IOIPSL_INCA_OK  y
+    else
+        IGCM_comp_modifyDefFile nonblocker inca.def  IOIPSL_INCA_OK n
     fi
 

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

@@ -8 +8 @@
 #choose if there is a feedback with the areosol effect
 feedb=_AUTO_
-#indicate if we are running with xios or not
+#indicate if we are running with xios and/or ioipsl
 XIOS_INCA_OK=_AUTO_
+IOIPSL_INCA_OK=_AUTO_