Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AL farm #228

Merged
merged 5 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/CI_parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:

env:
METIS_HOME: /home/runner/work/horses3d/horses3d/metis-5.1.0/build/Linux-x86_64
INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
# Steps represent a sequence of tasks that will be executed as part of the job

steps:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/CI_sequential 1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ jobs:
mkl: 'YES'
- compiler: ifort
mkl: 'NO'
env:
INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1

# Steps represent a sequence of tasks that will be executed as part of the job

steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/CI_sequential 2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
mkl: 'NO'
- compiler: ifort
hdf5: 'YES'
env:
INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
# Steps represent a sequence of tasks that will be executed as part of the job

steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/CI_sequential 3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
mkl: 'YES'
- compiler: ifort
mkl: 'NO'
env:
INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
# Steps represent a sequence of tasks that will be executed as part of the job

steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/CI_sequential 4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
mkl: 'YES'
- compiler: ifort
mkl: 'NO'
env:
INTEL_COMPILER_DIR : /opt/intel/oneapi/compiler/2024.1
# Steps represent a sequence of tasks that will be executed as part of the job

steps:
Expand Down
15 changes: 14 additions & 1 deletion Solver/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,18 @@ endif
ifeq ($(COMPILER),ifort)
FC:=ifort
MOD_FLAG:=-module
## patch, normally is in /opt/intel/oneapi/compiler/2024.1/opt/compiler/include/intel64/
INCLUDEO=-I$(INTEL_COMPILER_DIR)/opt/compiler/include/intel64/
else ifeq ($(COMPILER),intel)
FC:=ifort
MOD_FLAG:=-module
## patch, normally is in /opt/intel/oneapi/compiler/2024.1/opt/compiler/include/intel64/
INCLUDEO=-I$(INTEL_COMPILER_DIR)/opt/compiler/include/intel64/
else ifeq ($(COMPILER),INTEL)
FC:=ifort
MOD_FLAG:=-module
## patch, normally is in /opt/intel/oneapi/compiler/2024.1/opt/compiler/include/intel64/
INCLUDEO=-I$(INTEL_COMPILER_DIR)/opt/compiler/include/intel64/
endif

##########################################
Expand Down Expand Up @@ -226,6 +232,7 @@ ADDONSFLAGS += $(MACROS)
LIBFLAGS= FC='$(FC)' \
FFLAGS='$(FFLAGS)' \
INCLUDE='$(INCLUDE)' \
INCLUDEO='$(INCLUDEO)' \
INSTALL_DIR='$(INSTALL_DIR)' \
AR='$(AR)' \
ARFLAGS='$(ARFLAGS)' \
Expand All @@ -238,6 +245,7 @@ LIBFLAGS= FC='$(FC)' \
HORSES_NS_FLAGS= FC='$(FC)' \
FFLAGS='$(FFLAGS)'\
INCLUDE='$(INCLUDE)' \
INCLUDEO='$(INCLUDEO)' \
INSTALL_DIR='$(INSTALL_DIR)' \
MOD_FLAG='$(MOD_FLAG)'\
HORSES_LIBS_EXEC='$(HORSES_LIBS_NS) $(PROBLEM_LIB_NS)' \
Expand All @@ -248,6 +256,7 @@ HORSES_NS_FLAGS= FC='$(FC)' \
HORSES_NSSA_FLAGS= FC='$(FC)' \
FFLAGS='$(FFLAGS)'\
INCLUDE='$(INCLUDE)' \
INCLUDEO='$(INCLUDEO)' \
INSTALL_DIR='$(INSTALL_DIR)' \
MOD_FLAG='$(MOD_FLAG)'\
HORSES_LIBS_EXEC='$(HORSES_LIBS_NSSA) $(PROBLEM_LIB_NSSA)' \
Expand All @@ -259,6 +268,7 @@ HORSES_NSSA_FLAGS= FC='$(FC)' \
HORSES_iNS_FLAGS= FC='$(FC)' \
FFLAGS='$(FFLAGS)'\
INCLUDE='$(INCLUDE)' \
INCLUDEO='$(INCLUDEO)' \
INSTALL_DIR='$(INSTALL_DIR)' \
MOD_FLAG='$(MOD_FLAG)'\
HORSES_LIBS_EXEC='$(HORSES_LIBS_iNS) $(PROBLEM_LIB_iNS)' \
Expand All @@ -269,6 +279,7 @@ HORSES_iNS_FLAGS= FC='$(FC)' \
HORSES_CH_FLAGS= FC='$(FC)' \
FFLAGS='$(FFLAGS)'\
INCLUDE='$(INCLUDE)' \
INCLUDEO='$(INCLUDEO)' \
INSTALL_DIR='$(INSTALL_DIR)' \
MOD_FLAG='$(MOD_FLAG)'\
HORSES_LIBS_EXEC='$(HORSES_LIBS_CH) $(PROBLEM_LIB_CH)' \
Expand All @@ -279,6 +290,7 @@ HORSES_CH_FLAGS= FC='$(FC)' \
HORSES_MU_FLAGS= FC='$(FC)' \
FFLAGS='$(FFLAGS)'\
INCLUDE='$(INCLUDE)' \
INCLUDEO='$(INCLUDEO)' \
INSTALL_DIR='$(INSTALL_DIR)' \
MOD_FLAG='$(MOD_FLAG)'\
HORSES_LIBS_EXEC='$(HORSES_LIBS_MU) $(PROBLEM_LIB_MU)' \
Expand All @@ -289,6 +301,7 @@ HORSES_MU_FLAGS= FC='$(FC)' \
ADDONSFLAGS= FC='$(FC)' \
FFLAGS='$(FFLAGS)'\
INCLUDE='$(INCLUDE)' \
INCLUDEO='$(INCLUDEO)' \
INSTALL_DIR='$(INSTALL_DIR)' \
MOD_FLAG='$(MOD_FLAG)'\
HORSES_LIBS_EXEC='$(HORSES_LIBS_NS) $(PROBLEM_LIB_NS)' \
Expand Down Expand Up @@ -481,4 +494,4 @@ header: FORCE
@echo

## Dummy target to make sure a rule is executed
FORCE:
FORCE:
12 changes: 6 additions & 6 deletions Solver/src/libs/mesh/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -171,27 +171,27 @@ all: lib$(LIB)_ns.a lib$(LIB)_nssa.a lib$(LIB)_ins.a lib$(LIB)_ch.a lib$(LIB)_mu
./build_ns/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns
$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns

./build_nssa/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa
$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa

./build_ins/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins
$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins

./build_ch/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch
$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch

./build_mu/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu
$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu

lib$(LIB)_ns.a: header mkdirs $(LIBOBJS_NS) ./build_ns/METISPartitioning.o
@echo
Expand Down Expand Up @@ -292,4 +292,4 @@ clean: FORCE
#############################################
# Dummy procedure to force a rule #
#############################################
FORCE:
FORCE:
2 changes: 1 addition & 1 deletion Solver/src/libs/ml/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LIB = ml
./build/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) $(MACROS) $(EXTLIB_INC) $(INCLUDE) -c $< -o $@ $(MOD_FLAG) ./include
$(FC) $(FFLAGS) $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) -c $< -o $@ $(MOD_FLAG) ./include

lib$(LIB).a: header mkdirs $(LIBOBJS)
@echo
Expand Down
12 changes: 6 additions & 6 deletions Solver/src/libs/monitors/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,27 +80,27 @@ all: lib$(LIB)_ns.a lib$(LIB)_nssa.a lib$(LIB)_ins.a lib$(LIB)_ch.a lib$(LIB)_mu
./build_ns/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns
$(FC) $(FFLAGS) -DNAVIERSTOKES -I./include_ns $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ns -c $< -o $@ $(MOD_FLAG) ./include_ns

./build_nssa/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa
$(FC) $(FFLAGS) -DNAVIERSTOKES -DSPALARTALMARAS -I./include_nssa $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_nssa -c $< -o $@ $(MOD_FLAG) ./include_nssa

./build_ins/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins
$(FC) $(FFLAGS) -DINCNS -I./include_ins $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ins -c $< -o $@ $(MOD_FLAG) ./include_ins

./build_ch/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch
$(FC) $(FFLAGS) -DCAHNHILLIARD -I./include_ch $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_ch -c $< -o $@ $(MOD_FLAG) ./include_ch

./build_mu/%.o: %.f90
@echo
@echo $<
$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu
$(FC) $(FFLAGS) -DMULTIPHASE -DCAHNHILLIARD -I./include_mu $(MACROS) $(EXTLIB_INC) $(INCLUDE) $(INCLUDEO) $(INCLUDE)_mu -c $< -o $@ $(MOD_FLAG) ./include_mu

lib$(LIB)_ns.a: header mkdirs $(LIBOBJS_NS)
@echo
Expand Down Expand Up @@ -202,4 +202,4 @@ clean: FORCE
#############################################
# Dummy procedure to force a rule #
#############################################
FORCE:
FORCE:
Loading
Loading