Changeset 6536 for CONFIG

Timestamp:

07/07/23 15:45:08 (11 months ago)

Author:

acosce

Message:

standardized names for environment variables managed by files arch.path

• LMDZ, INCA, ICOS_LMDZ are using ORCH_INC/LIB and not ORCHIDEE_LIB/INC
• now option arch_path can be used to compile LMDZ (before there was a variable name problem on Orchidee lib)

Location:

CONFIG/UNIFORM/v7/IPSLCM7

Files:

• ARCH/arch-X64_IRENE-AMD.path (modified) (1 diff)
• ARCH/arch-X64_IRENE.path (modified) (1 diff)
• ARCH/arch-X64_JEANZAY.path (modified) (1 diff)
• compile_ipslcm7.sh (modified) (3 diffs)

CONFIG/UNIFORM/v7/IPSLCM7/ARCH/arch-X64_IRENE-AMD.path

@@ -36 +36 @@
 XIOS_LIB="-lxios -lstdc++"
 
-ORCHIDEE_INCDIR="-I$ROOT/../ORCHIDEE/inc"
-ORCHIDEE_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
-ORCHIDEE_LIB="-lorchidee"
+ORCH_INCDIR="-I$ROOT/../ORCHIDEE/inc"
+ORCH_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
+ORCH_LIB="-lorchidee"
 

CONFIG/UNIFORM/v7/IPSLCM7/ARCH/arch-X64_IRENE.path

@@ -36 +36 @@
 XIOS_LIB="-lxios -lstdc++"
 
-ORCHIDEE_INCDIR="-I$ROOT/../ORCHIDEE/inc"
-ORCHIDEE_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
-ORCHIDEE_LIB="-lorchidee"
+ORCH_INCDIR="-I$ROOT/../ORCHIDEE/inc"
+ORCH_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
+ORCH_LIB="-lorchidee"
 

CONFIG/UNIFORM/v7/IPSLCM7/ARCH/arch-X64_JEANZAY.path

@@ -36 +36 @@
 XIOS_LIB="-lxios -lstdc++"
 
-ORCHIDEE_INCDIR="-I$ROOT/../ORCHIDEE/inc"
-ORCHIDEE_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
-ORCHIDEE_LIB="-lorchidee"
+ORCH_INCDIR="-I$ROOT/../ORCHIDEE/inc"
+ORCH_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
+ORCH_LIB="-lorchidee"

CONFIG/UNIFORM/v7/IPSLCM7/compile_ipslcm7.sh

@@ -378 +378 @@
 if [ $lmdzsvn -le 4185 -a $rad = "ecrad" ] ; then echo "ecrad only available for LMDZ rev starting with 4186 " ; exit ; fi
 
-echo ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v $orchcomp -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 
-     ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v $orchcomp -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 2>&1
+echo ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v $orchcomp -io xios -arch $fcm_arch -arch_path $arch_path -j 8 $full_lmdz    >> $outfile 
+     ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v $orchcomp -io xios -arch $fcm_arch -arch_path $arch_path -j 8 $full_lmdz    >> $outfile 2>&1
 # Test if compiling finished
 if [[ $? != 0 ]] ; then
@@ -442 +442 @@
         rm -f .lock
     fi
-    echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 
-         ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 2>&1
+    echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -arch_path $arch_path -j 8 $full_lmdz gcm    >> $outfile 
+         ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -arch_path $arch_path -j 8 $full_lmdz gcm    >> $outfile 2>&1
     # Test if compiling finished
     if [[ $? != 0 ]] ; then
@@ -474 +474 @@
     echo >> $outfile ; echo " NOW COMPILE CE0L OF LMDZ. Resolution = ${resol_atm}"   >> $outfile 
 
-    echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz ce0l    >> $outfile 
-         ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz ce0l    >> $outfile 2>&1
+    echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -arch_path $arch_path -j 8 $full_lmdz ce0l    >> $outfile 
+         ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -arch_path $arch_path -j 8 $full_lmdz ce0l    >> $outfile 2>&1
     # Test if compiling finished
     if [[ $? != 0 ]] ; then