diff --git a/src/Rules.AIX64.mk b/src/Rules.AIX64.mk index 8a909af32502646b94dbab31dcdc1d7125115b3f..b4e3685d6994e06cc7caba6c6cc6e0d540bcbf67 100644 --- a/src/Rules.AIX64.mk +++ b/src/Rules.AIX64.mk @@ -120,4 +120,8 @@ $(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1) OBJS_O0 += spll_compute_exner_from_ground1d.o $(OBJS_O0) : OPT = $(OPT_BASE) $(OPT_PERF0) +ifneq "$(findstring 8,$(LFI_INT))" "" +OBJS_I8=spll_NEWLFI_ALL.o +$(OBJS_I8) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_I8) +endif diff --git a/src/Rules.BG.mk b/src/Rules.BG.mk index 0fb57bdafdfd851d3503fb8004b6cee4ea79d2a7..06b762085d61d5ec5bd0411376201edc9c4a33c0 100644 --- a/src/Rules.BG.mk +++ b/src/Rules.BG.mk @@ -133,3 +133,8 @@ $(OBJS_NOCB) : OPT = $(OPT_NOCB) #spll_rttovscatt_test.o spll_spawning.o spll_test_2_coef.o spll_test_coef.o spll_test_errorhandling.o \ #spll_test_q2v.o spll_xy_to_latlon.o spll_zoom_pgd.o +ifneq "$(findstring 8,$(LFI_INT))" "" +OBJS_I8=spll_NEWLFI_ALL.o +$(OBJS_I8) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_I8) +endif + diff --git a/src/Rules.BGQ.mk b/src/Rules.BGQ.mk index 03e15d57192e65e266a8af58d9e4f35e7d705c06..2357a873f2e9fb4f63c823d21cccc097f4a2a382 100644 --- a/src/Rules.BGQ.mk +++ b/src/Rules.BGQ.mk @@ -127,8 +127,9 @@ FX90FLAGS = $(OPT) -qfixed # FC = mpixlf95_r FCFLAGS = -qfloat=nomaf -CC = mpixlc_r -CFLAGS = $(FCFLAGS) +#CC = mpixlc_r +#CFLAGS = $(FCFLAGS) +CC = powerpc64-bgq-linux-gcc export CC FCFLAGS CFLAGS # LDFLAGS = $(OPT) -Wl,--relax @@ -191,3 +192,8 @@ $(OBJS_NOCB) : OPT = $(OPT_NOCB) #spll_rttovscatt_test.o spll_spawning.o spll_test_2_coef.o spll_test_coef.o spll_test_errorhandling.o \ #spll_test_q2v.o spll_xy_to_latlon.o spll_zoom_pgd.o +ifneq "$(findstring 8,$(LFI_INT))" "" +OBJS_I8=spll_NEWLFI_ALL.o +$(OBJS_I8) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_I8) +endif + diff --git a/src/Rules.LXg95.mk b/src/Rules.LXg95.mk index 0c94f31810e11ea756bbe1db918bbf5c9d2b14f6..73c604cd1a8798e844cc2df9aa4a71593234c754 100644 --- a/src/Rules.LXg95.mk +++ b/src/Rules.LXg95.mk @@ -94,3 +94,9 @@ include Makefile.MESONH.mk # etc ... # # # ########################################################## + +ifneq "$(findstring 8,$(LFI_INT))" "" +OBJS_I8=spll_NEWLFI_ALL.o +$(OBJS_I8) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_I8) +endif + diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk index 6b825a20b5f4bb0b91628d1455e0d06694991ffd..b7958f15f31f231a84b0a4c02817390a685ba9dc 100644 --- a/src/Rules.LXpgi.mk +++ b/src/Rules.LXpgi.mk @@ -141,5 +141,8 @@ $(OBJS_O1) : OPT = $(OPT_BASE) $(OPT_PERF1) #VPATH += $(MODULE_SYSTEM) # - +ifneq "$(findstring 8,$(LFI_INT))" "" +OBJS_I8=spll_NEWLFI_ALL.o +$(OBJS_I8) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_I8) +endif diff --git a/src/Rules.SX8.mk b/src/Rules.SX8.mk index 6dbdbe05f5c8839fd8c2a150426bfda95633026d..2931d8cf3cb721f07e486b6b5aa8029f9d1b371d 100644 --- a/src/Rules.SX8.mk +++ b/src/Rules.SX8.mk @@ -117,3 +117,9 @@ include Makefile.MESONH.mk OBJS0 += spll_ch_jac.o spll_ch_terms.o \ spll_fm_writ_ll.o spll_NEWLFI_ALL.o spll_fm_read_ll.o $(OBJS0) : OPT_CHECK = + +ifneq "$(findstring 8,$(LFI_INT))" "" +OBJS_I8=spll_NEWLFI_ALL.o +$(OBJS_I8) : OPT = $(OPT_BASE) $(OPT_PERF2) $(OPT_I8) +endif + diff --git a/src/configure b/src/configure index 39a899275f05fbdf9dc2dfa86f396f4c8a909628..fad676f0a7cbe5f5c953d0d9d99ecbcd5f908778 100755 --- a/src/configure +++ b/src/configure @@ -126,8 +126,8 @@ module load netcdf/3.6.3 source /bglocal/fe/pub/Modules/default/init/bash export MODULEPATH=/bghome/rech/mnh/rmnh007/my_modules:\$MODULEPATH module purge -module load ibmcmp/V1R2M2/14.01.0000.0006/xl.ndebug -export VER_GA=ga-mpi-5-0-3 +module load ibmcmp/V1R2M2/14.01.0000.0011/gcc.legacy +export VER_GA=ga-mpi-5-0-3-v1r2m2-gcc-legacy module load ga/\${VER_GA} "} ;; @@ -255,7 +255,7 @@ export MANPATH=\$MPI_ROOT/share/man:\$MANPATH export VER_CDF=${VER_CDF:-CDFAUTO} export MNHENV=${MNHENV:-" ulimit -s unlimited -module load intel/15.0.0.090 +module load intel/15.0.3.187 module load intelmpi/5.0.1.035 export SLURM_CPU_BIND=none export I_MPI_PIN_PROCESSOR_LIST=all:map=spread