Changeset 4508

Timestamp:

Apr 13, 2023, 7:07:46 PM (21 months ago)

Author:

asima

Message:

Do "gmake" in IOIPSL/rebuild folder if this folder exists - which is the case for IOIPSLv_2_2_5 (in IOIPSLv2_2_2, the rebuild files were in IOIPSL/tools)

File:

• BOL/script_install/install_lmdz.sh (modified) (5 diffs)

BOL/script_install/install_lmdz.sh

@@ -330 +330 @@
              module load subversion/1.9.7 ;
              module load cmake
-             export NETCDF_LIBDIR=./
+             export NETCDF_LIBDIR=./
              export NETCDFFORTRAN_INCDIR=./
              export NETCDFFORTRAN_LIBDIR=./
@@ -744 +744 @@
             sed -e s:/bin/ksh:/bin/bash:g Makefile.ksh > Makefile
         fi
-        # if [ "$pclinux" = 1 ] ; then
+        ### if [ "$pclinux" = 1 ] ; then
         # Build IOIPSL modules and library
         $make clean
@@ -753 +753 @@
         fi
         # Build IOIPSL tools (ie: "rebuild", if present)
-        if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/rebuild ] ; then
+        if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/rebuild ] ; then 
             cd $MODEL/modipsl/modeles/IOIPSL/tools
             # adapt Makefile & rebuild script if in bash
@@ -767 +767 @@
             $make > $ioipsllog 2>&1
         fi
-        # fi # of if [ "$pclinux" = 1 ]
-
-        else # of if [ "$pclinux" = 1 ]
+        ### fi # of if [ "$pclinux" = 1 ] which is commented out
+
+    else # of if [ $ioipsl = 1 ]
         if [ ${hostname:0:5} = jean- ] ; then
             cd $MODEL/modipsl
@@ -782 +782 @@
             cd $MODEL/modipsl/modeles/IOIPSL/src
             gmake > ioipsl.log
-            if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/rebuild ] ; then
+            # For IOIPSLv_2_2_2, "rebuild" files are in IOIPSL/tools, so "gmake" in IOIPSL/tools is enough
+            # For IOIPSLv_2_2_5, "rebuild" files are in a separate IOIPSL/rebuild folder , while "tools" only contains "FCM"
+            if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/Makefile ] ; then
               cd $MODEL/modipsl/modeles/IOIPSL/tools
               gmake > ioipsl.log
             fi
+            if [ -d $MODEL/modipsl/modeles/IOIPSL/rebuild ] ; then
+              cd $MODEL/modipsl/modeles/IOIPSL/rebuild
+              gmake > ioipsl.log
+            fi
+
         fi
         echo install_lmdz.sh ioipsl_OK `date`
     fi # of if [ $ioipsl = 1 ]
-fi
+fi # of if [[ ! -f $MODEL/modipsl/lib/libioipsl.a ]]
 
 #=========================================================================