Merge branch 'main' into origin/feature/fix_elements_orderings/useCel…

…lVolume

docs/requirements.txt

@@ -1,5 +1,6 @@
+sphinx >= 7.4.7
 sphinx_rtd_theme
-sphinx-argparse
+sphinx-argparse >= 0.5.2
 sphinx-design
 # Running CLI programs and capture outputs
 sphinxcontrib-programoutput>=0.17

geos-ats/src/geos/ats/helpers/curve_check.py

@@ -33,16 +33,18 @@ def interpolate_values_time( ta, xa, tb ):
     """
     N = list( np.shape( xa ) )
     M = len( tb )
+    ta = np.ascontiguousarray( np.squeeze( ta ) )
+    tb = np.ascontiguousarray( np.squeeze( tb ) )
 
     if ( len( N ) == 1 ):
         return interp1d( ta, xa )( tb )
     else:
         # Reshape the input array so that we can work on the non-time axes
-        S = np.product( N[ 1: ] )
+        S = np.prod( N[ 1: ] )
         xc = np.reshape( xa, ( N[ 0 ], S ) )
         xd = np.zeros( ( len( tb ), S ) )
         for ii in range( S ):
-            xd[ :, ii ] = interp1d( ta, xc[ :, ii ] )( tb )
+            xd[ :, ii ] = interp1d( ta, xc[ :, ii ], bounds_error=False, fill_value='extrapolate' )( tb )
 
         # Return the array to it's expected shape
         N[ 0 ] = M

geos-ats/src/geos/ats/test_case.py

@@ -1,4 +1,4 @@
-import ats  # type: ignore[import]
+import ats  # type: ignore[import]
 import os
 import shutil
 import logging
@@ -319,7 +319,7 @@ def testCreate( self ):
             priority = 1
 
         # Setup a new test group
-        atsTest = None
+        parent_test = None
         ats.tests.AtsTest.newGroup( priority=priority, path=self.path )
         for stepnum, step in enumerate( self.steps ):
             np = getattr( step.p, "np", 1 )
@@ -329,10 +329,10 @@ def testCreate( self ):
             label = "%s_%d_%s" % ( self.name, stepnum + 1, step.label() )
 
             # call either 'test' or 'testif'
-            if atsTest is None:
+            if parent_test is None:
                 func = lambda *a, **k: test( *a, **k )
             else:
-                func = lambda *a, **k: testif( atsTest, *a, **k )
+                func = lambda *a, **k: testif( parent_test, *a, **k )
 
             # Set the time limit
             kw = {}
@@ -359,6 +359,11 @@ def testCreate( self ):
             if self.last_status == PASSED:
                 atsTest.status = SKIPPED
 
+            # Set the parent test
+            # Note: do not make tests dependent on the result of curvecheck
+            if step.label() != 'curvecheck':
+                parent_test = atsTest
+
         # End the group
         ats.tests.AtsTest.endGroup()
 

geos-mesh/src/geos/mesh/conversion/main.py

@@ -1,6 +1,7 @@
 import argparse
 import logging
 import sys
+from geos.mesh.conversion import abaqus_converter
 
 
 def build_abaqus_converter_input_parser() -> argparse.ArgumentParser:
@@ -25,8 +26,6 @@ def main() -> None:
         output (str): Output mesh file name
         -v/--verbose (flag): Increase verbosity level
     """
-    from geosx_mesh_tools import abaqus_converter
-
     # Parse the user arguments
     parser = build_abaqus_converter_input_parser()
     args = parser.parse_args()

geos-mesh/src/geos/mesh/doctor/__init__.py

@@ -0,0 +1 @@
+# Empty