Merge branch 'loganoz:master' into master

Author: hmarbona

.github/workflows/CI_parallel.yml

@@ -967,6 +967,54 @@ jobs:
 
 
 
+#
+# 34) Atmospheric Boundary Layer (ABL) mapping to boundary
+# --------------------------------------------
+
+      - name: Build ABL_BoundaryMapping
+        working-directory: ./Solver/test/NavierStokes/ABLBoundaryMapping/SETUP
+        run: |
+          source /opt/intel/oneapi/setvars.sh || true
+          TEST_HOME_DIR=$(grep '^HOME_DIR=' Makefile | cut -d'=' -f2)
+          rm Makefile
+          wget https://people.math.sc.edu/Burkardt/f_src/geompack2/geompack2.f90
+          cp -r ../../../../../utils/ABLBoundaryMapping/SETUP/* .
+          mv Makefile.iABL Makefile
+          cp -r ../../../../../utils/ABLBoundaryMapping/PRECURSOR ../
+          sed -i "s|^HOME_DIR=.*|HOME_DIR=$TEST_HOME_DIR|" Makefile
+          awk '/END SUBROUTINE UserDefinedFinalize/{system("cat testchecks"); print ""; print; next}1' ProblemFile.f90 > temp && mv temp ProblemFile.f90
+          make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_MKL=${{matrix.mkl}} WITH_HDF5=${{matrix.hdf5}}
+        if: '!cancelled()'
+
+      - name: Run ABL_BoundaryMapping
+        working-directory: ./Solver/test/NavierStokes/ABLBoundaryMapping
+        run: |
+          source /opt/intel/oneapi/setvars.sh || true
+          mpiexec -n 64 ./horses3d.ns ABLBoundaryMapping.control
+        if: '!cancelled()'
+      
+#
+# 35) Actuator Line (AL) external controller module
+# --------------------------------------------
+      - name: Build ActuatorLineController
+        working-directory: ./Solver/test/NavierStokes/ActuatorLineController/SETUP
+        run: |
+          source /opt/intel/oneapi/setvars.sh || true
+          make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}} COMM=${{matrix.comm}} ENABLE_THREADS=${{matrix.enable_threads}} WITH_METIS=YES
+          cd ../ActuatorDef/controller
+          git clone https://github.com/EduardoJane/DRC_Fortran_H3D.git
+          cd DRC_Fortran_H3D/Source
+          make MODE=${{matrix.mode}} COMPILER=${{matrix.compiler}}
+          mv ../DISCON/DISCON_glin64.so ../../
+        if: '!cancelled()'
+
+      - name: Run ActuatorLineController
+        working-directory: ./Solver/test/NavierStokes/ActuatorLineController
+        run: |
+          source /opt/intel/oneapi/setvars.sh || true
+          mpiexec -n 64 ./horses3d.ns ActuatorLineController.control
+        if: '!cancelled()'
+
 ########################################################################
 #######                       PARTICLES                         ########
 ########################################################################

NOTICE.md

@@ -0,0 +1,15 @@
+# NOTICE
+
+This project is licensed under the MIT License. A copy of the MIT License can be found in [LICENSE](LICENSE.md).
+
+---------------------------------------------------------------------------
+
+The following file contains code that is a derivative of software developed by the National Renewable Energy Laboratory for the OpenFAST project:
+
+  - [ControllerInterface.f90](./Solver/src/libs/sources/ControllerInterface.f90)
+
+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).
+
+Original Work Copyright (C) 2013-2016 National Renewable Energy Laboratory.
+
+---------------------------------------------------------------------------

Solver/Makefile.in

@@ -214,7 +214,12 @@ ifeq ($(WITH_HDF5),YES)
   else 
     $(error option WITH_HDF5 = YES requires defining path to HDF5 with HDF5_DIR)
   endif 
-endif 
+endif
+
+##########################
+## 	Link DL         ##
+##########################
+LIBS += -ldl 
 
 ##########################################
 ##  	Select HORSES libraries 	##

Solver/configure

@@ -80,6 +80,8 @@ TEST_CASES="./Euler/BoxAroundCircle \
             ./NavierStokes/ActuatorLineInterpolation \
             ./NavierStokes/ActuatorLineProjection \
             ./NavierStokes/Cylinder_AdaptiveTimeStep_pAdaptationRL \
+            ./NavierStokes/ABLBoundaryMapping \
+            ./NavierStokes/ActuatorLineController \
             ./IncompressibleNS/Convergence \
             ./IncompressibleNS/Kovasznay \
             ./IncompressibleNS/TaylorGreen \