Changeset 5625 for CONFIG/UNIFORM/v7/ICOLMDZORINCA_v7/GENERAL

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

File:

• CONFIG/UNIFORM/v7/ICOLMDZORINCA_v7/GENERAL/DRIVER/inca.driver (modified) (2 diffs)

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