IBM + Kdtree DEBUG mode fix

Solver/Makefile.in

@@ -460,4 +460,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/CahnHilliardSolver/Makefile

@@ -90,4 +90,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/CahnHilliardSolver/SpatialDiscretization.f90

@@ -950,4 +950,4 @@ subroutine GetPoiseuilleFlow_Face(f)
 
       end subroutine GetPoiseuilleFlow_Face
 
-end module SpatialDiscretization
+end module SpatialDiscretization

Solver/src/CahnHilliardSolver/main.f90

@@ -380,4 +380,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested

Solver/src/IncompressibleNSSolver/Makefile

@@ -90,4 +90,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/IncompressibleNSSolver/SpatialDiscretization.f90

@@ -950,4 +950,4 @@ end subroutine DensityLimiter
 !
 !////////////////////////////////////////////////////////////////////////////////////////
 !
-end module SpatialDiscretization
+end module SpatialDiscretization

Solver/src/IncompressibleNSSolver/main.f90

@@ -380,4 +380,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested

Solver/src/MultiphaseSolver/Makefile

@@ -90,4 +90,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/MultiphaseSolver/SpatialDiscretization.f90

@@ -1509,4 +1509,4 @@ SUBROUTINE ComputeTimeDerivativeIsolated( mesh, particles, time, mode)
 
       end subroutine ComputeTimeDerivativeIsolated
 
-end module SpatialDiscretization
+end module SpatialDiscretization

Solver/src/MultiphaseSolver/main.f90

@@ -380,4 +380,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested

Solver/src/NavierStokesSolver/Makefile

@@ -89,4 +89,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/NavierStokesSolver/SpatialDiscretization.f90

@@ -357,8 +357,10 @@ subroutine TimeDerivative_ComputeQDot( mesh , particles, t)
 !        Local variables
 !        ---------------
 !
-         integer     :: eID , i, j, k, ierr, fID, iFace, iEl, iP 
-         real(kind=RP)  :: mu_smag, delta, Source(NCONS), TurbulentSource(NCONS)
+         integer     :: eID , i, j, k, ierr, fID, iFace, iEl, iP, STLNum, n 
+         real(kind=RP)  :: mu_smag, delta, Source(NCONS), TurbulentSource(NCONS), Q_target(NCONS)
+         real(kind=RP), allocatable :: Source_HO(:,:,:,:)
+         integer,       allocatable :: i_(:), j_(:), k_(:)
 !
 !        ***********************************************
 !        Compute the viscosity at the elements and faces
@@ -606,19 +608,24 @@ subroutine TimeDerivative_ComputeQDot( mesh , particles, t)
 !        Add IBM source term
 !        *********************
          if( mesh% IBM% active ) then
-            if( .not. mesh% IBM% semiImplicit .and. t .gt. 0.0_RP ) then 
-!$omp do schedule(runtime) private(i,j,k,Source)
-               do eID = 1, mesh % no_of_elements  
-                  associate ( e => mesh % elements(eID) ) 
-                  do k = 0, e % Nxyz(3)   ; do j = 0, e % Nxyz(2) ; do i = 0, e % Nxyz(1)
-                     if( e% isInsideBody(i,j,k) ) then
-                        call mesh% IBM% SourceTerm( eID = eID, Q = e % storage % Q(:,i,j,k), Source = Source, wallfunction = .false. )
-                        e % storage % QDot(:,i,j,k) = e % storage % QDot(:,i,j,k) + Source
-                     end if
-                  end do                  ; end do                ; end do
-                  end associate
-               end do
-!$omp end do      
+            if( .not. mesh% IBM% semiImplicit ) then 
+!$omp do schedule(runtime) private(i,j,k,Source,Q_target)
+                  do eID = 1, mesh % no_of_elements  
+                     associate ( e => mesh % elements(eID) ) 
+                     do k = 0, e % Nxyz(3)   ; do j = 0, e % Nxyz(2) ; do i = 0, e % Nxyz(1)
+                        if( e% isInsideBody(i,j,k) ) then
+                           if( mesh% IBM% stl(e% STL(i,j,k))% move ) then 
+                              Q_target = mesh% IBM% MaskVelocity( e% storage% Q(:,i,j,k), NCONS, e% STL(i,j,k), e% geom% x(:,i,j,k), t )
+                              call mesh% IBM% SourceTerm( eID = eID, Q = e % storage % Q(:,i,j,k), Q_target = Q_target, Source = Source, wallfunction = .false. )
+                           else 
+                              call mesh% IBM% SourceTerm( eID = eID, Q = e % storage % Q(:,i,j,k), Source = Source, wallfunction = .false. )
+                           end if 
+                           e % storage % QDot(:,i,j,k) = e % storage % QDot(:,i,j,k) + Source
+                        end if
+                     end do                  ; end do                ; end do
+                     end associate
+                  end do
+!$omp end do       
                if( mesh% IBM% Wallfunction ) then
 !$omp single
                   call mesh% IBM% GetBandRegionStates( mesh% elements )
@@ -1327,4 +1334,4 @@ SUBROUTINE computeBoundaryFlux(f, time, mesh)
 
       end subroutine computeBoundaryFlux
 
-end module SpatialDiscretization
+end module SpatialDiscretization

Solver/src/NavierStokesSolver/main.f90

@@ -396,4 +396,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested

Solver/src/NavierStokesSolverRANS/Makefile

@@ -89,4 +89,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/NavierStokesSolverRANS/main.f90

@@ -395,4 +395,4 @@ subroutine CheckIfTheVersionIsRequested
             end if
          end do
 
-      end subroutine CheckIfTheVersionIsRequested
+      end subroutine CheckIfTheVersionIsRequested

Solver/src/addons/extractgeometry/ConstructMeshAndSpectralBasis.f90

@@ -133,4 +133,4 @@ subroutine ConstructMeshAndSpectralBasis(meshFile, solutionFile, ControlFile, me
 
       end subroutine ConstructMeshAndSpectralBasis
 
-end module ConstructMeshAndSpectralBasis_MOD
+end module ConstructMeshAndSpectralBasis_MOD

Solver/src/addons/extractgeometry/GeometryClass.f90

@@ -313,4 +313,4 @@ subroutine Cube_Describe(self)
 
    end subroutine Cube_Describe
 
-end module GeometryClass
+end module GeometryClass

Solver/src/addons/extractgeometry/Makefile

@@ -86,4 +86,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/addons/extractgeometry/getInputData.f90

@@ -118,4 +118,4 @@ subroutine getInputData(controlVariables)
 
       end subroutine getInputData
 
-end module getInputData_MOD
+end module getInputData_MOD

Solver/src/addons/extractgeometry/main.f90

@@ -48,4 +48,4 @@ program ExtractGeometry
    call MPI_Process % Close
 
 
-end program ExtractGeometry
+end program ExtractGeometry

Solver/src/addons/horses2tecplot/Makefile

@@ -95,4 +95,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/addons/horses2tecplot/Mesh2Plt.f90

@@ -56,4 +56,4 @@ subroutine Mesh2Plt(meshFile)
 
       end subroutine Mesh2Plt
 
-end module Mesh2PltModule
+end module Mesh2PltModule

Solver/src/addons/horses2tecplot/OutputVariables.f90

@@ -955,4 +955,4 @@ integer function getNoOfCommas(input_line)
          end do
 
       end function getNoOfCommas
-end module OutputVariables
+end module OutputVariables

Solver/src/addons/horses2tecplot/ProlongMeshAndSolution.f90

@@ -255,4 +255,4 @@ subroutine InterpolateFaces(N,spAxi,spAeta,spAzeta,x,face1,face2,face3,face4,fac
 
       end subroutine InterpolateFaces
 
-end module ProlongMeshAndSolution
+end module ProlongMeshAndSolution

Solver/src/addons/horses2tecplot/Solution2Plt.f90

@@ -1071,4 +1071,4 @@ character(len=LINE_LENGTH) function getFormat()
 
       end function getFormat
 
-end module Solution2PltModule
+end module Solution2PltModule

Solver/src/addons/horses2tecplot/Solution2VtkHdf.f90

@@ -517,4 +517,4 @@ function get_connectivities(elemType, Nout) result(conn)
 
    end function get_connectivities
 
-end module Solution2VtkHdfModule
+end module Solution2VtkHdfModule

Solver/src/addons/horses2tecplot/Stats2Plt.f90

@@ -544,4 +544,4 @@ character(len=LINE_LENGTH) function getFormat()
 
       end function getFormat
 
-end module Stats2PltModule
+end module Stats2PltModule

Solver/src/addons/horses2tecplot/Storage.f90

@@ -566,4 +566,4 @@ Subroutine getNVARS(originalDim, useFlowEq)
       end select
 
       End Subroutine getNVARS
-end module Storage
+end module Storage

Solver/src/addons/horses2tecplot/getTask.f90

@@ -685,4 +685,4 @@ Subroutine getBasis(basisPresent, basisName, fixedOrder, basis)
 !
       End Subroutine getBasis
 !
-end module getTask
+end module getTask

Solver/src/addons/horses2tecplot/main.f90

@@ -118,4 +118,4 @@ program horses2plt
 
    call MPI_Process % Close
 
-end program horses2plt
+end program horses2plt

Solver/src/addons/horses2tecplot/sharedSpectralBasis.f90

@@ -74,4 +74,4 @@ subroutine addNewInterpolationMatrix( Tset_, Nold, spAold, Nnew, xiNew)
 
       end subroutine addNewInterpolationMatrix
 
-end module SharedSpectralBasis
+end module SharedSpectralBasis

Solver/src/addons/mergeStatistics/Makefile

@@ -86,4 +86,4 @@ header: FORCE
 	@echo
 
 ## Dummy target to make sure a rule is executed
-FORCE:
+FORCE:

Solver/src/addons/mergeStatistics/StatsAveragingModule.f90

@@ -248,4 +248,4 @@ subroutine Mesh_SaveStatistics(self, name)
          call SealSolutionFile(trim(name))
 
       end subroutine Mesh_SaveStatistics
-end module StatsAveragingModule
+end module StatsAveragingModule

Solver/src/addons/mergeStatistics/getTaskModule.f90

@@ -153,4 +153,4 @@ subroutine getTask(num_of_statFiles, fileNames, weights, initial_iteration, file
          end do
 
       end subroutine getTask
-end module getTaskModule
+end module getTaskModule

Solver/src/addons/mergeStatistics/main.f90

@@ -60,4 +60,4 @@ program MergeStatistics
 
    call MPI_Process % Close
 
-end program MergeStatistics
+end program MergeStatistics

Solver/src/addons/tools/ConverStats.f90

@@ -102,4 +102,4 @@ Subroutine ConvertStatsForRestart(controlVariables)
          call SealSolutionFile(trim(restartFileName))
 
     End Subroutine ConvertStatsForRestart
-End Module ConverStats
+End Module ConverStats

Solver/src/addons/tools/FWHPostProc.f90

@@ -179,4 +179,4 @@ Subroutine LoadSingleFile(fileName, mesh, fwh, actualIter, hasGradients)
 !
     End Subroutine LoadSingleFile
 
-End Module FWHPostProc
+End Module FWHPostProc

Solver/src/addons/tools/FWHPreSurface.f90

@@ -976,4 +976,4 @@ End Function getElementSize
 !
 !////////////////////////////////////////////////////////////////////////
 !
-End Module FWHPreSurface
+End Module FWHPreSurface

Solver/src/addons/tools/FWHTools.f90

@@ -187,4 +187,4 @@ subroutine DisplaySimulationStatistics(iter,mesh)
 
       end subroutine DisplaySimulationStatistics
 
-End Module FWHTools
+End Module FWHTools