Changeset 4896 for BOL

Timestamp:

Apr 11, 2024, 11:08:29 AM (7 months ago)

Author:

abarral

Message:

Fix XIOS compile
Fix mpif90 netcdf compile
Fix local netcdf compile
Fix missing rebuild

Location:

BOL/script_install_amaury

Files:

• arch_local/arch-local-gfortran-parallel.fcm (modified) (2 diffs)
• arch_local/arch-local-gfortran.fcm (modified) (1 diff)
• arch_local/arch-local-gfortran.path (modified) (1 diff)
• install_lmdz.sh (modified) (7 diffs)

BOL/script_install_amaury/arch_local/arch-local-gfortran-parallel.fcm

@@ -11 +11 @@
 %BASE_FFLAGS         -cpp -ffree-line-length-0 -fdefault-real-8 -DNC_DOUBLE
 %BASE_CFLAGS         -w -std=c++11 -D__XIOS_EXCEPTION  # xios
-%BASE_LD             -Wl,-rpath=$(dirname $(readlink -f "$(which mpif90)"))/../lib:$(nf-config --prefix)/lib -lstdc++
+# /!\ LD must be written in Makefile syntax
+%BASE_LD             -Wl,-rpath=$(shell dirname $(readlink -f "$(which mpif90)"))/../lib:$(shell nf-config --prefix)/lib -lstdc++
 %BASE_INC            -D__NONE__  # xios
 
@@ -24 +25 @@
 
 %MPI_FFLAGS          -fcray-pointer
-%MPI_LD              -L$(dirname $(readlink -f "$(which mpif90)"))/../lib -lmpi
+%MPI_LD              -L$(shell dirname $(readlink -f "$(which mpif90)"))/../lib -lmpi
 %OMP_LD              -fopenmp
 %OMP_FFLAGS          -fopenmp -fcray-pointer

BOL/script_install_amaury/arch_local/arch-local-gfortran.fcm

@@ -13 +13 @@
 %MPI_FFLAGS
 %OMP_FFLAGS
-%BASE_LD             -Wl,-rpath=$(nf-config --prefix)/lib
+# /!\ LD must be written in Makefile syntax
+%BASE_LD             -Wl,-rpath=$(shell nf-config --prefix)/lib
 %MPI_LD
 %OMP_LD

BOL/script_install_amaury/arch_local/arch-local-gfortran.path

@@ -1 +1 @@
 NETCDF_INCDIR="$(nf-config --fflags)"
+NETCDF_LIBDIR="$(nf-config --flibs)"
 NETCDF_LIB="$(nf-config --flibs)"
 NETCDF95_INCDIR="-I$LMDGCM/../../include"

BOL/script_install_amaury/install_lmdz.sh

@@ -326 +326 @@
 
     # Adapt for XIOS, which uses different naming conventions
-    # TODO >:c ugly fdefault-real-8 fix
     sed -i'' -e "s/%COMPILER/%FCOMPILER/" -e "s/%LINK/%LINKER/" -e "s/-fdefault-real-8//" "$MODEL/modipsl/modeles/XIOS/arch/arch-$arch.fcm"
 }
@@ -338 +337 @@
         cd "$MODEL"
 
-        case $compiler in
-          gfortran) opt1="-compiler gnu"; opt2="-CC gcc -FC gfortran -CXX g++";;
-          ifort)  opt1="-compiler intel"; opt2="-CC icc -FC ifort -CXX icpc";;
-          pgf90)  opt1="-compiler pgf90"; opt2="-CC pgcc -FC pgf90 -CXX pgCC";;
-          *)      echo "unexpected compiler $compiler for netcdf"; exit 1
+        # Convert non-basic compiler
+        local ncdf_compiler="$compiler"
+        case $compiler in  # TODO check if it works with other base compilers
+            mpif90) ncdf_compiler=$($compiler --help | head -n 1 | cut -f 2 -d " ")
+        esac
+
+        case $ncdf_compiler in
+            gfortran) opt1="-compiler gnu"; opt2="-CC gcc -FC gfortran -CXX g++";;
+            ifort)  opt1="-compiler intel"; opt2="-CC icc -FC ifort -CXX icpc";;
+            pgf90)  opt1="-compiler pgf90"; opt2="-CC pgcc -FC pgf90 -CXX pgCC";;
+            *)      echo "unexpected compiler $ncdf_compiler for netcdf"; exit 1
         esac
 
@@ -360 +365 @@
         fi
 
+
         echo "Repertoire netcdf $ncdfdir"
         if [[ ! -d $ncdfdir ]]; then
@@ -373 +379 @@
         fi
 
+        # Add to path
+        export PATH="$ncdfdir/bin:$PATH"
+
         #----------------------------------------------------------------------------
         # LF rajout d'une verrue, pour une raison non encore expliquee,
@@ -389 +398 @@
 EOF
 
-    if $compiler -I"$ncdfdir"/include test_netcdf90.f90 -L"$ncdfdir"/lib -lnetcdff \
+    if $ncdf_compiler -I"$ncdfdir"/include test_netcdf90.f90 -L"$ncdfdir"/lib -lnetcdff \
               -lnetcdf -Wl,-rpath="$ncdfdir"/lib && ./a.out
     then
@@ -416 +425 @@
 }
 
-function install_IOIPSL {  # via fcm
+function install_IOIPSL {
     cd "$MODEL/modipsl/modeles/IOIPSL"
     ioipsllog="$(pwd)/ioipsl.log"
@@ -424 +433 @@
         echo "IOIPSL compile failed, exiting"; exit 1
     fi
-    cp lib/* ../../lib
+
+    # Link to modipsl/bin
+    cp -f bin/* ../../bin
+
     echo "IOIPSL compiled $(date)"