Changeset 5625 for CONFIG/UNIFORM

Timestamp:

03/11/21 15:48:24 (3 years ago)

Author:

acosce

Message:

Add some modification to correct some bug due to management of ICO grid

Location:

CONFIG/UNIFORM/v7/ICOLMDZORINCA_v7

Files:

• EXPERIMENTS/ICOLMDZORINCA/GES/COMP/inca.card (modified) (2 diffs)
• GENERAL/DRIVER/inca.driver (modified) (2 diffs)
• IMPORTANT_README (modified) (1 diff)

CONFIG/UNIFORM/v7/ICOLMDZORINCA_v7/EXPERIMENTS/ICOLMDZORINCA/GES/COMP/inca.card

@@ -37 +37 @@
 
 [BoundaryFiles]
-List=(${R_IN}/CHM/IPCC_AR6/OXYDANTS/${RESOL_CHM}_yearly_interpolated/oxydants_${year}.nc,   oxydants.nc         ),\
+List=(${R_IN}/CHM/IPCC_AR6/OXYDANTS/144142-L79_yearly_interpolated/oxydants_${year}.nc,   oxydants.nc         ),\
      (/ccc/work/cont003/subipsl/subipsl/ECMWF320x160/AN${year}/165_${year}${month}.nc      , u10xios.nc         ),\
      (/ccc/work/cont003/subipsl/subipsl/ECMWF320x160/AN${year}/166_${year}${month}.nc      , v10xios.nc         )
@@ -44 +44 @@
 ListNonDel= (${R_IN}/CHM/FILES_LONxLAT/landuse_lmdz_dyn.nc                              ,   landuse.nc          ),\
             (${R_IN}/CHM/FILES_LONxLAT/npp_dyn.nc                                       ,   npp.nc              ),\
-            (${R_IN}/CHM/INCA${RESOL_CHM}/dustincaEC.nc                                 ,   dustEC.nc           ),\
-            (${R_IN}/CHM/INCA${RESOL_CHM}/new_phototable.dat                            ,   phototable.dat      ),\
+            (${R_IN}/CHM/INCA144142-L79/dustincaEC.nc                                   ,   dustEC.nc           ),\
+            (${R_IN}/CHM/INCA144142-L79/new_phototable.dat                              ,   phototable.dat      ),\
             (${R_IN}/CHM/IPCC_AR6/SFLX/VERS3/144142-L79/ANT/sflx_lmdz_ANT_2000_dyn.nc   ,   sflx_ANT_LR.nc      ),\
             (${R_IN}/CHM/IPCC_AR6/SFLX/VERS3/144142-L79/BBG/sflx_lmdz_BBG_2000_dyn.nc   ,   sflx_BBG_LR.nc      ),\

CONFIG/UNIFORM/v7/ICOLMDZORINCA_v7/GENERAL/DRIVER/inca.driver

@@ -20 +20 @@
     IGCM_debug_PushStack "CHM_Initialize"
 
-    if [ X$ResolAtm != X ] ; then
-        # ResolAtm is set in config.card
-        RESOL_ATM_3D=${ResolAtm}
-        RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' )
-        RESOL_ATM_X=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $1}' )
-        RESOL_ATM_Y=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $2}' )
-
-        RESOL_CHM=${RESOL_ATM_X}${RESOL_ATM_Y}-L${RESOL_ATM_Z}
-    elif [ -f ${SUBMIT_DIR}/../.resol ] ; then
-        [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19
-        RESOL_CHM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' | awk "-F-" '{print $1}')
-    else
+    if [ X${config_ListOfComponents_ICO} = X ] ; then
+
+        if [ X$ResolAtm != X ] ; then
+            # ResolAtm is set in config.card
+            RESOL_ATM_3D=${ResolAtm}
+            RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' )
+            RESOL_ATM_X=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $1}' )
+            RESOL_ATM_Y=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $2}' )
+            
+            RESOL_CHM=${RESOL_ATM_X}${RESOL_ATM_Y}-L${RESOL_ATM_Z}
+        elif [ -f ${SUBMIT_DIR}/../.resol ] ; then
+            [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19
+            RESOL_CHM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' | awk "-F-" '{print $1}')
+        else
         IGCM_debug_Exit "ResolAtm is not set in config.card and the .resol file does not exist."
         IGCM_debug_Verif_Exit
+        fi
+    else
+        RESOL_ATM_Z=${dynamico_UserChoices_RESOL_ATM_Z}
+        RESOL_NBP=${dynamico_UserChoices_RESOL_NBP}
+
     fi
 
@@ -421 +428 @@
     if [ -f context_input_inca.xml ] ; then
         echo '<context id="inca" src="./context_input_inca.xml"/>' >> add.tmp
-        echo '<context id="inca" src="./context_start_inca.xml"/>' >> add.tmp
+#       echo '<context id="inca" src="./context_start_inca.xml"/>' >> add.tmp
         echo '<context id="inca" src="./context_sflx_inca.xml"/>' >> add.tmp
         echo '<context id="inca" src="./context_winds_inca.xml"/>' >> add.tmp

CONFIG/UNIFORM/v7/ICOLMDZORINCA_v7/IMPORTANT_README

@@ -4 +4 @@
 Attention pour l'instant cela ne fonctionne qu'avec le couplage des vents à 10m
 Attention les etats initiaux sont crees sur des simus TEST de 1 jour il faudra les remplacer
+Attention cela ne gÚre par la lecture des restart de inca (il faut lire le restart sur la grille non structurée) 
+le calcul de la tropopause est à faire