diff --git a/src/LIB/SURCOUCHE/src/mode_io_field_write.f90 b/src/LIB/SURCOUCHE/src/mode_io_field_write.f90 index f2f43501c84eafb6860bf8ddb716c21532ce769a..d746793eb317597323062eef75cc9284391b2daf 100644 --- a/src/LIB/SURCOUCHE/src/mode_io_field_write.f90 +++ b/src/LIB/SURCOUCHE/src/mode_io_field_write.f90 @@ -1429,7 +1429,7 @@ end subroutine IO_Ndimlist_reduce ! end of MNH_GA #endif !Not global reduction because a broadcast is done in IO_Field_write_error_check - call MPI_REDUCE( -Abs( [ iresp_lfi, iresp_nc4 ] ), iresps(:), 1, MNHINT_MPI, MPI_MIN, & + call MPI_REDUCE( -Abs( [ iresp_lfi, iresp_nc4 ] ), iresps(:), 2, MNHINT_MPI, MPI_MIN, & tpfile%nmaster_rank - 1, tpfile%nmpicomm, ierr ) iresp_lfi = iresps(1) iresp_nc4 = iresps(2) diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk index 8c3d29804decf982f0473d395d3d549da5a67590..2fb71c0a0aa5643e5ad788a7ab8aede026bfc13a 100644 --- a/src/Rules.LXcray.mk +++ b/src/Rules.LXcray.mk @@ -180,7 +180,7 @@ CPPFLAGS_SURFEX = CPPFLAGS_SURCOUCHE += -DDEV_NULL -DMNH_COMPILER_CCE CPPFLAGS_RAD = CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT} -CPPFLAGS_MNH = -DMNH -DSFX_MNH -DMNH_NO_MPI_LOGICAL48 -DMNH_COMPILER_CCE +CPPFLAGS_MNH = -DMNH=MNH -DSFX_MNH -DMNH_NO_MPI_LOGICAL48 -DMNH_COMPILER_CCE ifeq ($(shell test $(CFV) -ge 1402 ; echo $$?),0) CPPFLAGS_MNH += -DMNH_COMPILER_CCE_1403 endif diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk index 30559240189952d90776a2dfc0b37c28c47e3960..c82bc7b12d5cab36c48444dc662e201fe7853a8b 100644 --- a/src/Rules.LXgfortran.mk +++ b/src/Rules.LXgfortran.mk @@ -105,7 +105,7 @@ CPPFLAGS_SURFEX = CPPFLAGS_SURCOUCHE += -DDEV_NULL CPPFLAGS_RAD = CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT} -CPPFLAGS_MNH = -DMNH -DSFX_MNH +CPPFLAGS_MNH = -DMNH=MNH -DSFX_MNH CPPFLAGS_MNH += -imacros MNH_OPENACC_NV_CR.CPP CPPFLAGS_MNH += -DMNH_EXPAND ifdef VER_GA @@ -200,3 +200,5 @@ OBJS_O0= spll_lima_phillips_integ.o $(OBJS_O0) : OPT = $(OPT_BASE) $(OPT_PERF0) endif endif + +SPLL = spll_new diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk index 9626bf68f4a07836a00377d55296e83f33ff957a..46c66c03ae64231f28fb5e2e96776eb40e39f5ef 100644 --- a/src/Rules.LXifort.mk +++ b/src/Rules.LXifort.mk @@ -185,7 +185,7 @@ CPPFLAGS_SURFEX = CPPFLAGS_SURCOUCHE += -DDEV_NULL CPPFLAGS_RAD = CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT} -CPPFLAGS_MNH = -DMNH -DSFX_MNH +CPPFLAGS_MNH = -DMNH=MNH -DSFX_MNH CPPFLAGS_MNH += -imacros MNH_OPENACC_NV_CR.CPP CPPFLAGS_MNH += -DMNH_EXPAND ifdef VER_GA @@ -270,3 +270,4 @@ OBJS_I4=spll_modd_netcdf.o $(OBJS_I4) : OPT = $(OPT_BASE_I4) endif +SPLL = spll_new diff --git a/src/Rules.LXnvhpc.mk b/src/Rules.LXnvhpc.mk index eb4bb1c62dc6784c2a136153c94dbf091433ca9b..d6052e0a964971986239c36eb343c2b3f556e178 100644 --- a/src/Rules.LXnvhpc.mk +++ b/src/Rules.LXnvhpc.mk @@ -200,7 +200,7 @@ CPPFLAGS_SURFEX = CPPFLAGS_SURCOUCHE += -DMNH_COMPILER_NVHPC CPPFLAGS_RAD = CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT} -CPPFLAGS_MNH = -DMNH -DMNH_PGI -DSFX_MNH +CPPFLAGS_MNH = -DMNH=MNH -DMNH_PGI -DSFX_MNH CPPFLAGS_MNH += -Uvector -Upixel CPPFLAGS_MNH += -DMNH_EXPAND -DMNH_EXPAND_OPENACC #CPPFLAGS_MNH += -imacros MNH_OPENACC_NV_CR.CPP @@ -304,3 +304,5 @@ ifeq "$(MNH_INT)" "8" OBJS_I4=spll_modd_netcdf.o $(OBJS_I4) : OPT = $(OPT_BASE_I4) endif + +SPLL = spll_new diff --git a/src/Rules.LXnvhpc2202.mk b/src/Rules.LXnvhpc2202.mk index eb9ad893b34759725aad6c25d48a792b6aeaeaf9..15ef6ced160560b3f1ca44055813aef81adb69cc 100644 --- a/src/Rules.LXnvhpc2202.mk +++ b/src/Rules.LXnvhpc2202.mk @@ -211,7 +211,7 @@ CPPFLAGS_SURFEX = CPPFLAGS_SURCOUCHE += -DMNH_COMPILER_NVHPC CPPFLAGS_RAD = CPPFLAGS_NEWLFI = -DSWAPIO -DLINUX -DLFI_INT=${LFI_INT} -CPPFLAGS_MNH = -DMNH -DMNH_PGI -DSFX_MNH +CPPFLAGS_MNH = -DMNH=MNH -DMNH_PGI -DSFX_MNH CPPFLAGS_MNH += -Uvector -Upixel CPPFLAGS_MNH += -DMNH_EXPAND -DMNH_EXPAND_OPENACC #CPPFLAGS_MNH += -imacros MNH_OPENACC_NV_CR.CPP