Skip to content

Commit be6d065

Browse files
hmarbonahmarbona
authored
Merge pull request #266 from hmarbona/master
Introduce Sampling into monitor, Debug MLRK
2 parents 2c3b247 + 4331ca3 commit be6d065

19 files changed

Lines changed: 3266 additions & 71 deletions

File tree

‎Solver/src/AcousticSolver/main.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ PROGRAM HORSES3DMainCAA
114114
! Integrate in time
115115
! -----------------
116116
!
117-
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
117+
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
118118
!
119119
! ------------------------------------------
120120
! Finish measuring the total simulation time

‎Solver/src/CahnHilliardSolver/main.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ PROGRAM HORSES3DMainCH
122122
! Integrate in time
123123
! -----------------
124124
!
125-
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
125+
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
126126
!
127127
! ------------------------------------------
128128
! Finish measuring the total simulation time

‎Solver/src/IncompressibleNSSolver/main.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ PROGRAM HORSES3DMainiNS
115115
! Integrate in time
116116
! -----------------
117117
!
118-
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
118+
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
119119
!
120120
! ----------------------------------
121121
! Export particles to VTK (temporal)

‎Solver/src/MultiphaseSolver/SpatialDiscretization.f90‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,17 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
192192
end select
193193

194194
use_non_constant_speed_of_sound = controlVariables % ContainsKey(FLUID1_COMPRESSIBILITY_KEY)
195+
196+
call CHDiscretization % Construct(controlVariables, ELLIPTIC_CH)
197+
call CHDiscretization % Describe
198+
199+
if ( .not. MPI_Process % isRoot ) return
200+
195201
if(use_non_constant_speed_of_sound) then
196202
write(STD_OUT,'(A)') " Implementing artificial compressibility with a non-constant speed of sound in each phase"
197203
else
198-
write(STD_OUT,'(A)') " Implementing artificial compressibility with a constant speed of sound in each phase"
204+
write(STD_OUT,'(A)') " Implementing artificial compressibility with a constant ACM factor in each phase"
199205
endif
200-
201-
call CHDiscretization % Construct(controlVariables, ELLIPTIC_CH)
202-
call CHDiscretization % Describe
203-
204206

205207
end if
206208

‎Solver/src/MultiphaseSolver/main.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ PROGRAM HORSES3DMainMU
115115
! Integrate in time
116116
! -----------------
117117
!
118-
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
118+
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
119119
!
120120
! ----------------------------------
121121
! Export particles to VTK (temporal)

‎Solver/src/NavierStokesSolver/SpatialDiscretization.f90‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
243243
! Local variables
244244
! ---------------
245245
!
246-
INTEGER :: k, locLevel
246+
INTEGER :: k
247247
logical :: HOElements
248248

249249
if (present(HO_Elements)) then
@@ -308,7 +308,7 @@ SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
308308
if (present(Level)) then
309309
call TimeDerivative_ComputeQDotMLRK(mesh = mesh , &
310310
particles = particles, &
311-
t = time, Level=locLevel)
311+
t = time, Level=Level)
312312
else
313313
call TimeDerivative_ComputeQDot(mesh = mesh , &
314314
particles = particles, &
@@ -713,10 +713,6 @@ subroutine TimeDerivative_ComputeQDotMLRK( mesh , particles, t, Level)
713713
locLevel = Level
714714
else
715715
locLevel = 1
716-
717-
if (.not.allocated(mesh % MLRK % MLIter)) then
718-
call mesh % MLRK % construct(mesh, 1) ! default 1 level
719-
end if
720716
end if
721717

722718
associate ( MLRK => mesh % MLRK)

‎Solver/src/NavierStokesSolver/main.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ PROGRAM HORSES3DMainNS
131131
! Integrate in time
132132
! -----------------
133133
!
134-
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
134+
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
135135
!
136136
! ------------------------------------------
137137
! Finish measuring the total simulation time

‎Solver/src/NavierStokesSolverRANS/main.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ PROGRAM HORSES3DMainNSSA
131131
! Integrate in time
132132
! -----------------
133133
!
134-
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
134+
CALL timeIntegrator % integrate(sem, controlVariables, sem % monitors, sem % samplings, ComputeTimeDerivative, ComputeTimeDerivativeIsolated)
135135
!
136136
! ------------------------------------------
137137
! Finish measuring the total simulation time

‎Solver/src/libs/discretization/DGSEMClass.f90‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Module DGSEMClass
2525
use SpallartAlmarasTurbulence , only: Spalart_Almaras_t
2626
#endif
2727
use MonitorsClass
28+
use Samplings
2829
use ParticlesClass
2930
use Physics
3031
use FluidData
@@ -50,6 +51,7 @@ Module DGSEMClass
5051
TYPE(HexMesh) :: mesh
5152
LOGICAL :: ManufacturedSol = .FALSE. ! Use manufactured solutions? default .FALSE.
5253
type(Monitor_t) :: monitors
54+
type(Sampling_t) :: samplings
5355
#if defined(NAVIERSTOKES) && (!(SPALARTALMARAS))
5456
type(FWHClass) :: fwh
5557
#endif
@@ -432,11 +434,12 @@ SUBROUTINE ConstructDGSem( self, meshFileName_, controlVariables, &
432434
END IF
433435
#endif
434436
!
435-
! ------------------
436-
! Build the monitors
437-
! ------------------
437+
! --------------------------------
438+
! Build the monitors and samplings
439+
! --------------------------------
438440
!
439441
call self % monitors % construct (self % mesh, controlVariables)
442+
call self % samplings % construct (self % mesh, controlVariables)
440443
!
441444
! ------------------
442445
! Build the FWH general class
@@ -483,6 +486,7 @@ SUBROUTINE DestructDGSem( self )
483486
CALL self % mesh % destruct
484487

485488
call self % monitors % destruct
489+
call self % samplings % destruct
486490

487491
#if defined(NAVIERSTOKES) && (!(SPALARTALMARAS))
488492
IF (flowIsNavierStokes) call self % fwh % destruct

‎Solver/src/libs/monitors/Makefile‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ LIBOBJS_NS = ./build_ns/MonitorDefinitions.o \
2020
./build_ns/VolumeMonitor.o \
2121
./build_ns/LoadBalancingMonitor.o \
2222
./build_ns/Monitors.o \
23+
./build_ns/SamplingOperator.o \
24+
./build_ns/SurfaceSampling.o \
25+
./build_ns/PlaneSampling.o \
26+
./build_ns/SpatialMeanNode.o \
27+
./build_ns/Samplings.o \
2328
./build_ns/FWHDefinitions.o \
2429
./build_ns/FWHObseverClass.o \
2530
./build_ns/FWHGeneralClass.o
@@ -33,7 +38,12 @@ LIBOBJS_NSSA = ./build_nssa/MonitorDefinitions.o \
3338
./build_nssa/SurfaceMonitor.o \
3439
./build_nssa/VolumeMonitor.o \
3540
./build_nssa/LoadBalancingMonitor.o \
36-
./build_nssa/Monitors.o
41+
./build_nssa/Monitors.o \
42+
./build_nssa/SamplingOperator.o \
43+
./build_nssa/SurfaceSampling.o \
44+
./build_nssa/PlaneSampling.o \
45+
./build_nssa/SpatialMeanNode.o \
46+
./build_nssa/Samplings.o
3747

3848
LIBOBJS_iNS = ./build_ins/MonitorDefinitions.o \
3949
./build_ins/Probe.o \
@@ -44,7 +54,12 @@ LIBOBJS_iNS = ./build_ins/MonitorDefinitions.o \
4454
./build_ins/SurfaceMonitor.o \
4555
./build_ins/VolumeMonitor.o \
4656
./build_ins/LoadBalancingMonitor.o \
47-
./build_ins/Monitors.o
57+
./build_ins/Monitors.o \
58+
./build_ins/SamplingOperator.o \
59+
./build_ins/SurfaceSampling.o \
60+
./build_ins/PlaneSampling.o \
61+
./build_ins/SpatialMeanNode.o \
62+
./build_ins/Samplings.o
4863

4964
LIBOBJS_CH = ./build_ch/MonitorDefinitions.o \
5065
./build_ch/Probe.o\
@@ -55,7 +70,12 @@ LIBOBJS_CH = ./build_ch/MonitorDefinitions.o \
5570
./build_ch/SurfaceMonitor.o \
5671
./build_ch/VolumeMonitor.o \
5772
./build_ch/LoadBalancingMonitor.o \
58-
./build_ch/Monitors.o
73+
./build_ch/Monitors.o \
74+
./build_ch/SamplingOperator.o \
75+
./build_ch/SurfaceSampling.o \
76+
./build_ch/PlaneSampling.o \
77+
./build_ch/SpatialMeanNode.o \
78+
./build_ch/Samplings.o
5979

6080
LIBOBJS_MU = ./build_mu/MonitorDefinitions.o \
6181
./build_mu/Probe.o\
@@ -66,7 +86,12 @@ LIBOBJS_MU = ./build_mu/MonitorDefinitions.o \
6686
./build_mu/SurfaceMonitor.o \
6787
./build_mu/VolumeMonitor.o \
6888
./build_mu/LoadBalancingMonitor.o \
69-
./build_mu/Monitors.o
89+
./build_mu/Monitors.o \
90+
./build_mu/SamplingOperator.o \
91+
./build_mu/SurfaceSampling.o \
92+
./build_mu/PlaneSampling.o \
93+
./build_mu/SpatialMeanNode.o \
94+
./build_mu/Samplings.o
7095

7196
LIBOBJS_CAA = ./build_caa/MonitorDefinitions.o \
7297
./build_caa/Probe.o\
@@ -77,7 +102,12 @@ LIBOBJS_CAA = ./build_caa/MonitorDefinitions.o \
77102
./build_caa/SurfaceMonitor.o \
78103
./build_caa/VolumeMonitor.o \
79104
./build_caa/LoadBalancingMonitor.o \
80-
./build_caa/Monitors.o
105+
./build_caa/Monitors.o \
106+
./build_caa/SamplingOperator.o \
107+
./build_caa/SurfaceSampling.o \
108+
./build_caa/PlaneSampling.o \
109+
./build_caa/SpatialMeanNode.o \
110+
./build_caa/Samplings.o
81111

82112
LIB = monitors
83113

0 commit comments

Comments
 (0)