Changeset 6840 for CONFIG/UNIFORM/v7/IPSLCM7

Timestamp:

05/21/24 10:22:32 (6 weeks ago)

Author:

jgipsl

Message:

Enhencement on compression option by tar. Now do not keep the modeles folder in the tar file. Done by Karine Laurent.

File:

• CONFIG/UNIFORM/v7/IPSLCM7/compile_ipslcm7.sh (modified) (9 diffs)

CONFIG/UNIFORM/v7/IPSLCM7/compile_ipslcm7.sh

@@ -188 +188 @@
         echo " Now tar XIOS repository"
         echo " Now tar XIOS repository" >> $outfile
-        tar -cf $modipsl/modeles/XIOS.tar $modipsl/modeles/XIOS
-        rm -rf $modipsl/modeles/XIOS
+        cd $modipsl/modeles
+        tar -cf XIOS.tar XIOS
+        rm -rf XIOS
     else
         echo " No XIOS repository to compress"
@@ -198 +199 @@
         echo "Now tar LMDZ/libo repository"
         echo "Now tar LMDZ/libo repository" >> $outfile
-        tar -cf $modipsl/modeles/LMDZ/libo.tar $modipsl/modeles/LMDZ/libo
-        rm -rf $modipsl/modeles/LMDZ/libo
+        cd $modipsl/modeles/LMDZ
+        tar -cf libo.tar libo
+        rm -rf libo
     else
         echo " No LMDZ/libo repository to compress"
@@ -320 +322 @@
 
 ## 2.3 Compile xios
+cd $modipsl/modeles
 echo; echo "NOW DECOMPRESS XIOS IF NEEDED"
 # First check if XIOS needs to be decompressed
@@ -329 +332 @@
     echo >> $outfile
     echo "Found XIOS_${optmode}.tar -> decompress repository" >> $outfile
-    # Do not write "tar -xf ... -C $modipsl/modeles because it's modeles/XIOS that is compressed, not only XIOS/
-    tar -xf $modipsl/modeles/XIOS_${optmode}.tar -C $modipsl/ >> $outfile 2>&1
+    tar -xf XIOS_${optmode}.tar >> $outfile 2>&1
 elif [[ -f $modipsl/modeles/XIOS_prod.tar ]]; then
     echo >> $outfile
     echo "Found XIOS_prod.tar -> decompress repository" >> $outfile
-    tar -xf $modipsl/modeles/XIOS_prod.tar -C $modipsl/ >> $outfile 2>&1
+    tar -xf $modipsl/modeles/XIOS_prod.tar >> $outfile 2>&1
 elif [[ -f $modipsl/modeles/XIOS_debug.tar ]]; then
     echo >> $outfile
     echo "Found XIOS_debug.tar -> decompress repository" >> $outfile
-    tar -xf $modipsl/modeles/XIOS_debug.tar -C $modipsl/ >> $outfile 2>&1
+    tar -xf $modipsl/modeles/XIOS_debug.tar >> $outfile 2>&1
 elif [[ -f $modipsl/modeles/XIOS_dev.tar ]]; then
     echo >> $outfile
     echo "Found XIOS_dev.tar -> decompress repository" >> $outfile
-    tar -xf $modipsl/modeles/XIOS_dev.tar -C $modipsl/ >> $outfile 2>&1
+    tar -xf $modipsl/modeles/XIOS_dev.tar >> $outfile 2>&1
 elif [[ -f $modipsl/modeles/XIOS.tar ]]; then
     echo >> $outfile
     echo "Found XIOS.tar -> decompress repository" >> $outfile
-    tar -xf $modipsl/modeles/XIOS.tar -C $modipsl/ >> $outfile 2>&1
+    tar -xf $modipsl/modeles/XIOS.tar >> $outfile 2>&1
 else
     echo "XIOS source code was not found. Exit"
@@ -537 +539 @@
 
 ## 2.7 Compile LMDZ 
-cd $modipsl/modeles/LMDZ
 
 # First check if LMDZ/libo exist or if it could be decompressed
@@ -548 +549 @@
     echo "Found LMDZ/libo_${optmode}.tar -> decompress repository"; >> $outfile
     echo >> $outfile
-    tar -xf $modipsl/modeles/LMDZ/libo_${optmode}.tar -C $modipsl/ >> $outfile 2>&1
+    cd $modipsl/modeles/LMDZ
+    tar -xf libo_${optmode}.tar >> $outfile 2>&1
 fi
 
@@ -556 +558 @@
     echo; echo "NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO"
     echo >> $outfile ; echo " NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO"   >> $outfile 
-    
+    cd $modipsl/modeles/LMDZ    
     
     # Check if the compilation of LMDZ was previsouly interupted prematured. 
@@ -666 +668 @@
 
     cd $modipsl/modeles/LMDZ
+
     # Compile LMDZ regular lat-lon exectuable
     echo; echo "NOW COMPILE LMDZ REGULAR LAT-LON MODE. Resolution = ${resol_atm}"
@@ -789 +792 @@
     echo "Option comp_tar activated, now compress XIOS"
     echo "Option comp_tar activated, now compress XIOS" >> $outfile
-    tar -cf $modipsl/modeles/XIOS_${optmode}.tar $modipsl/modeles/XIOS
-    rm -rf $modipsl/modeles/XIOS
-fi
+    cd $modipsl/modeles
+    tar -cf XIOS_${optmode}.tar XIOS
+    rm -rf XIOS
+fi
+
 if [ $comp_tar == yes ] && [ -d $modipsl/modeles/LMDZ/libo ] ; then
     echo "Option comp_tar activated, now compress LMDZ/libo"
     echo "Option comp_tar activated, now compress LMDZ/libo" >> $outfile
-    tar -cf $modipsl/modeles/LMDZ/libo_${optmode}.tar $modipsl/modeles/LMDZ/libo
-    rm -rf $modipsl/modeles/LMDZ/libo
-fi
-
+    cd $modipsl/modeles/LMDZ
+    tar -cf libo_${optmode}.tar libo
+    rm -rf libo
+fi
+ 
 echo >>$outfile ; echo "ALL COMPILING FINISHED" >> $outfile
 echo ls -lrt modipsl/bin >> $outfile