Skip to content

Commit 2c3b247

Browse files
hmarbonahmarbona
authored
Merge pull request #265 from hmarbona/master - MLRK
Add MLRK Time scheme , expand pAdaptation, and Fix LES bug in multiphase. Parallel Debug Mode tested outside Github
2 parents 69ab733 + c9f4f65 commit 2c3b247

25 files changed

Lines changed: 2269 additions & 348 deletions

File tree

‎Solver/src/AcousticSolver/SpatialDiscretization.f90‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ end subroutine Finalize_SpaceAndTimeMethods
111111
!
112112
!////////////////////////////////////////////////////////////////////////
113113
!
114-
SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, element_mask)
114+
SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, element_mask, Level)
115115
IMPLICIT NONE
116116
!
117117
! ---------
@@ -124,6 +124,7 @@ SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
124124
integer, intent(in) :: mode
125125
logical, intent(in), optional :: HO_Elements
126126
logical, intent(in), optional :: element_mask(:)
127+
integer, intent(in), optional :: Level
127128
!
128129
! ---------------
129130
! Local variables
@@ -167,7 +168,7 @@ END SUBROUTINE ComputeTimeDerivative
167168
! This routine computes the time derivative element by element, without considering the Riemann Solvers
168169
! This is useful for estimating the isolated truncation error
169170
!
170-
SUBROUTINE ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elements, element_mask)
171+
SUBROUTINE ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elements, element_mask, Level)
171172
IMPLICIT NONE
172173
!
173174
! ---------
@@ -179,7 +180,8 @@ SUBROUTINE ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elemen
179180
REAL(KIND=RP) :: time
180181
integer, intent(in) :: mode
181182
logical, intent(in), optional :: HO_Elements
182-
logical, intent(in), optional :: element_mask(:)
183+
logical, intent(in), optional :: element_mask(:)
184+
integer, intent(in), optional :: Level
183185
!
184186
! ---------------
185187
! Local variables

‎Solver/src/CahnHilliardSolver/SpatialDiscretization.f90‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ end subroutine Initialize_SpaceAndTimeMethods
118118
!
119119
!////////////////////////////////////////////////////////////////////////
120120
!
121-
subroutine ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, element_mask)
121+
subroutine ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, element_mask, Level)
122122
IMPLICIT NONE
123123
!
124124
! ---------
@@ -131,6 +131,7 @@ subroutine ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
131131
integer, intent(in) :: mode
132132
logical, intent(in), optional :: HO_Elements
133133
logical, intent(in), optional :: element_mask(:)
134+
integer, intent(in), optional :: Level
134135
!
135136
! ---------------
136137
! Local variables
@@ -372,7 +373,7 @@ subroutine ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
372373

373374
end subroutine ComputeTimeDerivative
374375

375-
subroutine ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elements, element_mask)
376+
subroutine ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elements, element_mask, Level)
376377
IMPLICIT NONE
377378
!
378379
! ---------
@@ -384,7 +385,8 @@ subroutine ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elemen
384385
REAL(KIND=RP) :: time
385386
integer, intent(in) :: mode
386387
logical, intent(in), optional :: HO_Elements
387-
logical, intent(in), optional :: element_mask(:)
388+
logical, intent(in), optional :: element_mask(:)
389+
integer, intent(in), optional :: Level
388390

389391
error stop 'ComputeTimeDerivativeIsolated not implemented for Cahn-Hilliard'
390392
end subroutine ComputeTimeDerivativeIsolated

‎Solver/src/IncompressibleNSSolver/SpatialDiscretization.f90‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ end subroutine Finalize_SpaceAndTimeMethods
173173
!
174174
!////////////////////////////////////////////////////////////////////////
175175
!
176-
SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, element_mask)
176+
SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, element_mask, Level)
177177
IMPLICIT NONE
178178
!
179179
! ---------
@@ -186,6 +186,7 @@ SUBROUTINE ComputeTimeDerivative( mesh, particles, time, mode, HO_Elements, elem
186186
integer, intent(in) :: mode
187187
logical, intent(in), optional :: HO_Elements
188188
logical, intent(in), optional :: element_mask(:)
189+
integer, intent(in), optional :: Level
189190
!
190191
! ---------------
191192
! Local variables
@@ -263,7 +264,7 @@ END SUBROUTINE ComputeTimeDerivative
263264
! This routine computes the time derivative element by element, without considering the Riemann Solvers
264265
! This is useful for estimating the isolated truncation error
265266
!
266-
SUBROUTINE ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elements, element_mask)
267+
SUBROUTINE ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elements, element_mask, Level)
267268
use EllipticDiscretizationClass
268269
IMPLICIT NONE
269270
!
@@ -277,6 +278,7 @@ SUBROUTINE ComputeTimeDerivativeIsolated( mesh, particles, time, mode, HO_Elemen
277278
integer, intent(in) :: mode
278279
logical, intent(in), optional :: HO_Elements
279280
logical, intent(in), optional :: element_mask(:)
281+
integer, intent(in), optional :: Level
280282
!
281283
! ---------------
282284
! Local variables

0 commit comments

Comments
 (0)