Skip to content

Introduce Sampling into monitor, Debug MLRK #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmarbona merged 5 commits into from
Jul 22, 2025
Merged

Introduce Sampling into monitor, Debug MLRK #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08d54da
Add Plane, Surface, and Node Sampling Monitor (PostProcess); Add Frin…
Jul 18, 2025
3126d57
Debug SamplingMonitor and MLRK-NS
Jul 21, 2025
0cdd8a6
Debug SamplingMonitor
Jul 21, 2025
8491453
Debug SamplingMonitor
Jul 21, 2025
4331ca3
Debug SamplingMonitor
Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Solver/src/AcousticSolver/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ PROGRAM HORSES3DMainCAA
! Integrate in time
! -----------------
!
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
!
! ------------------------------------------
! Finish measuring the total simulation time
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/CahnHilliardSolver/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ PROGRAM HORSES3DMainCH
! Integrate in time
! -----------------
!
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
!
! ------------------------------------------
! Finish measuring the total simulation time
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/IncompressibleNSSolver/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ PROGRAM HORSES3DMainiNS
! Integrate in time
! -----------------
!
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
!
! ----------------------------------
! Export particles to VTK (temporal)
Expand Down
12 changes: 7 additions & 5 deletions Solver/src/MultiphaseSolver/SpatialDiscretization.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,17 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
end select

use_non_constant_speed_of_sound = controlVariables % ContainsKey(FLUID1_COMPRESSIBILITY_KEY)

call CHDiscretization % Construct(controlVariables, ELLIPTIC_CH)
call CHDiscretization % Describe

if ( .not. MPI_Process % isRoot ) return

if(use_non_constant_speed_of_sound) then
write(STD_OUT,'(A)') " Implementing artificial compressibility with a non-constant speed of sound in each phase"
else
write(STD_OUT,'(A)') " Implementing artificial compressibility with a constant speed of sound in each phase"
write(STD_OUT,'(A)') " Implementing artificial compressibility with a constant ACM factor in each phase"
endif

call CHDiscretization % Construct(controlVariables, ELLIPTIC_CH)
call CHDiscretization % Describe


end if

Expand Down
2 changes: 1 addition & 1 deletion Solver/src/MultiphaseSolver/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ PROGRAM HORSES3DMainMU
! Integrate in time
! -----------------
!
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
!
! ----------------------------------
! Export particles to VTK (temporal)
Expand Down
8 changes: 2 additions & 6 deletions Solver/src/NavierStokesSolver/SpatialDiscretization.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
! Local variables
! ---------------
!
INTEGER :: k, locLevel
INTEGER :: k
logical :: HOElements

if (present(HO_Elements)) then
Expand Down Expand Up @@ -308,7 +308,7 @@ SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
if (present(Level)) then
call TimeDerivative_ComputeQDotMLRK(mesh = mesh , &
particles = particles, &
t = time, Level=locLevel)
t = time, Level=Level)
else
call TimeDerivative_ComputeQDot(mesh = mesh , &
particles = particles, &
Expand Down Expand Up @@ -713,10 +713,6 @@ subroutine TimeDerivative_ComputeQDotMLRK( mesh , particles, t, Level)
locLevel = Level
else
locLevel = 1

if (.not.allocated(mesh % MLRK % MLIter)) then
call mesh % MLRK % construct(mesh, 1) ! default 1 level
end if
end if

associate ( MLRK => mesh % MLRK)
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/NavierStokesSolver/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ PROGRAM HORSES3DMainNS
! Integrate in time
! -----------------
!
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
!
! ------------------------------------------
! Finish measuring the total simulation time
Expand Down
2 changes: 1 addition & 1 deletion Solver/src/NavierStokesSolverRANS/main.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ PROGRAM HORSES3DMainNSSA
! Integrate in time
! -----------------
!
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
!
! ------------------------------------------
! Finish measuring the total simulation time
Expand Down
10 changes: 7 additions & 3 deletions Solver/src/libs/discretization/DGSEMClass.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Module DGSEMClass
use SpallartAlmarasTurbulence , only: Spalart_Almaras_t
#endif
use MonitorsClass
use Samplings
use ParticlesClass
use Physics
use FluidData
Expand All @@ -50,6 +51,7 @@ Module DGSEMClass
TYPE(HexMesh) :: mesh
LOGICAL :: ManufacturedSol = .FALSE. ! Use manufactured solutions? default .FALSE.
type(Monitor_t) :: monitors
type(Sampling_t) :: samplings
#if defined(NAVIERSTOKES) && (!(SPALARTALMARAS))
type(FWHClass) :: fwh
#endif
Expand Down Expand Up @@ -432,11 +434,12 @@ SUBROUTINE ConstructDGSem( self, meshFileName_, controlVariables, &
END IF
#endif
!
! ------------------
! Build the monitors
! ------------------
! --------------------------------
! Build the monitors and samplings
! --------------------------------
!
call self % monitors % construct (self % mesh, controlVariables)
call self % samplings % construct (self % mesh, controlVariables)
!
! ------------------
! Build the FWH general class
Expand Down Expand Up @@ -483,6 +486,7 @@ SUBROUTINE DestructDGSem( self )
CALL self % mesh % destruct

call self % monitors % destruct
call self % samplings % destruct

#if defined(NAVIERSTOKES) && (!(SPALARTALMARAS))
IF (flowIsNavierStokes) call self % fwh % destruct
Expand Down
40 changes: 35 additions & 5 deletions Solver/src/libs/monitors/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ LIBOBJS_NS = ./build_ns/MonitorDefinitions.o \
./build_ns/VolumeMonitor.o \
./build_ns/LoadBalancingMonitor.o \
./build_ns/Monitors.o \
./build_ns/SamplingOperator.o \
./build_ns/SurfaceSampling.o \
./build_ns/PlaneSampling.o \
./build_ns/SpatialMeanNode.o \
./build_ns/Samplings.o \
./build_ns/FWHDefinitions.o \
./build_ns/FWHObseverClass.o \
./build_ns/FWHGeneralClass.o
Expand All @@ -33,7 +38,12 @@ LIBOBJS_NSSA = ./build_nssa/MonitorDefinitions.o \
./build_nssa/SurfaceMonitor.o \
./build_nssa/VolumeMonitor.o \
./build_nssa/LoadBalancingMonitor.o \
./build_nssa/Monitors.o
./build_nssa/Monitors.o \
./build_nssa/SamplingOperator.o \
./build_nssa/SurfaceSampling.o \
./build_nssa/PlaneSampling.o \
./build_nssa/SpatialMeanNode.o \
./build_nssa/Samplings.o

LIBOBJS_iNS = ./build_ins/MonitorDefinitions.o \
./build_ins/Probe.o \
Expand All @@ -44,7 +54,12 @@ LIBOBJS_iNS = ./build_ins/MonitorDefinitions.o \
./build_ins/SurfaceMonitor.o \
./build_ins/VolumeMonitor.o \
./build_ins/LoadBalancingMonitor.o \
./build_ins/Monitors.o
./build_ins/Monitors.o \
./build_ins/SamplingOperator.o \
./build_ins/SurfaceSampling.o \
./build_ins/PlaneSampling.o \
./build_ins/SpatialMeanNode.o \
./build_ins/Samplings.o

LIBOBJS_CH = ./build_ch/MonitorDefinitions.o \
./build_ch/Probe.o\
Expand All @@ -55,7 +70,12 @@ LIBOBJS_CH = ./build_ch/MonitorDefinitions.o \
./build_ch/SurfaceMonitor.o \
./build_ch/VolumeMonitor.o \
./build_ch/LoadBalancingMonitor.o \
./build_ch/Monitors.o
./build_ch/Monitors.o \
./build_ch/SamplingOperator.o \
./build_ch/SurfaceSampling.o \
./build_ch/PlaneSampling.o \
./build_ch/SpatialMeanNode.o \
./build_ch/Samplings.o

LIBOBJS_MU = ./build_mu/MonitorDefinitions.o \
./build_mu/Probe.o\
Expand All @@ -66,7 +86,12 @@ LIBOBJS_MU = ./build_mu/MonitorDefinitions.o \
./build_mu/SurfaceMonitor.o \
./build_mu/VolumeMonitor.o \
./build_mu/LoadBalancingMonitor.o \
./build_mu/Monitors.o
./build_mu/Monitors.o \
./build_mu/SamplingOperator.o \
./build_mu/SurfaceSampling.o \
./build_mu/PlaneSampling.o \
./build_mu/SpatialMeanNode.o \
./build_mu/Samplings.o

LIBOBJS_CAA = ./build_caa/MonitorDefinitions.o \
./build_caa/Probe.o\
Expand All @@ -77,7 +102,12 @@ LIBOBJS_CAA = ./build_caa/MonitorDefinitions.o \
./build_caa/SurfaceMonitor.o \
./build_caa/VolumeMonitor.o \
./build_caa/LoadBalancingMonitor.o \
./build_caa/Monitors.o
./build_caa/Monitors.o \
./build_caa/SamplingOperator.o \
./build_caa/SurfaceSampling.o \
./build_caa/PlaneSampling.o \
./build_caa/SpatialMeanNode.o \
./build_caa/Samplings.o

LIB = monitors

Expand Down
Loading
Loading