Merge pull request #1 from rafmudaf/noise

Thanks for doing that! It works now.

modules/aerodyn/CMakeLists.txt

@@ -13,19 +13,81 @@
 # 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})
+
+# 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)
 
 # AeroDyn lib
 set(AD_LIBS_SOURCES
@@ -41,7 +103,6 @@ set(AD_LIBS_SOURCES
 
   # Autogenerated files
   AeroDyn_Types.f90
-  AeroAcoustics_Types.f90
   AirfoilInfo_Types.f90
   BEMT_Types.f90
   DBEMT_Types.f90

modules/aerodyn/src/AeroAcoustics/TNO/TNOMods.f90

@@ -1,6 +1,6 @@
 MODULE TNOConstants
 
-USE Precision
+use ISO_FORTRAN_ENV
 
 REAL (kind=4),PARAMETER :: Cnuk = 5.5
 REAL (kind=4),PARAMETER :: kappa = 0.41
@@ -19,7 +19,7 @@ END MODULE TNOConstants
 
 MODULE Atmosphere
 
-USE Precision
+use ISO_FORTRAN_ENV
 
 !atmosphere constants
 REAL (kind=4) nu
@@ -33,7 +33,7 @@ END MODULE Atmosphere
 
 MODULE Wavenumber
 
-USE Precision
+use ISO_FORTRAN_ENV
 
 REAL (kind=4)           :: k
 REAL (kind=4)           :: k1
@@ -45,7 +45,7 @@ END MODULE Wavenumber
 
 MODULE BLParams
 
-USE Precision
+use ISO_FORTRAN_ENV
 REAL (kind=4)           :: d99(2)
 REAL (kind=4)           :: Cf(2)
 REAL (kind=4)           :: d_star(2)
@@ -55,7 +55,7 @@ END MODULE BLParams
 
 MODULE AirfoilParams
 
-USE Precision
+use ISO_FORTRAN_ENV
 
 CHARACTER*128         :: airfoil
 REAL (kind=4)           :: aofa,a_chord,Mach,Re
@@ -70,7 +70,7 @@ END MODULE AirfoilParams
 
 MODULE Third_Octave_Bands
 
-USE Precision
+use ISO_FORTRAN_ENV
 
 INTEGER (4),PARAMETER :: NumBands = 34
 REAL (kind=4),PARAMETER :: Third_Octave(NumBands) = (/10.,12.5,16.,20.,25.,31.5,40.,50.,63.,80.,	&

modules/aerodyn/src/AeroAcoustics/TNO/int1.f90

@@ -2,7 +2,7 @@ FUNCTION int1(x2)
 
 USE Atmosphere
 USE BLParams
-USE Precision
+use ISO_FORTRAN_ENV
 USE TNOConstants
 USE Wavenumber
 USE AirfoilParams

modules/aerodyn/src/AeroAcoustics/TNO/pressure.f90

@@ -3,7 +3,7 @@ FUNCTION Pressure(k1_in)
     USE Atmosphere
     USE AirfoilParams
     USE BLParams
-    USE Precision
+    use ISO_FORTRAN_ENV
     USE TNOConstants
     USE Wavenumber