Merge pull request #1 from ebranlard/noise-dev

Noise dev

.gitignore

@@ -40,3 +40,4 @@ vs-build/
 .vscode
 .atom
 .fortls
+tags

Makefile

@@ -21,7 +21,8 @@ else
 	RMDIR=rm -rf
 endif
 BUILD_DIR=build$(suffix)
-TEST_DIR=../noise-test/
+TEST_DIR=../openfast-noise-test/
+CMAKE=cmake
 
 
 
@@ -34,7 +35,7 @@ $(BUILD_DIR):
 
 compile: $(BUILD_DIR)
 	@echo "------------------------------------------------------------"
-	cd $(BUILD_DIR) && cmake $(CMAKE_ARGS) .. && $(MAKE)
+	cd $(BUILD_DIR) && $(CMAKE) $(CMAKE_ARGS) .. && $(MAKE)
 
 clean:
 	cd $(BUILD_DIR) && $(MAKE) clean

modules/aerodyn/CMakeLists.txt

@@ -13,19 +13,109 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# AeroAcoustics
-add_subdirectory(src/AeroAcoustics)
 generate_f90_types(src/AeroAcoustics_Registry.txt AeroAcoustics_Types.f90)
 generate_f90_types(src/AirfoilInfo_Registry.txt AirfoilInfo_Types.f90 -noextrap)
-
-
 generate_f90_types(src/AeroDyn_Registry.txt AeroDyn_Types.f90)
 generate_f90_types(src/BEMT_Registry.txt BEMT_Types.f90)
 generate_f90_types(src/DBEMT_Registry.txt DBEMT_Types.f90)
 generate_f90_types(src/UnsteadyAero_Registry.txt UnsteadyAero_Types.f90)
 
-generate_f90_types(src/AeroDyn_Driver_Registry.txt
-  AeroDyn_Driver_Types.f90 -noextrap)
+generate_f90_types(src/AeroDyn_Driver_Registry.txt AeroDyn_Driver_Types.f90 -noextrap)
+
+# TNO
+set(TNO_SOURCES
+  src/AeroAcoustics/TNO/int1.f90
+  src/AeroAcoustics/TNO/int2.f90
+  src/AeroAcoustics/TNO/TNOMods.f90
+  src/AeroAcoustics/TNO/pressure.f90
+  src/AeroAcoustics/TNO/qk61.f
+)
+add_library(TNO ${TNO_SOURCES})
+
+# TINoise
+set(FULLGUIDATI_SOURCES
+  src/AeroAcoustics/TINoise/CDA0.f90 
+  src/AeroAcoustics/TINoise/CDI0.f90
+  src/AeroAcoustics/TINoise/DEFGEO.f90
+  src/AeroAcoustics/TINoise/DETCP.f90 
+  src/AeroAcoustics/TINoise/DETFIELD.f90
+  src/AeroAcoustics/TINoise/DETSPL.f90
+  src/AeroAcoustics/TINoise/DETSTR.f90
+  src/AeroAcoustics/TINoise/DRM_ACU.f90
+  src/AeroAcoustics/TINoise/DRM_AER.f90
+  src/AeroAcoustics/TINoise/FLAT.f90
+  src/AeroAcoustics/TINoise/FUNCS_LM.f90
+  src/AeroAcoustics/TINoise/HANK0.f90
+  src/AeroAcoustics/TINoise/HANK1.f90
+  src/AeroAcoustics/TINoise/INICON.f90
+  src/AeroAcoustics/TINoise/odeint.f90
+  src/AeroAcoustics/TINoise/PRESOUR.f90
+  src/AeroAcoustics/TINoise/READIN.f90
+  src/AeroAcoustics/TINoise/RHSINT.f90
+  src/AeroAcoustics/TINoise/rkck.f90
+  src/AeroAcoustics/TINoise/rkqs.f90
+  src/AeroAcoustics/TINoise/SETMATA.f90
+  src/AeroAcoustics/TINoise/SETMAT.f90
+  src/AeroAcoustics/TINoise/SETRHSA.f90
+  src/AeroAcoustics/TINoise/SETRHS.f90
+  src/AeroAcoustics/TINoise/SOLSEQA.f90
+  src/AeroAcoustics/TINoise/SOLSEQ.f90
+  src/AeroAcoustics/TINoise/SPL_E0A.f90
+  src/AeroAcoustics/TINoise/SPL_E1A.f90
+  src/AeroAcoustics/TINoise/SPL_EX1.f90
+  src/AeroAcoustics/TINoise/SPL_EX2.f90
+  src/AeroAcoustics/TINoise/SPL_EX3.f90
+  src/AeroAcoustics/TINoise/SPL_EX.f90
+  src/AeroAcoustics/TINoise/SPL_PA.f90
+  src/AeroAcoustics/TINoise/SPL_P.f90
+  src/AeroAcoustics/TINoise/SPL_PPA.f90
+  src/AeroAcoustics/TINoise/SPL_PP.f90
+  src/AeroAcoustics/TINoise/STREAM.f90
+  src/AeroAcoustics/TINoise/TI_Noise.f90
+  src/AeroAcoustics/TINoise/TINoiseMods.f90
+  src/AeroAcoustics/TINoise/WAKE.f90
+)
+add_library(FullGuidati ${FULLGUIDATI_SOURCES})
+
+# Xfoil
+set(Xfoil_SOURCES
+    src/AeroAcoustics/Xfoil/dplot_noise.f 
+    src/AeroAcoustics/Xfoil/get_airfoil_coords.f 
+    src/AeroAcoustics/Xfoil/naca.f  
+    src/AeroAcoustics/Xfoil/plutil_noise.f  
+    src/AeroAcoustics/Xfoil/profil.f  
+    src/AeroAcoustics/Xfoil/sort.f  
+    src/AeroAcoustics/Xfoil/spline.f 
+    src/AeroAcoustics/Xfoil/userio.f 
+    src/AeroAcoustics/Xfoil/xbl.f 
+    src/AeroAcoustics/Xfoil/xblsys.f
+    src/AeroAcoustics/Xfoil/xfoil_noise.f 
+    src/AeroAcoustics/Xfoil/xgdes_noise.f  
+    src/AeroAcoustics/Xfoil/xgeom_noise.f 
+    src/AeroAcoustics/Xfoil/xoper_noise.f  
+    src/AeroAcoustics/Xfoil/xpanel.f
+    src/AeroAcoustics/Xfoil/xsolve.f
+    src/AeroAcoustics/Xfoil/xtcam_noise.f
+    src/AeroAcoustics/Xfoil/xutils.f 
+    src/AeroAcoustics/Xfoil/xfoil_noise_mods.f90 
+    src/AeroAcoustics/Xfoil/XFOIL.INC 
+    src/AeroAcoustics/Xfoil/XBL.INC 
+    src/AeroAcoustics/Xfoil/CIRCLE.INC 
+    src/AeroAcoustics/Xfoil/PINDEX.INC)
+add_library(Xfoil ${Xfoil_SOURCES})
+
+
+# AeroAcoustics
+set(AEROACOUSTIC_SOURCES
+  src/AeroAcoustics/AeroAcoustics.f90
+  src/AeroAcoustics/AeroAcoustics_IO.f90
+
+  AeroAcoustics_Types.f90
+  # this target shouldnt depend on airfoilinfo as this creates a circular reference
+  AirfoilInfo_Types.f90
+)
+add_library(AeroAcoustics ${AEROACOUSTIC_SOURCES})
+target_link_libraries(AeroAcoustics nwtclibs FullGuidati TNO Xfoil)
 
 # AeroDyn lib
 set(AD_LIBS_SOURCES
@@ -41,7 +131,6 @@ set(AD_LIBS_SOURCES
 
   # Autogenerated files
   AeroDyn_Types.f90
-  AeroAcoustics_Types.f90
   AirfoilInfo_Types.f90
   BEMT_Types.f90
   DBEMT_Types.f90
@@ -72,7 +161,7 @@ set(UA_DRIVER_SOURCES
 add_executable(unsteadyaero_driver ${UA_DRIVER_SOURCES})
 target_link_libraries(unsteadyaero_driver aerodynlib nwtclibs versioninfolib ${CMAKE_DL_LIBS})
 
-install(TARGETS unsteadyaero_driver aerodyn_driver aerodynlib AeroAcoustics FullGuidati TNO
+install(TARGETS unsteadyaero_driver aerodyn_driver aerodynlib AeroAcoustics FullGuidati TNO Xfoil
   EXPORT "${CMAKE_PROJECT_NAME}Libraries"
   RUNTIME DESTINATION bin
   LIBRARY DESTINATION lib