Skip to content

Commit 8b10b39

Browse files
authored
Merge pull request #272 from loganoz/ejaneDev
Added turbulent ABL precursor mapping and actuator line external controller module.
2 parents f0599d7 + a7089c5 commit 8b10b39

46 files changed

Lines changed: 911501 additions & 51 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/CI_parallel.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,54 @@ jobs:
947947
mpiexec -n 64 ./horses3d.ns Cylinder_AdaptiveTimeStep_pAdaptationRL.control
948948
if: '!cancelled()'
949949

950+
#
951+
# 34) Atmospheric Boundary Layer (ABL) mapping to boundary
952+
# --------------------------------------------
953+
954+
- name: Build ABL_BoundaryMapping
955+
working-directory: ./Solver/test/NavierStokes/ABLBoundaryMapping/SETUP
956+
run: |
957+
source /opt/intel/oneapi/setvars.sh || true
958+
TEST_HOME_DIR=$(grep '^HOME_DIR=' Makefile | cut -d'=' -f2)
959+
rm Makefile
960+
wget https://people.math.sc.edu/Burkardt/f_src/geompack2/geompack2.f90
961+
cp -r ../../../../../utils/ABLBoundaryMapping/SETUP/* .
962+
mv Makefile.iABL Makefile
963+
cp -r ../../../../../utils/ABLBoundaryMapping/PRECURSOR ../
964+
sed -i "s|^HOME_DIR=.*|HOME_DIR=$TEST_HOME_DIR|" Makefile
965+
awk '/END SUBROUTINE UserDefinedFinalize/{system("cat testchecks"); print ""; print; next}1' ProblemFile.f90 > temp && mv temp ProblemFile.f90
966+
make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
967+
if: '!cancelled()'
968+
969+
- name: Run ABL_BoundaryMapping
970+
working-directory: ./Solver/test/NavierStokes/ABLBoundaryMapping
971+
run: |
972+
source /opt/intel/oneapi/setvars.sh || true
973+
mpiexec -n 64 ./horses3d.ns ABLBoundaryMapping.control
974+
if: '!cancelled()'
975+
976+
#
977+
# 35) Actuator Line (AL) external controller module
978+
# --------------------------------------------
979+
- name: Build ActuatorLineController
980+
working-directory: ./Solver/test/NavierStokes/ActuatorLineController/SETUP
981+
run: |
982+
source /opt/intel/oneapi/setvars.sh || true
983+
make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
984+
cd ../ActuatorDef/controller
985+
git clone https://github.com/EduardoJane/DRC_Fortran_H3D.git
986+
cd DRC_Fortran_H3D/Source
987+
make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}}
988+
mv ../DISCON/DISCON_glin64.so ../../
989+
if: '!cancelled()'
990+
991+
- name: Run ActuatorLineController
992+
working-directory: ./Solver/test/NavierStokes/ActuatorLineController
993+
run: |
994+
source /opt/intel/oneapi/setvars.sh || true
995+
mpiexec -n 64 ./horses3d.ns ActuatorLineController.control
996+
if: '!cancelled()'
997+
950998
########################################################################
951999
####### PARTICLES ########
9521000
########################################################################

NOTICE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# NOTICE
2+
3+
This project is licensed under the MIT License. A copy of the MIT License can be found in [LICENSE](LICENSE.md).
4+
5+
---------------------------------------------------------------------------
6+
7+
The following file contains code that is a derivative of software developed by the National Renewable Energy Laboratory for the OpenFAST project:
8+
9+
- [ControllerInterface.f90](./Solver/src/libs/sources/ControllerInterface.f90)
10+
11+
The original work is licensed under the Apache License, Version 2.0. A copy of the Apache License 2.0 can be found in the file [LICENSE-APACHE-2.0.md](./thirdparty/LICENSE-APACHE-2.0.md).
12+
13+
Original Work Copyright (C) 2013-2016 National Renewable Energy Laboratory.
14+
15+
---------------------------------------------------------------------------

Solver/Makefile.in

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,12 @@ ifeq ($(WITH_HDF5),YES)
214214
else
215215
$(error option WITH_HDF5 = YES requires defining path to HDF5 with HDF5_DIR)
216216
endif
217-
endif
217+
endif
218+
219+
##########################
220+
## Link DL ##
221+
##########################
222+
LIBS += -ldl
218223

219224
##########################################
220225
## Select HORSES libraries ##

Solver/configure

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ TEST_CASES="./Euler/BoxAroundCircle \
7979
./NavierStokes/ActuatorLineInterpolation \
8080
./NavierStokes/ActuatorLineProjection \
8181
./NavierStokes/Cylinder_AdaptiveTimeStep_pAdaptationRL \
82+
./NavierStokes/ABLBoundaryMapping \
83+
./NavierStokes/ActuatorLineController \
8284
./IncompressibleNS/Convergence \
8385
./IncompressibleNS/Kovasznay \
8486
./IncompressibleNS/TaylorGreen \

0 commit comments

Comments
 (0)