Changeset 2033 for BOL

Timestamp:

May 2, 2014, 10:57:57 AM (11 years ago)

Author:

fhourdin

Message:

Simplifications

File:

• BOL/script_install/instal1d.sh (modified) (7 diffs)

BOL/script_install/instal1d.sh

@@ -13 +13 @@
 ###############################################################################
 
+PATH=~/bin:$PATH
+
+armcu=1
+toga=1
+twpice=1
+
 # Check in ~lmdz/WWW/DistribG95 which 1d version to use
-version1d=20130717
+version1d=20140122
 modele=""
 if [ "$modele" = "" ] ; then
@@ -108 +114 @@
 cd ${LMDlibf}/..
 \rm -f makefile
-./makegcm -d 39 -p 1d lmdz1d
+./makelmdz -d 39 -p 1d lmdz1d
 if [ -f lmdz1d.e ] ; then
    mv lmdz1d.e lmdz1d_L39.e
@@ -125 +131 @@
 echo '#########################################################################'
 
+if [ $toga = 1 ] ; then
 echo ====================================
 echo TEST CASE : toga' (1 month)'
@@ -142 +149 @@
 quit
 eod
-display var.gif
+display var.gif :&
 rm -f tmp.jnl
 rm -f var.gif
-
+cd ..
+fi
+
+if [ $twpice = 1 ] ; then
 echo ====================================
 echo TEST CASE : twpice
 echo ====================================
 echo if the last line \"SIMULATION FINISHED\" is \"Everything is cool!\", the situation went to its end
-cd ../twpice
+cd twpice
 ./xqt.x NPv3.1
 \rm tmp.jnl ; touch tmp.jnl
 rm -f var.gif
 cat <<eod>> tmp.jnl
-use histLES_NPv3.1.nc
+use histhf_NPv3.1.nc
 shade/title="cas twpice: cloud fraction (-)" rneb
 frame/file=var.gif
@@ -163 +173 @@
 quit
 eod
-display var.gif
+display -remote var.gif :&
 rm -f tmp.jnl
 rm -f var.gif
-
-armcu=1
+cd ..
+fi
+
 if [ $armcu = 1 ] ; then
 echo ====================================
@@ -173 +184 @@
 echo ====================================
 echo if the last line \"SIMULATION FINISHED\" is \"Everything is cool!\", the situation went to its end
-cd ../arm_cu
+cd arm_cu
 ./compile.x
-ln -s lmdz1d_L40.e lmdz1d.e
+ln -s lmdz1d.e lmdz1d_L40.e 
 ./xqt.x NPv3.1
 \rm tmp.jnl ; touch tmp.jnl
 rm -f var.gif
 cat <<eod>> tmp.jnl
-use histmth_NPv3.1.nc
+use histhf_NPv3.1.nc
 shade/title="cas arm_cu: cloud fraction (-)" rneb
 frame/file=var.gif
@@ -188 +199 @@
 quit
 eod
-display var.gif
+display -remote var.gif :&
 rm -f tmp.jnl
 rm -f var.gif
-fi
-
+cd ..
+fi
+