Changeset 3480

Timestamp:

Oct 24, 2024, 1:10:50 PM (2 months ago)

Author:

afalco

Message:

icosa_lmdz: small compilation scripts changes; included Pluto example.
AF

Location:

trunk/ICOSA_LMDZ

Files:

• compile_adastra-gnu (modified) (1 diff)
• compile_irene-amd (modified) (1 diff)
• make_icosa_lmdz (modified) (11 diffs)

trunk/ICOSA_LMDZ/compile_adastra-gnu

@@ -1 +1 @@
 # Simple example of launching the make_icosa_lmdz script with adequate options
 # adapt to fit your own needs.
+arch=ADASTRA-gnu
 
 # Gas Giants:
-#make_icosa_lmdz -p std -p_opt "-b 20x25" -parallel mpi_omp -arch ADASTRA-gnu -arch_path ../ARCH -job 8
+#make_icosa_lmdz -p std -p_opt "-b 20x25" -parallel mpi_omp -arch $arch -arch_path ../ARCH -job 8 $*
 
 # Venus:
-#make_icosa_lmdz -p venus -parallel mpi -arch ADASTRA-gnu -arch_path ../ARCH -job 8
+#make_icosa_lmdz -p venus -parallel mpi -arch $arch -arch_path ../ARCH -job 8  $*
 
 # Mars:
-make_icosa_lmdz -p mars -parallel mpi_omp -arch ADASTRA-gnu -arch_path ../ARCH -job 8 -full -nodeps
+make_icosa_lmdz -p mars -parallel mpi_omp -arch $arch -arch_path ../ARCH -job 8 -full -nodeps $*
 
+# Pluto:
+#make_icosa_lmdz -p pluto -p_opt "-b 17x23" -parallel mpi -arch $arch -arch_path ../ARCH -job 8 $*

trunk/ICOSA_LMDZ/compile_irene-amd

@@ +1 @@
+arch=X64_IRENE-AMD
+
 # Gas Giants:
-#make_icosa_lmdz -p std -p_opt "-b 20x25 -s 2" -parallel mpi_omp -arch X64_IRENE-AMD -arch_path ../ARCH -job 8
+#make_icosa_lmdz -p std -p_opt "-b 20x25 -s 2" -parallel mpi_omp -arch $arch -arch_path ../ARCH -job 8  $*
 
 # Venus:
-#make_icosa_lmdz -p venus -parallel mpi -arch X64_IRENE-AMD -arch_path ../ARCH -job 8
+#make_icosa_lmdz -p venus -parallel mpi -arch $arch -arch_path ../ARCH -job 8  $*
 
 # Mars:
-make_icosa_lmdz -p mars -parallel mpi_omp -arch X64_IRENE-AMD -arch_path ../ARCH -job 8
+make_icosa_lmdz -p mars -parallel mpi_omp -arch $arch -arch_path ../ARCH -job 8  $*
 
+# Pluto:
+#make_icosa_lmdz -p pluto -p_opt "-b 17x23" -parallel mpi -arch $arch -arch_path ../ARCH -job 8 $*

trunk/ICOSA_LMDZ/make_icosa_lmdz

@@ -21 +21 @@
 physics="none"
 build_deps="TRUE"
-CPP_KEY="CPP_NONE" 
+CPP_KEY="CPP_NONE"
 ICOSA_LIB=""
 
@@ -41 +41 @@
 [-parallel type]           : parallelism (none|mpi|omp|mpi_omp)
 [-with_xios]               : compile and link with XIOS (default)
-[-job num]                 : speed up compilation by using num simulateneous 
+[-job num]                 : speed up compilation by using num simulateneous
                              compilation steps (when possible)
 fin
@@ -48 +48 @@
       "-p")
           phys=$2 ; shift ; shift ;;
-      
+
       "-p_opt")
           phys_opt=$2 ; shift ; shift ;;
-          
+
       "-prod")
           compil_mode="prod" ; shift ;;
@@ -63 +63 @@
       "-arch")
           arch=$2 ; arch_defined="TRUE"; shift ; shift ;;
- 
+
       "-arch_path")
           arch_path=$2 ; arch_path_defined="TRUE"; shift ; shift ;;
@@ -108 +108 @@
     ln -s $arch_default_path/arch-${arch}.path arch.path
   fi
-        
+
   if test -f $arch_path/arch-${arch}.fcm
   then
@@ -162 +162 @@
 then
   parallel="none"
-else 
+else
   echo "-parallel value $parallel is invalid, only permited <none>, <mpi>, <omp> or <mpi_omp>"
   exit 1
@@ -170 +170 @@
 then
   ICOSA_LIB="$ICOSA_LIB $ORCHIDEE_LIBDIR $ORCHIDEE_LIB"
-fi  
+fi
 
 if [[ "$with_xios_defined" == "TRUE" ]]
@@ -177 +177 @@
   COMPIL_FFLAGS="$COMPIL_FFLAGS $XIOS_INCDIR"
   ICOSA_LIB="$ICOSA_LIB $XIOS_LIBDIR $XIOS_LIB"
-fi  
+fi
 
 ICOSA_LIB="$ICOSA_LIB $IOIPSL_LIBDIR $IOIPSL_LIB $NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB"
@@ -187 +187 @@
   full_flag="-full"
   full_flag2="--full"
-else 
+else
   full_flag=""
   full_flag2=""
@@ -225 +225 @@
 if [[ -d ../LMDZ.COMMON ]] ; then
     cd ../LMDZ.COMMON
-    ./makelmdz_fcm -p $phys $phys_opt -$compil_mode -parallel $parallel -libphy -io xios -arch $arch -arch_path $arch_path -j $job $full_flag || exit 1
+    echo "Compiling LMDZ.COMMON with:"
+    cmd="./makelmdz_fcm -p $phys $phys_opt -$compil_mode -parallel $parallel -libphy -io xios -arch $arch -arch_path $arch_path -j $job $full_flag"
+    echo $cmd
+    $cmd || (echo "Failed compilation of LMDZ.COMMON. Command line was:" && echo $cmd && exit 1)
     cd -
 else
@@ -233 +236 @@
 
 if [[ -d ../ICOSAGCM ]] ; then
-    cd ../ICOSAGCM 
+    cd ../ICOSAGCM
     # from now on, compile using fcm2
-    ./make_icosa -$compil_mode -parallel $parallel -external_ioipsl -with_xios -arch $arch -arch_path $arch_path -job $job $full_flag || exit 1
+    echo "Compiling ICOSAGCM with:"
+    cmd="./make_icosa -$compil_mode -parallel $parallel -external_ioipsl -with_xios -arch $arch -arch_path $arch_path -job $job $full_flag"
+    echo "$cmd"
+    $cmd || (echo "Failed compilation of ICOSAGCM. Command line was:" && echo $cmd && exit 1)
     cd -
 else