Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Ondrej Vysocky
OpenFOAM-MERIC
Commits
1a87c1a0
Commit
1a87c1a0
authored
Jul 14, 2017
by
Ondrej Vysocky
Browse files
FIX change in selecting READEX interface
parent
023c7874
Changes
7
Hide whitespace changes
Inline
Side-by-side
FOAMMODULES-GCC-Salomon.sh
View file @
1a87c1a0
...
...
@@ -9,8 +9,9 @@
# SELECT MACHINE ###############################################################
MERIC_LIBS_COMMON
=
"-L
$HOME
/OpenFOAM/meric/lib/ -lmericmpi "
MERIC_LIBS_TAURUS
=
"-lhdeem -lfreeipmi -lcpufreq -lx86_adapt -DWITHREADEX -DUSE_MERIC "
MERIC_LIBS_SALOMON
=
"-L
$HOME
/readex/MERIC/x86adaptGCC/x86_adapt/build/ -lx86_adapt
-DWITHREADEX -DUSE_MERIC
"
MERIC_LIBS_SALOMON
=
"-L
$HOME
/readex/MERIC/x86adaptGCC/x86_adapt/build/ -lx86_adapt "
export
READEX_DEFINE
=
"-DUSE_MERIC"
export
READEX_LIBS
=
$MERIC_LIBS_COMMON$MERIC_LIBS_SALOMON
# SELECT GCC ###################################################################
...
...
FOAMMODULES-Intel-Taurus.sh
View file @
1a87c1a0
...
...
@@ -2,9 +2,10 @@
# SELECT MACHINE ##############################################################
MERIC_LIBS_COMMON
=
"-L
$HOME
/OpenFOAM/meric/lib/ -lmericmpi "
MERIC_LIBS_TAURUS
=
"-lhdeem -lfreeipmi -lcpufreq -lx86_adapt -L/sw/taurus/libraries/papi/5.4.1/lib/ -lpapi
-DWITHREADEX -DUSE_MERIC -DENDKILL
"
MERIC_LIBS_SALOMON
=
"-L
$HOME
/readex/MERIC/x86adaptGCC/x86_adapt/build/ -lx86_adapt
-DWITHREADEX -DUSE_MERIC
"
MERIC_LIBS_TAURUS
=
"-lhdeem -lfreeipmi -lcpufreq -lx86_adapt -L/sw/taurus/libraries/papi/5.4.1/lib/ -lpapi"
MERIC_LIBS_SALOMON
=
"-L
$HOME
/readex/MERIC/x86adaptGCC/x86_adapt/build/ -lx86_adapt"
export
READEX_DEFINE
=
"-DUSE_MERIC -DENDKILL"
export
READEX_LIBS
=
$MERIC_LIBS_COMMON$MERIC_LIBS_TAURUS
# SELECT INTEL ################################################################
...
...
OpenFOAM-v1612+/applications/solvers/incompressible/icoFoam/Make/options
View file @
1a87c1a0
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(HOME)/OpenFOAM/meric/include
-I$(HOME)/OpenFOAM/meric/include
-DWITHREADEX $(READEX_DEFINE)
EXE_LIBS = \
-lfiniteVolume \
...
...
OpenFOAM-v1612+/applications/solvers/incompressible/simpleFoam/Make/options
View file @
1a87c1a0
...
...
@@ -7,7 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(HOME)/OpenFOAM/meric/include \
-DWITHREADEX
-DWITHREADEX
$(READEX_DEFINE)
EXE_LIBS = \
...
...
OpenFOAM-v1612+/src/OpenFOAM/Make/options
View file @
1a87c1a0
EXE_INC = -I$(OBJECTS_DIR) \
-I$(HOME)/OpenFOAM/meric/include
-I$(HOME)/OpenFOAM/meric/include
-DWITHREADEX $(READEX_DEFINE)
LIB_LIBS = \
$(FOAM_LIBBIN)/libOSspecific.o \
...
...
OpenFOAM-v1612+/src/Pstream/mpi/Make/options
View file @
1a87c1a0
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = $(PFLAGS) $(PINC) $(c++LESSWARN) -I$(HOME)/OpenFOAM/meric/include
EXE_INC = $(PFLAGS) $(PINC) $(c++LESSWARN) -I$(HOME)/OpenFOAM/meric/include
-DWITHREADEX $(READEX_DEFINE)
LIB_LIBS = $(PLIBS) \
$(READEX_LIBS)
...
...
OpenFOAM-v1612+/src/Pstream/mpi/UPstream.C
View file @
1a87c1a0
...
...
@@ -42,7 +42,7 @@ License
#define MPI_SCALAR MPI_DOUBLE
#endif
#define WITHREADEX
//
#define WITHREADEX
#ifdef WITHREADEX
#include
<readex.h>
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment