diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk index c7b13736160c4e72496d6a2b2487dcd400689f06..0824a17379fcc5effe9c5c477e68290eb7d899bd 100644 --- a/src/Rules.LXgfortran.mk +++ b/src/Rules.LXgfortran.mk @@ -167,7 +167,7 @@ endif ifeq ($(shell test $(GFV) -le 482 ; echo $$?),0) ifneq "$(OPTLEVEL)" "DEBUG" -OBJS_O0= spll_lima_phillips_integ.o +OBJS_O0= spll_lima_phillips_integ.o mode_lima_phillips_integ.mod $(OBJS_O0) : OPT = $(OPT_BASE) $(OPT_PERF0) endif endif diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk index 7788bb031c9099d7b1d70a95e0d8a684ffc0f6cd..1176be17ff7184743a85d3825a9988d11b773d5e 100644 --- a/src/Rules.LXifort.mk +++ b/src/Rules.LXifort.mk @@ -242,7 +242,8 @@ include Makefile.MESONH.mk ifneq "$(OPTLEVEL)" "DEBUG" OPT_PERF1 = -O1 OBJS_O1= spll_mode_snow3l.o spll_schu.o spll_ps2str.o spll_p_abs.o spll_ini_one_way_n.o spll_urban_solar_abs.o spll_aeroopt_get.o spll_ch_get_rates.o \ - spll_ini_aeroset1.o spll_ini_aeroset2.o spll_ini_aeroset3.o spll_ini_aeroset4.o spll_ini_aeroset5.o spll_ini_aeroset6.o + spll_ini_aeroset1.o spll_ini_aeroset2.o spll_ini_aeroset3.o spll_ini_aeroset4.o spll_ini_aeroset5.o spll_ini_aeroset6.o \ + mode_snow3l.mod mode_ini_one_way_n.mod $(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1) endif diff --git a/src/configure b/src/configure index 659eac8cdff9d046e56ba123acb3a02190bf5323..cd10928c1234d6d9d0db863b760448bad355f5a4 100755 --- a/src/configure +++ b/src/configure @@ -270,6 +270,8 @@ module load intel/2019.5.281 module load openmpi/intel/4.0.2.2 module load cmake/3.15.4 unset CC CXX +export SPLL=spll_new + "} ;; 'Linux login0'*|'Linux compute'*) @@ -436,9 +438,23 @@ export CC=gcc export NEED_TOOLS=NO export MNHENV=${MNHENV:-" export PATH=/opt/gcc-9.4.0/bin:\$PATH +export SPLL=spll_new "} ;; -'Linux lx'*|'Linux sx'*|'Linux px'*) #CNRM +'Linux sx'*) #CNRM team server UBUNTU22 + export MNH_ARCH=`echo $ARCH | grep LX` + export ARCH=${MNH_ARCH:-LXgfortran} + export VER_MPI=${VER_MPI:-MPIAUTO} + export OPTLEVEL=${OPTLEVEL:-DEBUG} + export MVWORK=${MVWORK:-NO} + export VER_CDF=${VER_CDF:-CDFAUTO} + export NEED_TOOLS=NO + export MNHENV=${MNHENV:-" +export PATH=/opt/gcc-9.4.0/bin:\$PATH +export SPLL=spll_new +"} + ;; +'Linux lx'*|'Linux px'*) #CNRM export MNH_ARCH=`echo $ARCH | grep LX` export ARCH=${MNH_ARCH:-LXgfortran} export VER_MPI=${VER_MPI:-MPIAUTO} @@ -446,6 +462,9 @@ export PATH=/opt/gcc-9.4.0/bin:\$PATH export MVWORK=${MVWORK:-NO} export VER_CDF=${VER_CDF:-CDFCTI} export NEED_TOOLS=NO + export MNHENV=${MNHENV:-" +export SPLL=spll_new +"} ;; 'Linux nuwa'*) export ARCH=${ARCH:-LXifort}