Changeset 1287 for CONFIG/LMDZOR

Timestamp:

01/27/11 16:44:08 (14 years ago)

Author:

jgipsl

Message:

LMDZOR_v4 :

• Added new resolution 360x180x39-ZIn with zoom over India.
• Corrected bug for resolution 280x280x39-ZAf in orchidee.driver

Location:

CONFIG/LMDZOR/branches/LMDZOR_v4

Files:

• AA_make (modified) (2 diffs)
• LMDZOR/COMP/lmdz.driver (modified) (1 diff)
• LMDZOR/COMP/orchidee.driver (modified) (1 diff)
• LMDZOR/PARAM/gcm.def_360x180x39-ZIn (added)

CONFIG/LMDZOR/branches/LMDZOR_v4/AA_make

@@ -45 +45 @@
         echo "$(LIB_MPI)" >.libmpi
 
+LMD360180-ZIn-L39 : libioipsl liborchidee lmdz360x180x39 verif
+        echo "LMD360180-ZIn-L39" >.resol
+        echo "RESOL_ATM_3D=360x180x39-ZIn" >>.resol
+        echo "$(LIB_MPI)" >.libmpi
+
 libioipsl :
         (cd ../../modeles/IOIPSL/src ; $(M_K) -f Makefile)
@@ -89 +94 @@
         $(M_K) lmdz RESOL_LMDZ=280x280x39
 
+lmdz360x180x39:
+        $(M_K) lmdz RESOL_LMDZ=360x180x39
+
 lmdz:
         (cd ../../modeles/LMDZ; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d $(RESOL_LMDZ) -arch $(FCM_ARCH) ce0l ; cp bin/ce0l_$(RESOL_LMDZ)_phylmd_seq.e ../../bin/create_etat0_limit.e ; )

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

@@ -228 +228 @@
 
 # No filtre fft in case of zoom, 280x280x39-ZAf contains zoom
-    [ ${RESOL_ATM_3D} = "280x280x39-ZAf" ] && LMDZ_sed run.def use_filtre_fft n
+    if [ ${RESOL_ATM_3D} = "280x280x39-ZAf" ] || [ ${RESOL_ATM_3D} = "360x180x39-ZIn" ] ; then
+         LMDZ_sed run.def use_filtre_fft n
+    fi
 
     ## Read ByPass_hgardfou_teta option in lmdz.card --> divide teta* by 2 if [ $ByPass_hgardfou_teta = 1 ]

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

@@ -142 +142 @@
 
 # Desactaivate river routing for high resolution
-    if ( [ ${RESOL_ATM_3D} = "280x280x39" ] ) ; then
+    if ( [ ${RESOL_ATM_3D} = "280x280x39-ZAf" ] || [ ${RESOL_ATM_3D} = "360x180x39-ZIn" ] ) ; then
         ORCHIDEE_sed  RIVER_ROUTING n
     fi