Changeset 4508 for BOL


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • BOL/script_install/install_lmdz.sh

    r4503 r4508  
    330330             module load subversion/1.9.7 ;
    331331             module load cmake
    332              export NETCDF_LIBDIR=./
     332             export NETCDF_LIBDIR=./
    333333             export NETCDFFORTRAN_INCDIR=./
    334334             export NETCDFFORTRAN_LIBDIR=./
     
    744744            sed -e s:/bin/ksh:/bin/bash:g Makefile.ksh > Makefile
    745745        fi
    746         # if [ "$pclinux" = 1 ] ; then
     746        ### if [ "$pclinux" = 1 ] ; then
    747747        # Build IOIPSL modules and library
    748748        $make clean
     
    753753        fi
    754754        # Build IOIPSL tools (ie: "rebuild", if present)
    755         if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/rebuild ] ; then
     755        if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/rebuild ] ; then 
    756756            cd $MODEL/modipsl/modeles/IOIPSL/tools
    757757            # adapt Makefile & rebuild script if in bash
     
    767767            $make > $ioipsllog 2>&1
    768768        fi
    769         # fi # of if [ "$pclinux" = 1 ]
    770 
    771         else # of if [ "$pclinux" = 1 ]
     769        ### fi # of if [ "$pclinux" = 1 ] which is commented out
     770
     771    else # of if [ $ioipsl = 1 ]
    772772        if [ ${hostname:0:5} = jean- ] ; then
    773773            cd $MODEL/modipsl
     
    782782            cd $MODEL/modipsl/modeles/IOIPSL/src
    783783            gmake > ioipsl.log
    784             if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/rebuild ] ; then
     784            # For IOIPSLv_2_2_2, "rebuild" files are in IOIPSL/tools, so "gmake" in IOIPSL/tools is enough
     785            # For IOIPSLv_2_2_5, "rebuild" files are in a separate IOIPSL/rebuild folder , while "tools" only contains "FCM"
     786            if [ -f $MODEL/modipsl/modeles/IOIPSL/tools/Makefile ] ; then
    785787              cd $MODEL/modipsl/modeles/IOIPSL/tools
    786788              gmake > ioipsl.log
    787789            fi
     790            if [ -d $MODEL/modipsl/modeles/IOIPSL/rebuild ] ; then
     791              cd $MODEL/modipsl/modeles/IOIPSL/rebuild
     792              gmake > ioipsl.log
     793            fi
     794
    788795        fi
    789796        echo install_lmdz.sh ioipsl_OK `date`
    790797    fi # of if [ $ioipsl = 1 ]
    791 fi
     798fi # of if [[ ! -f $MODEL/modipsl/lib/libioipsl.a ]]
    792799
    793800#=========================================================================
Note: See TracChangeset for help on using the changeset viewer.