Changeset 649

Timestamp:

06/19/09 17:33:46 (15 years ago)

Author:

mafoipsl

Message:

SD+MAF : on the way to 39 levels parametrisation

Location:

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK

Files:

• AA_make (modified) (1 diff)
• EXP00/COMP/lmdz.card (modified) (1 diff)
• EXP00/COMP/lmdz.driver (modified) (4 diffs)
• EXP00/PARAM/gcm.def_144x142x19 (moved) (moved from CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/gcm.def_LMD144142)
• EXP00/PARAM/gcm.def_56x55x19 (moved) (moved from CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/gcm.def_LMD5655)
• EXP00/PARAM/gcm.def_96x71x19 (moved) (moved from CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/gcm.def_LMD9671)
• EXP00/PARAM/gcm.def_96x95x19 (moved) (moved from CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/gcm.def_LMD9695)
• EXP00/PARAM/physiq.def_L19 (moved) (moved from CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/PARAM/physiq.def)

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/AA_make

@@ -11 +11 @@
 #-Q- eshpux        cp -f $(PRISM_DIR)/util/compile/frames/include_$(PRISM_NAME)/COMP_oasis3_$(LIB_MPI).$(PRISM_NAME)  $(OASIS3_DIR)/.; \
 #-Q- eshpux        cp -f $(PRISM_DIR)/util/compile/frames/include_$(PRISM_NAME)/COMP_libs.$(PRISM_NAME)  $(PRISM_DIR)/util/. ; fi
-        if [ -s ./.resol ] ; then $(M_K) `cat .resol` ; else $(M_K) ORCA2xLMD9695 ; fi
+        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else $(M_K) ORCA2xLMD9695 ; fi
 
 ORCA2xLMD4443 : libioipsl oasis3 liborchidee orca2 lmdz44x43x19 verif   
         echo "ORCA2xLMD4443" >.resol
+        echo "RESOL_ATM_3D=44x43x19" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
 ORCA2xLMD5655 : libioipsl oasis3 liborchidee orca2 lmdz56x55x19 verif   
         echo "ORCA2xLMD5655" >.resol
+        echo "RESOL_ATM_3D=56x55x19" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
 ORCA2xLMD9671 : libioipsl oasis3 liborchidee orca2 lmdz96x71x19 verif   
         echo "ORCA2xLMD9671" >.resol
+        echo "RESOL_ATM_3D=96x71x19" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
 ORCA2xLMD9695 : libioipsl oasis3 liborchidee orca2 lmdz96x95x19 verif
         echo "ORCA2xLMD9695" >.resol
+        echo "RESOL_ATM_3D=96x95x19" >>.resol
+        echo "$(LIB_MPI)" >.libmpi
+
+ORCA2xLMD9695-L39 : libioipsl oasis3 liborchidee orca2 lmdz96x95x39 verif
+        echo "ORCA2xLMD9695" >.resol
+        echo "RESOL_ATM_3D=96x95x39" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 
 ORCA2xLMD144142 : libioipsl oasis3 liborchidee orca2 lmdz144x142x19 verif
         echo "ORCA2xLMD144142" >.resol
+        echo "RESOL_ATM_3D=144x142x19" >>.resol
+        echo "$(LIB_MPI)" >.libmpi
+
+ORCA2xLMD144142-L39 : libioipsl oasis3 liborchidee orca2 lmdz144x142x39 verif
+        echo "ORCA2xLMD144142" >.resol
+        echo "RESOL_ATM_3D=144x142x39" >>.resol
         echo "$(LIB_MPI)" >.libmpi
 

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/lmdz.card

@@ -39 +39 @@
 
 [ParametersFiles]
-List=   (${SUBMIT_DIR}/PARAM/physiq.def, .), \
-        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM}, gcm.def), \
+List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}, physiq.def), \
+        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def),    \
         (${SUBMIT_DIR}/PARAM/run.def, .), \
         (${SUBMIT_DIR}/PARAM/traceur.def, .), \
-        (${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat, .)
+        (${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .)
 
 [RestartFiles]

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_WORK/EXP00/COMP/lmdz.driver

@@ -7 +7 @@
     RESOL_ATM=$( echo $RESOL | awk "-Fx" '{print $2}' )
 
-    case ${RESOL_ATM} in
-        LMD4443)   BandsResol=44x43x19   ;;
-        LMD7245)   BandsResol=72x45x19   ;;
-        LMD5655)   BandsResol=56x55x19   ;;
-        LMD9671)   BandsResol=96x71x19   ;;
-        LMD9695)   BandsResol=96x95x19   ;;
-        LMD9696)   BandsResol=96x96x19   ;;
-        LMD14496)  BandsResol=144x96x19  ;;
-        LMD144142) BandsResol=144x142x19 ;;
-    esac
+    [ -f $SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D $SUBMIT_DIR}/../.resol)
+    [ -f $SUBMIT_DIR}/../.resol ] || export RESOL_ATM_3D=96x95x19
+
+    RESOL_ATM_Z=$( echo $RESOL_ATM_3D | awk "-Fx" '{print $3}' )
 
     ##--Frequency purpose ....
@@ -40 +34 @@
 
     ##--Variables used by LMDZ in physiq.def --
-    PAT_INST=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_instan='  )
-    PAT_JOUR=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_journe='  )
-    PAT_MOIS=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_mensuel=' )
-    PAT_HFRE=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'ok_hf='      )
+    PAT_INST=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_instan='  )
+    PAT_JOUR=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_journe='  )
+    PAT_MOIS=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_mensuel=' )
+    PAT_HFRE=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ok_hf='      )
     ##--Variables used by LMDZ in gcm.def --
-    PAT_iphysiq=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iphysiq  )
-    PAT_iperiod=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iperiod  )
-    PAT_day_step=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep day_step )
-    PAT_ecritphy=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep ecritphy )
+    PAT_iphysiq=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep iphysiq  )
+    PAT_iperiod=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep iperiod  )
+    PAT_day_step=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep day_step )
+    PAT_ecritphy=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep ecritphy )
 
     ## Read LMDZ_adjust option in ${compname}.card --> put adjust=y and save Bands_*.dat in ${SUBMIT_DIR}/PARAM
@@ -62 +56 @@
     day_step=$( echo ${PAT_day_step} | awk -F= '{print $2}' )
 
-    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat .
+    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat .
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -158 +152 @@
     IGCM_debug_PushStack "ATM_Finalize"
 
-    [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM
+    [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM
 
     echo FINALIZE ATM !