Skip to content

Commit

Permalink
Shorten long test cases
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dhueper
Dhueper committed Jan 15, 2025
1 parent 761e0c5 commit 8333338
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion Solver/test/NavierStokes/EnergyConservingTest/EnergyConservingTest.control
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Flow equations = "NS"
mesh file name = "../../TestMeshes/CylinderNSpol3.mesh"
Polynomial order = 5
Number of time steps = 100
Number of time steps = 10
Output Interval = 10
!2D mesh offset direction = y
Convergence tolerance = 1.d-10
Expand Down
24 changes: 12 additions & 12 deletions Solver/test/NavierStokes/EnergyConservingTest/SETUP/ProblemFile.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,18 +552,18 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &
! ------------------------------------------------
!
#if defined(NAVIERSTOKES)
INTEGER :: iterations = 100
INTEGER :: iterations = 10

real(kind=RP), parameter :: residuals(5) = [ 2.4415089739574196E+01_RP, &
8.6843849810808749E+01_RP, &
2.3320718696514724E-11_RP, &
1.0767476753496668E+02_RP, &
7.7066863114976661E+02_RP]
real(kind=RP), parameter :: wake_u = 1.6680552562875707E-14_RP
real(kind=RP), parameter :: cd = 3.5801576759972349E+01_RP
real(kind=RP), parameter :: cl = 7.1731887843551334E-04_RP
real(kind=RP), parameter :: entr_bal = -1.6399730139900661E-15_RP
real(kind=RP), parameter :: entr_rate = -1.3377302251066867E-01_RP
real(kind=RP), parameter :: residuals(5) = [ 8.4536070422136675E+01_RP, &
2.1762123673954497E+02_RP, &
6.4602872675548434E-11_RP, &
4.0133134577655784E+02_RP, &
2.3743041720710371E+03_RP]
real(kind=RP), parameter :: wake_u = -5.3738097464565945E-16_RP
real(kind=RP), parameter :: cd = 6.9581063784598598E+01_RP
real(kind=RP), parameter :: cl = -7.2520052818614289E-04_RP
real(kind=RP), parameter :: entr_bal = -1.5010521152042858E-15_RP
real(kind=RP), parameter :: entr_rate = -2.5103194887975733E-02_RP

!write(STD_OUT,'(A)',advance="no") "["
!do i = 1, 4
Expand Down Expand Up @@ -642,7 +642,7 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &

IF ( sharedManager % numberOfAssertionFailures() == 0 ) THEN
WRITE(6,*) testName, " ... Passed"
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 100 iterations."
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 10 iterations."
ELSE
WRITE(6,*) testName, " ... Failed"
WRITE(6,*) "NOTE: Failure is expected when the max eigenvalue procedure is changed."
Expand Down
2 changes: 1 addition & 1 deletion Solver/test/NavierStokes/EntropyConservingTest/EntropyConservingTest.control
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Flow equations = "NS"
mesh file name = "../../TestMeshes/CylinderNSpol3.mesh"
Polynomial order = 5
Number of time steps = 100
Number of time steps = 10
Output Interval = 10
Convergence tolerance = 1.d-10
cfl = 0.3
Expand Down
24 changes: 12 additions & 12 deletions Solver/test/NavierStokes/EntropyConservingTest/SETUP/ProblemFile.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,18 +552,18 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &
! ------------------------------------------------
!
#if defined(NAVIERSTOKES)
INTEGER :: iterations = 100
INTEGER :: iterations = 10

real(kind=RP), parameter :: residuals(5) = [23.2925417313183_RP, &
87.3787200956217_RP, &
2.313833759899472E-011_RP, &
105.867590056256_RP, &
739.936119108963_RP]
real(kind=RP), parameter :: wake_u = 1.843611830572780E-014_RP
real(kind=RP), parameter :: cd = 3.5895646251699361E+01_RP
real(kind=RP), parameter :: cl = 7.9961239895087743E-04_RP
real(kind=RP), parameter :: entr_bal = -4.755282970387926E-013_RP
real(kind=RP), parameter :: entr_rate = -3.509463377483787E-004_RP
real(kind=RP), parameter :: residuals(5) = [8.2631424496364474E+01_RP, &
2.2430272815501075E+02_RP, &
6.4161760571618557E-11_RP, &
4.1620680221184398E+02_RP, &
2.3047571785589912E+03_RP]
real(kind=RP), parameter :: wake_u = -5.3405562536718216E-16_RP
real(kind=RP), parameter :: cd = 6.9404913210284036E+01_RP
real(kind=RP), parameter :: cl = -6.7689211114085879E-04_RP
real(kind=RP), parameter :: entr_bal = 2.1107188664393733E-15_RP
real(kind=RP), parameter :: entr_rate = -5.3666005706312387E-04_RP

!
N = mesh % elements(1) % Nxyz(1) ! This works here because all the elements have the same order in all directions
Expand Down Expand Up @@ -631,7 +631,7 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &

IF ( sharedManager % numberOfAssertionFailures() == 0 ) THEN
WRITE(6,*) testName, " ... Passed"
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 100 iterations."
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 10 iterations."
ELSE
WRITE(6,*) testName, " ... Failed"
WRITE(6,*) "NOTE: Failure is expected when the max eigenvalue procedure is changed."
Expand Down
18 changes: 9 additions & 9 deletions Solver/test/NavierStokes/TaylorGreenKEPEC_IP/SETUP/ProblemFile.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,14 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &
TYPE(FTAssertionsManager), POINTER :: sharedManager
LOGICAL :: success
integer :: rank
real(kind=RP), parameter :: kinEn = 0.12499744094576197_RP
real(kind=RP), parameter :: kinEnRate = -4.2793777270020350E-004_RP
real(kind=RP), parameter :: enstrophy = 0.37499382750807664_RP
real(kind=RP), parameter :: res(5) = [7.846549575040584E-005_RP, &
0.12839595215106728_RP, &
0.12839595254623606_RP, &
0.24998296113284613_RP, &
0.615977156123756_RP ]
real(kind=RP), parameter :: kinEn = 1.2499872046477421E-01_RP
real(kind=RP), parameter :: kinEnRate = -4.2794492107371625E-04_RP
real(kind=RP), parameter :: enstrophy = 3.7499666432797263E-01_RP
real(kind=RP), parameter :: res(5) = [3.6469242819987200E-05_RP, &
1.2726228936783626E-01_RP, &
1.2726229047731236E-01_RP, &
2.5000215229641615E-01_RP, &
6.2895574553694467E-01_RP ]

CALL initializeSharedAssertionsManager
sharedManager => sharedAssertionsManager()
Expand Down Expand Up @@ -369,7 +369,7 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &

IF ( sharedManager % numberOfAssertionFailures() == 0 ) THEN
WRITE(6,*) testName, " ... Passed"
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 100 iterations."
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 5 iterations."
ELSE
WRITE(6,*) testName, " ... Failed"
WRITE(6,*) "NOTE: Failure is expected when the max eigenvalue procedure is changed."
Expand Down
2 changes: 1 addition & 1 deletion Solver/test/NavierStokes/TaylorGreenKEPEC_IP/TaylorGreenKEPEC_IP.control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ restart file name = "RESULTS/TGV.rst"
solution file name = "RESULTS/TGV.rst"
restart = .false.
Polynomial order = 3
Number of time steps = 10
Number of time steps = 5
Output Interval = 1
Number of plot points = 2
Convergence tolerance = 1.d-10
Expand Down
22 changes: 11 additions & 11 deletions Solver/test/NavierStokes/TaylorGreenKEP_BR2/SETUP/ProblemFile.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,14 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &
TYPE(FTAssertionsManager), POINTER :: sharedManager
LOGICAL :: success
integer :: rank
real(kind=RP), parameter :: kinEn = 0.12499744094576655_RP
real(kind=RP), parameter :: kinEnRate = -4.2793777235400484E-004_RP
real(kind=RP), parameter :: enstrophy = 0.37499382750806631_RP
real(kind=RP), parameter :: res(5) = [7.896661595880896E-005_RP, &
0.12840017295540926_RP, &
0.12840017309057389_RP, &
0.24998272936400881_RP, &
0.615957301867907_RP ]
real(kind=RP), parameter :: kinEn = 1.2499872046477557E-01_RP
real(kind=RP), parameter :: kinEnRate = -4.2794492040058033E-04_RP
real(kind=RP), parameter :: enstrophy = 3.7499666432797546E-01_RP
real(kind=RP), parameter :: res(5) = [3.7044022120992646E-05_RP, &
1.2726954756803863E-01_RP, &
1.2726954706398708E-01_RP, &
2.5000199683269914E-01_RP, &
6.2890286300662734E-01_RP ]

CALL initializeSharedAssertionsManager
sharedManager => sharedAssertionsManager()
Expand Down Expand Up @@ -360,16 +360,16 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &
tol = 1.0e-11_RP, &
msg = "Kinetic Energy Rate")

CALL FTAssertEqual(expectedValue = enstrophy, &
actualValue = monitors % volumeMonitors(3) % values(1,1), &
CALL FTAssertEqual(expectedValue = enstrophy + 1.0_RP, &
actualValue = monitors % volumeMonitors(3) % values(1,1) + 1.0_RP, &
tol = 1.0e-11_RP, &
msg = "Enstrophy")

CALL sharedManager % summarizeAssertions(title = testName,iUnit = 6)

IF ( sharedManager % numberOfAssertionFailures() == 0 ) THEN
WRITE(6,*) testName, " ... Passed"
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 100 iterations."
WRITE(6,*) "This test case has no expected solution yet, only checks the residual after 5 iterations."
ELSE
WRITE(6,*) testName, " ... Failed"
WRITE(6,*) "NOTE: Failure is expected when the max eigenvalue procedure is changed."
Expand Down
2 changes: 1 addition & 1 deletion Solver/test/NavierStokes/TaylorGreenKEP_BR2/TaylorGreenKEP_BR2.control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ restart file name = "RESULTS/TGV.rst"
solution file name = "RESULTS/TGV.rst"
restart = .false.
Polynomial order = 3
Number of time steps = 10
Number of time steps = 5
Output Interval = 1
Number of plot points = 2
Convergence tolerance = 1.d-10
Expand Down

0 comments on commit 8333338

Please sign in to comment.