Merge pull request #267 from LLNL/bugfix/TaylorAnvil

Adding Taylor-anvil to standard integration tests

Author: jmikeowen

src/CRKSPH/CRKSPHHydros.py

@@ -86,13 +86,16 @@ def CRKSPH(dataBase,
     if nsolid > 0:
         kwargs.update({"damageRelieveRubble" : damageRelieveRubble})
 
-    if GeometryRegistrar.coords() == CoordinateType.RZ:
-        kwargs.update({"etaMinAxis" : etaMinAxis})
-
     # Build the thing.
     result = constructor(**kwargs)
     result.Q = Q
     result._smoothingScaleMethod = smoothingScaleMethod
+
+    # If we're using area-weighted RZ, we need to reflect from the axis
+    if GeometryRegistrar.coords() == CoordinateType.RZ:
+        result.zaxisBC = AxisBoundaryRZ(etaMinAxis)
+        result.appendBoundary(result.zaxisBC)
+
     return result
 
 #-------------------------------------------------------------------------------

tests/functional/Strength/TaylorImpact/TaylorImpact.py

@@ -47,8 +47,6 @@
 
 from Spheral import *
 from SpheralTestUtilities import *
-from SpheralGnuPlotUtilities import *
-from SpheralController import *
 
 #-------------------------------------------------------------------------------
 # Identify ourselves!
@@ -84,7 +82,7 @@
             fsisph = False,
 
             # general hydro options
-            asph = False,                         # Only for H evolution, not hydro algorithm
+            asph = True,                         # Only for H evolution, not hydro algorithm
             HUpdate = IdealH,
             densityUpdate = IntegrateDensity,
             compatibleEnergy = True,

tests/integration.ats

@@ -92,6 +92,7 @@ source("functional/Gravity/ApproximatePolyhedralGravityModel.py")
 
 # Strength tests.
 #source("functional/Strength/PlateImpact/PlateImpact-1d.py")
+source("functional/Strength/TaylorImpact/TaylorImpact.py")
 source("functional/Strength/CollidingPlates/CollidingPlates-1d.py")
 source("functional/Strength/DiametralCompression/DiametralCompression.py")
 source("functional/Strength/Verney/Verney-spherical.py")