-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/TotoGaz/newGhosting' into feature/TotoGaz/newGh…
…osting_ryan
- Loading branch information
Showing
516 changed files
with
15,951 additions
and
1,711 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,15 +92,15 @@ jobs: | |
| ls -la ./ | ||
| - name: Checkout Repository | ||
| uses: actions/[email protected].4 | ||
| uses: actions/[email protected].7 | ||
| with: | ||
| submodules: true | ||
| lfs: ${{ inputs.BUILD_TYPE == 'integrated_tests' }} | ||
| fetch-depth: 1 | ||
|
|
||
| - id: 'auth' | ||
| if: ${{ inputs.GCP_BUCKET || inputs.USE_SCCACHE }} | ||
| uses: 'google-github-actions/[email protected].2' | ||
| uses: 'google-github-actions/[email protected].3' | ||
| with: | ||
| credentials_json: '${{ secrets.GOOGLE_CLOUD_GCP }}' | ||
| create_credentials_file: true | ||
|
|
@@ -312,9 +312,9 @@ jobs: | |
| - name: Upload coverage to Codecov | ||
| if: inputs.CODE_COVERAGE | ||
| uses: codecov/codecov-action@v4.3.1 | ||
| uses: codecov/codecov-action@v4.5.0 | ||
| with: | ||
| files: geos_coverage.info.cleaned | ||
| files: ${GITHUB_WORKSPACE}/geos_coverage.info.cleaned | ||
| fail_ci_if_error: true | ||
| env: | ||
| CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,7 +41,7 @@ jobs: | |
| # The TPL tag is contained in the codespaces configuration to avoid duplications. | ||
| - name: Checkout .devcontainer/devcontainer.json | ||
| uses: actions/[email protected].4 | ||
| uses: actions/[email protected].7 | ||
| with: | ||
| sparse-checkout: | | ||
| .devcontainer/devcontainer.json | ||
|
|
@@ -77,7 +77,7 @@ jobs: | |
| # The integrated test submodule repository contains large data (using git lfs). | ||
| # To save time (and money) we do not let Github Actions automatically clone all our (lfs) subrepositories and do it by hand. | ||
| - name: Checkout Repository | ||
| uses: actions/[email protected].4 | ||
| uses: actions/[email protected].7 | ||
| with: | ||
| # Let script update submodules; Github Actions submodule history causes error | ||
| submodules: false | ||
|
|
@@ -212,7 +212,7 @@ jobs: | |
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: Checkout Repository | ||
| uses: actions/[email protected].1 | ||
| uses: actions/[email protected].7 | ||
| with: | ||
| submodules: false | ||
| lfs: false | ||
|
|
@@ -257,8 +257,8 @@ jobs: | |
| ENABLE_HYPRE: ON | ||
| ENABLE_TRILINOS: OFF | ||
| RUNS_ON: streak2 | ||
| NPROC: 16 | ||
| DOCKER_RUN_ARGS: "--cpus=16 --memory=256g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro" | ||
| NPROC: 8 | ||
| DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro" | ||
| DOCKER_CERTS_DIR: "/usr/local/share/ca-certificates" | ||
| DOCKER_CERTS_UPDATE_COMMAND: "update-ca-certificates" | ||
|
|
||
|
|
@@ -280,8 +280,8 @@ jobs: | |
| CMAKE_BUILD_TYPE: Release | ||
| DOCKER_REPOSITORY: geosx/centos7.7-gcc8.3.1-cuda11.8.89 | ||
| RUNS_ON: streak2 | ||
| NPROC: 16 | ||
| DOCKER_RUN_ARGS: "--cpus=16 --memory=256g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" | ||
| NPROC: 8 | ||
| DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" | ||
| DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" | ||
| DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" | ||
|
|
||
|
|
@@ -291,7 +291,11 @@ jobs: | |
| CMAKE_BUILD_TYPE: Release | ||
| DOCKER_REPOSITORY: geosx/pecan-gpu-gcc8.2.0-openmpi4.0.1-mkl2019.5-cuda11.5.119 | ||
| HOST_CONFIG: host-configs/TOTAL/pecan-GPU.cmake | ||
| RUNS_ON: Runner_4core_16GB | ||
| RUNS_ON: streak2 | ||
| NPROC: 8 | ||
| DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" | ||
| DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" | ||
| DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" | ||
|
|
||
| - name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 11.7.1,) | ||
| BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" | ||
|
|
@@ -302,7 +306,11 @@ jobs: | |
| ENABLE_TRILINOS: OFF | ||
| GCP_BUCKET: geosx/Sherlock-GPU | ||
| HOST_CONFIG: host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10-cuda11.7.1-sm70.cmake | ||
| RUNS_ON: Runner_4core_16GB | ||
| RUNS_ON: streak2 | ||
| NPROC: 8 | ||
| DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" | ||
| DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" | ||
| DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" | ||
|
|
||
| uses: ./.github/workflows/build_and_test.yml | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| <?xml version="1.0" ?> | ||
|
|
||
| <Problem> | ||
| <!-- SPHINX_SOLVER --> | ||
| <Solvers | ||
| gravityVector="{0.0, 0.0, 0.0}"> | ||
| <SolidMechanicsAugmentedLagrangianContact | ||
| name="AugmentedLagrangian" | ||
| timeIntegrationOption="QuasiStatic" | ||
| logLevel="1" | ||
| discretization="FE1" | ||
| targetRegions="{ Region, Fracture }"> | ||
| <NonlinearSolverParameters | ||
| newtonTol="1.0e-8" | ||
| logLevel="2" | ||
| newtonMaxIter="10" | ||
| maxNumConfigurationAttempts="10" | ||
| lineSearchAction="Require" | ||
| lineSearchMaxCuts="2" | ||
| maxTimeStepCuts="2"/> | ||
| <LinearSolverParameters | ||
| solverType="direct" | ||
| directParallel="0" | ||
| logLevel="0"/> | ||
| </SolidMechanicsAugmentedLagrangianContact> | ||
|
|
||
| <SurfaceGenerator | ||
| name="SurfaceGen" | ||
| logLevel="0" | ||
| fractureRegion="Fracture" | ||
| targetRegions="{ Region }" | ||
| rockToughness="1.0e6" | ||
| mpiCommOrder="1"/> | ||
| </Solvers> | ||
|
|
||
| <Events | ||
| maxTime="1.0"> | ||
| <SoloEvent | ||
| name="preFracture" | ||
| target="/Solvers/SurfaceGen"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="solverApplications" | ||
| beginTime="0.0" | ||
| endTime="1.0" | ||
| forceDt="0.5" | ||
| target="/Solvers/AugmentedLagrangian"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="restarts" | ||
| timeFrequency="0.5" | ||
| target="/Outputs/restartOutput"/> | ||
|
|
||
| <PeriodicEvent | ||
| name="outputs" | ||
| beginTime="0.0" | ||
| endTime="1.0" | ||
| forceDt="0.5" | ||
| target="/Outputs/vtkOutput"/> | ||
| </Events> | ||
|
|
||
| <NumericalMethods> | ||
| <FiniteElements> | ||
| <FiniteElementSpace | ||
| name="FE1" | ||
| order="1"/> | ||
| </FiniteElements> | ||
|
|
||
| </NumericalMethods> | ||
|
|
||
| <ElementRegions> | ||
| <CellElementRegion | ||
| name="Region" | ||
| cellBlocks="{ cb1 }" | ||
| materialList="{ rock }"/> | ||
|
|
||
| <SurfaceElementRegion | ||
| name="Fracture" | ||
| faceBlock="faceElementSubRegion" | ||
| defaultAperture="0.0" | ||
| materialList="{ fractureMaterial, rock }"/> | ||
| </ElementRegions> | ||
|
|
||
| <!-- SPHINX_MATERIAL --> | ||
| <Constitutive> | ||
| <ElasticIsotropic | ||
| name="rock" | ||
| defaultDensity="2700" | ||
| defaultBulkModulus="2e10" | ||
| defaultShearModulus="9e9"/> | ||
|
|
||
| <Coulomb | ||
| name="fractureMaterial" | ||
| cohesion="0.0" | ||
| frictionCoefficient="0.1" | ||
| apertureTableName="apertureTable"/> | ||
| </Constitutive> | ||
|
|
||
| <Functions> | ||
| <TableFunction | ||
| name="apertureTable" | ||
| coordinates="{ -1.0e-3, 0.0 }" | ||
| values="{ 1.0e-6, 9.15e-6 }"/> | ||
|
|
||
| <TableFunction | ||
| name="dispFunction" | ||
| inputVarNames="{ time }" | ||
| coordinates="{ 0.0, 1.0 }" | ||
| values="{ 0.0, 1.0 }"/> | ||
| </Functions> | ||
|
|
||
| </Problem> |
Oops, something went wrong.