Changeset 3931 for dynamico_lmdz/aquaplanet

Timestamp:

May 10, 2016, 12:27:14 AM (9 years ago)

Author:

dubos

Message:

small improvements to make_icosa_lmdz

File:

• dynamico_lmdz/aquaplanet/ICOSA_LMDZ/make_icosa_lmdz (modified) (6 diffs)

dynamico_lmdz/aquaplanet/ICOSA_LMDZ/make_icosa_lmdz

@@ -4 +4 @@
 export ROOT=$PWD
 
-echo ./make_icosa $* > rebuild
-chmod a+x rebuild
+echo $0 $* > rebuild_all
+chmod a+x rebuild_all
 
 compil_mode_defined="FALSE"
@@ -19 +19 @@
 parallel="none"
 physics="none"
+build_deps="TRUE"
 CPP_KEY="CPP_NONE" 
 ICOSA_LIB=""
@@ -30 +31 @@
 [-h]                       : help
 [-prod / -dev / -debug]    : compilation en mode production (default) / developpement / debug .
+[-nodeps]                  : do not build dependencies (XIOS, IOIPSL, LMDZ5, ICOSAGCM)
  -arch nom_arch            : nom de l\'architecture cible
 fin
@@ -57 +59 @@
       "-full")
           full_defined="TRUE" ; shift ;;
+
+      "-nodeps")
+          build_deps="FALSE" ; shift ;;
 
       "-with_xios")
@@ -142 +147 @@
 ICOSA_LIB="$ICOSA_LIB $IOIPSL_LIBDIR $IOIPSL_LIB $NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB"
 
-
 rm bin/*
-
-cd ../IOIPSL
-./makeioipsl_fcm -$compil_mode -parallel -arch $arch -j $job $full_flag
-cd -
-
-cd ../XIOS
-./make_xios --$compil_mode --arch $arch --job $job
-cd -
 
 if [[ "$full_defined" == "TRUE" ]]
 then
   full_flag="-full"
+  full_flag2="--full"
 else 
   full_flag=""
+  full_flag2=""
 fi
-
-if [[ "$with_orchidee_defined" == "TRUE" ]]
-then
-  cd ../ORCHIDEE
-  ./makeorchidee_fcm -$compil_mode -parallel $parallel -xios2 -arch $arch -j $job $full_flag
-  cd -
-fi
-
-cd ../LMDZ5
-lmdz_veget="false"
-if [[ "$with_orchidee_defined" == "TRUE" ]]
-then
-  lmdz_veget="orchidee2.0"
-fi
-./makelmdz_fcm toto -$compil_mode -mem -parallel $parallel -nodyn -io xios -v $lmdz_veget -arch $arch -j $job $full_flag
-cd -
-
-cd ../ICOSAGCM
-./make_icosa -$compil_mode -parallel $parallel -external_ioipsl -with_xios -arch $arch -job $job $full_flag
-cd -
 
 rm -f config.fcm
@@ -187 +165 @@
 echo "%LIB $ICOSA_LIB">> config.fcm
 
-if [[ "$full_defined" == "TRUE" ]]
+if [[ "$build_deps" == "TRUE" ]]
 then
-  ./build --job $job --full
-else
-  ./build --job $job
+
+    cd ../IOIPSL
+    ./makeioipsl_fcm -$compil_mode -parallel -arch $arch -j $job $full_flag  || exit 1
+    cd -
+
+    cd ../XIOS
+    ./make_xios --$compil_mode --arch $arch --job $job $full_flag2 || exit 1
+    cd -
+
+    if [[ "$with_orchidee_defined" == "TRUE" ]]
+    then
+        cd ../ORCHIDEE
+        ./makeorchidee_fcm -$compil_mode -parallel $parallel -xios2 -arch $arch -j $job $full_flag  || exit 1
+        cd -
+    fi
+
+    cd ../LMDZ5
+    lmdz_veget="false"
+    if [[ "$with_orchidee_defined" == "TRUE" ]]
+    then
+        lmdz_veget="orchidee2.0"
+    fi
+    ./makelmdz_fcm gcm -$compil_mode -mem -parallel $parallel -nodyn -io xios -v $lmdz_veget -arch $arch -j $job $full_flag || exit 1
+    cd -
+
+    cd ../ICOSAGCM
+    ./make_icosa -$compil_mode -parallel $parallel -external_ioipsl -with_xios -arch $arch -job $job $full_flag || exit 1
+    cd -
 fi
+
+./build --job $job $full_flag2