Skip to content

Commit

Permalink
Python Packaging Updates (#3057)
Browse files Browse the repository at this point in the history
Updating geosPythonPackages

---------

Co-authored-by: Christopher Sherman <sherman27@llnl.gov>
  • Loading branch information
Lionel Untereiner and cssherman authored Jun 21, 2024
1 parent d6b6e0b commit f91800b
Show file tree
Hide file tree
Showing 55 changed files with 68 additions and 159 deletions.
3 changes: 1 addition & 2 deletions inputFiles/almContactMechanics/alm.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 2.0E-4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/compositionalMultiphaseFlow/c1-ppu/c1_ppu.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
restartcheck_params["rtol"] = 1.0E-5

# exclude any derivative fields from restart checks
# example field name: dGlobalComponentFraction_dPressure
#restartcheck_params["exclude"] = [r"d[A-Z]\w+_d[A-Z]\w+"]

decks = [
TestDeck(
name="class09_pb3_smoke_3d",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
restartcheck_params["rtol"] = 1.0E-5

# exclude any derivative fields from restart checks
# example field name: dGlobalComponentFraction_dPressure
#restartcheck_params["exclude"] = [r"d[A-Z]\w+_d[A-Z]\w+"]

decks = [
TestDeck(
name="deadOilEgg_smoke_3d",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-6
restartcheck_params["rtol"] = 1.0E-5

# exclude any derivative fields from restart checks
# example field name: dGlobalComponentFraction_dPressure
#restartcheck_params["exclude"] = [r"d[A-Z]\w+_d[A-Z]\w+"]

decks = [
TestDeck(
name="compositional_multiphase_wells_1d",
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/efemFractureMechanics/efemFractureMechanics.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, CurveCheckParameters, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, CurveCheckParameters, RestartcheckParameters, generate_geos_tests

restartcheck_params = {'atol': 1e-08, 'rtol': 4e-07}

Expand Down
3 changes: 1 addition & 2 deletions inputFiles/hydraulicFracturing/Hydrofracturing.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import copy
import geos_ats
from geos_ats.test_builder import generate_geos_tests, RestartcheckParameters, CurveCheckParameters, TestDeck
from geos.ats.test_builder import generate_geos_tests, RestartcheckParameters, CurveCheckParameters, TestDeck

# Define cases
kgd_viscosity_dominated = {
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/inducedSeismicity/inducedSeismicity.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests, CurveCheckParameters
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests, CurveCheckParameters

curvecheck_params = {}
curvecheck_params["filename"] = "seismicityRate.hdf5"
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/lagrangianContactMechanics/contactMechanics.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 2.0E-4
Expand Down
1 change: 0 additions & 1 deletion inputFiles/main.ats
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""
Primary ATS script
"""
import os
import ats
from pathlib import Path

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1.0E-8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1.0E-8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1.0E-8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-10
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/phaseField/PhaseFieldFracture.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-06
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests


class Description(object):
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/poromechanics/poroElasticCoupling.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests


class Description(object):
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/poromechanics/viscoPlastic.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck
from geos.ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-5
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/poromechanicsFractures/poromechanicsFractures.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {'atol': 1e-07, 'rtol': 4e-06}

Expand Down
4 changes: 1 addition & 3 deletions inputFiles/proppant/proppantTransport.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-10
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/simplePDE/SimpleSolvers.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-08
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/singlePhaseFlow/singlePhaseFlow.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-10
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/singlePhaseFlow/thermalSinglePhaseFlow.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-06
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-10
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/singlePhaseWell/singlePhaseWell.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-09
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/solidMechanics/SSLE.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck
from geos.ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-10
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/solidMechanics/anisotropic.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import generate_geos_tests, TestDeck, RestartcheckParameters
from geos.ats.test_builder import generate_geos_tests, TestDeck, RestartcheckParameters

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-5
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/solidMechanics/beamBending.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import RestartcheckParameters, CurveCheckParameters, TestDeck, generate_geos_tests
from geos.ats.test_builder import RestartcheckParameters, CurveCheckParameters, TestDeck, generate_geos_tests

restartcheck_params = RestartcheckParameters(atol=1.0E-3, rtol=1.0E-7)

Expand Down
3 changes: 1 addition & 2 deletions inputFiles/solidMechanics/gravity.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import generate_geos_tests, TestDeck, RestartcheckParameters
from geos.ats.test_builder import generate_geos_tests, TestDeck, RestartcheckParameters

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-5
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/solidMechanics/plasticCubeReset.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck
from geos.ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-5
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/solidMechanics/plasticWellbore.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-06
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/solidMechanics/sedov.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Integrated Test Docs Begin Parameters
import geos_ats
from geos_ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck, CurveCheckParameters
from geos.ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck, CurveCheckParameters

restartcheck_params = {}
restartcheck_params["atol"] = 2.0E-10
Expand Down
3 changes: 1 addition & 2 deletions inputFiles/solidMechanics/viscoPlastic.ats
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import geos_ats
from geos_ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck
from geos.ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-5
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/solidMechanics/wellbore.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 0.0001
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/surfaceGeneration/SurfaceGenerator.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params["atol"] = 1.0E-5
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/thermalMultiphaseFlow/thermalMultiphaseFlow.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-06
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 1e-06
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/thermoPoromechanics/thermoPoromechanics.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {'atol': 1e-06, 'rtol': 4e-06}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {'atol': 1e-06, 'rtol': 4e-06}

Expand Down
4 changes: 1 addition & 3 deletions inputFiles/wavePropagation/AcousticElasticSEM.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 0.0001
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/wavePropagation/AcousticFirstOrderSEM.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 0.0001
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/wavePropagation/AcousticSEM.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 0.0001
Expand Down
4 changes: 1 addition & 3 deletions inputFiles/wavePropagation/ElasticFirstOrderSEM.ats
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import os
import geos_ats
from geos_ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests
from geos.ats.test_builder import TestDeck, RestartcheckParameters, generate_geos_tests

restartcheck_params = {}
restartcheck_params['atol'] = 0.0001
Expand Down
Loading

0 comments on commit f91800b

Please sign in to comment.