Changeset 1211 for CONFIG/LMDZOR

Timestamp:

12/08/10 12:01:14 (13 years ago)

Author:

jgipsl

Message:

Dev config LMDZOR_v4 :

• Changed default compiling resolution to LMD9695-L39

• Modified .resol when compiling LMD280280-L39, .resol now contains indication for zoom over Africa -ZAf. The compiled model can always be used with all types of zoom but .resol is modified because this configuration only have one grid for resolution 280x280x39 and this grid contains zoom over Africa. If adding different zoom with the same resolution, this has to be changed.
• Changed name of file gcm.def_280x280x39 to gcm.def_280x280x39-ZAf to correspond to .resol
• Modifications in lmdz.driver to correspond to .resol

Location:

CONFIG/LMDZOR/branches/LMDZOR_v4

Files:

• AA_make (modified) (2 diffs)
• CREATE/COMP/lmdz.driver (modified) (1 diff)
• LMDZOR/COMP/lmdz.driver (modified) (2 diffs)
• LMDZOR/PARAM/gcm.def_280x280x39-ZAf (moved) (moved from CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/PARAM/gcm.def_280x280x39)

CONFIG/LMDZOR/branches/LMDZOR_v4/AA_make

@@ -3 +3 @@
 
 all :
-        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else gmake LMD280280-L39 ; fi
+        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else gmake LMD9695-L39 ; fi
 
 LMD7245 : libioipsl liborchidee lmdz72x45x19 verif
@@ -41 +41 @@
 
 LMD280280-L39 : libioipsl liborchidee lmdz280x280x39 verif
-        echo "LMD280280-L39" >.resol
-        echo "RESOL_ATM_3D=280x280x39" >>.resol
+        echo "LMD280280-ZAf-L39" >.resol
+        echo "RESOL_ATM_3D=280x280x39-ZAf" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 

CONFIG/LMDZOR/branches/LMDZOR_v4/CREATE/COMP/lmdz.driver

@@ -18 +18 @@
     IGCM_debug_PushStack "ATM_Initialize"
 
-    RESOL_ATM=$( echo $RESOL | awk "-Fx" '{print $2}' | awk "-F-" '{print $1}')
-
     [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19
 
-    RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' )
+    RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' | awk "-F-" '{print $1}' )
 
     ##-- Calendar type for LMDZ

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP/lmdz.driver

@@ -24 +24 @@
     [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19
 
-    RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' )
+    RESOL_ATM_Z=$( echo ${RESOL_ATM_3D} | awk "-Fx" '{print $3}' | awk "-F-" '{print $1}')
 
     ##-- Calendar type for LMDZ
@@ -227 +227 @@
     LMDZ_sed run.def adjust   ${LMDZ_adjust}
 
-# No filtre fft in case of zoom, 280x280x39 contains zoom
-    [ ${RESOL_ATM_3D} = "280x280x39" ] && LMDZ_sed run.def use_filtre_fft n
+# No filtre fft in case of zoom, 280x280x39-ZAf contains zoom
+    [ ${RESOL_ATM_3D} = "280x280x39-ZAf" ] && LMDZ_sed run.def use_filtre_fft n
 
     ## Read ByPass_hgardfou_teta option in lmdz.card --> divide teta* by 2 if [ $ByPass_hgardfou_teta = 1 ]