Skip to content

Commit f0674b9

Browse files
jmikeowenjmikeowen
committed
Adding RAJA SPH variants to Noh planar test
1 parent 6f5b5d3 commit f0674b9

1 file changed

Lines changed: 29 additions & 6 deletions

File tree

‎tests/functional/Hydro/Noh/Noh-planar-1d.py‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@
1313
#ATS:t4 = test( SELF, "--graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-1proc-reproducing.txt'", label="Planar Noh problem -- 1-D (serial reproducing test setup)")
1414
#ATS:t5 = testif(t4, SELF, "--graphics None --clearDirectories False --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-4proc-reproducing.txt' --comparisonFile 'Noh-planar-1proc-reproducing.txt'", np=4, label="Planar Noh problem -- 1-D (4 proc reproducing test)")
1515
#
16+
# Ordinary SPH with RAJA
17+
#
18+
#ATS:t50 = test( SELF, "--raja True --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem -- 1-D (serial RAJA)")
19+
#ATS:t51 = testif(t50, SELF, "--raja True --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem -- 1-D (serial RAJA) RESTART CHECK")
20+
#ATS:t52 = test( SELF, "--raja True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-restartcheck' --restartStep 20", np=2, label="Planar Noh problem -- 1-D (parallel RAJA)")
21+
#ATS:t53 = testif(t52, SELF, "--raja True --graphics None --clearDirectories False --checkError False --dataDirBase 'dumps-planar-restartcheck' --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", np=2, label="Planar Noh problem -- 1-D (parallel RAJA) RESTART CHECK")
22+
#ATS:t54 = test( SELF, "--raja True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-1proc-reproducing.txt'", label="Planar Noh problem -- 1-D (serial RAJA reproducing test setup)")
23+
#ATS:t55 = testif(t54, SELF, "--raja True --graphics None --clearDirectories False --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-4proc-reproducing.txt' --comparisonFile 'Noh-planar-1proc-reproducing.txt'", np=4, label="Planar Noh problem -- 1-D (4 proc RAJA reproducing test)")
24+
#
1625
# Ordinary SPH restart check for SidreFileIO
1726
#
1827
#ATS:t10 = test( SELF, "--graphics None --clearDirectories True --checkError True --dataDir 'dumps-planar-sidre' --restartStep 20 --restartFileConstructor SidreFileIO", label="Planar Noh problem -- 1-D (serial) with Sidre")
@@ -25,11 +34,20 @@
2534
# Ordinary solid SPH
2635
#
2736
#ATS:t100 = test( SELF, "--solid True --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with solid SPH -- 1-D (serial)")
28-
#ATS:t101 = testif(t100, SELF, "--solid True --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with solid SPH -- 1-D (serial) RESTART CHECK")
29-
#ATS:t102 = test( SELF, "--solid True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-restartcheck' --restartStep 20", np=2, label="Planar Noh problem with solid SPH -- 1-D (parallel)")
30-
#ATS:t103 = testif(t102, SELF, "--solid True --graphics None --clearDirectories False --checkError False --dataDirBase 'dumps-planar-restartcheck' --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", np=2, label="Planar Noh problem with solid SPH -- 1-D (parallel) RESTART CHECK")
31-
#ATS:t104 = test( SELF, "--solid True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-1proc-reproducing.txt'", label="Planar Noh problem with solid SPH -- 1-D (serial reproducing test setup)")
32-
#ATS:t105 = testif(t104, SELF, "--solid True --graphics None --clearDirectories False --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-4proc-reproducing.txt' --comparisonFile 'Noh-planar-1proc-reproducing.txt'", np=4, label="Planar Noh problem with solid SPH -- 1-D (4 proc reproducing test)")
37+
#ATS:t101 = testif(t100, SELF, "--solid True --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with solid SPH -- 1-D (serial RAJA) RESTART CHECK")
38+
#ATS:t102 = test( SELF, "--solid True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-restartcheck' --restartStep 20", np=2, label="Planar Noh problem with solid SPH -- 1-D (parallel RAJA)")
39+
#ATS:t103 = testif(t102, SELF, "--solid True --graphics None --clearDirectories False --checkError False --dataDirBase 'dumps-planar-restartcheck' --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", np=2, label="Planar Noh problem with solid SPH -- 1-D (parallel RAJA) RESTART CHECK")
40+
#ATS:t104 = test( SELF, "--solid True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-1proc-reproducing.txt'", label="Planar Noh problem with solid SPH -- 1-D (serial RAJA reproducing test setup)")
41+
#ATS:t105 = testif(t104, SELF, "--solid True --graphics None --clearDirectories False --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-4proc-reproducing.txt' --comparisonFile 'Noh-planar-1proc-reproducing.txt'", np=4, label="Planar Noh problem with solid SPH -- 1-D (4 proc RAJA reproducing test)")
42+
#
43+
# Ordinary solid SPH with RAJA
44+
#
45+
#ATS:t150 = test( SELF, "--raja True --solid True --graphics None --clearDirectories True --checkError True --restartStep 20", label="Planar Noh problem with solid SPH -- 1-D (serial)")
46+
#ATS:t151 = testif(t150, SELF, "--raja True --solid True --graphics None --clearDirectories False --checkError False --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", label="Planar Noh problem with solid SPH -- 1-D (serial) RESTART CHECK")
47+
#ATS:t152 = test( SELF, "--raja True --solid True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-restartcheck' --restartStep 20", np=2, label="Planar Noh problem with solid SPH -- 1-D (parallel)")
48+
#ATS:t153 = testif(t152, SELF, "--raja True --solid True --graphics None --clearDirectories False --checkError False --dataDirBase 'dumps-planar-restartcheck' --restartStep 20 --restoreCycle 20 --steps 20 --checkRestart True", np=2, label="Planar Noh problem with solid SPH -- 1-D (parallel) RESTART CHECK")
49+
#ATS:t154 = test( SELF, "--raja True --solid True --graphics None --clearDirectories True --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-1proc-reproducing.txt'", label="Planar Noh problem with solid SPH -- 1-D (serial reproducing test setup)")
50+
#ATS:t155 = testif(t154, SELF, "--raja True --solid True --graphics None --clearDirectories False --checkError True --dataDirBase 'dumps-planar-reproducing' --domainIndependent True --outputFile 'Noh-planar-4proc-reproducing.txt' --comparisonFile 'Noh-planar-1proc-reproducing.txt'", np=4, label="Planar Noh problem with solid SPH -- 1-D (4 proc reproducing test)")
3351
#
3452
# CRK
3553
#
@@ -99,6 +117,7 @@
99117
hydroType = "SPH", # one of (SPH, SVPH, CRKSPH, PSPH, FSISPH, GSPH, MFM, MFV)
100118
crktype = "default", # one of ("default", "variant")
101119
asph = False, # For H update algorithm, applies to all hydros
120+
raja = False, # Use RAJA variant of hydro (only SPH currently)
102121
gsphReconstructionGradient = RiemannGradient, #one of (RiemannGradient, HydroAccelerationGradient, SPHGradient, MixedGradient, OnlyDvDxGradient)
103122
evolveTotalEnergy = False, # Only for SPH variants -- evolve total rather than specific energy
104123
boolReduceViscosity = False,
@@ -204,6 +223,9 @@
204223
if solid:
205224
hydroPath = "Solid" + hydroPath
206225

226+
if raja:
227+
hydroPath += "_RAJA"
228+
207229
if dataDirBase:
208230
dataDir = os.path.join(dataDirBase,
209231
hydroPath,
@@ -525,7 +547,8 @@
525547
epsTensile = epsilonTensile,
526548
nTensile = nTensile,
527549
HUpdate = HUpdate,
528-
ASPH = asph)
550+
ASPH = asph,
551+
RAJA = raja)
529552
output("hydro")
530553
try:
531554
output("hydro.kernel")

0 commit comments

Comments
 (0)