Merge branch 'develop' into bugfix/p3configuration

GEOS-DEV · Jan 12, 2024 · d7b848c · d7b848c
2 parents cdf0897 + 8c40e31
commit d7b848c
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/inputFiles/wavePropagation/acous3D_Q5_abc_smoke.xml b/inputFiles/wavePropagation/acous3D_Q5_abc_smoke.xml
@@ -2,7 +2,7 @@
 
 <Problem>
   <Included>
-    <File name="./acous3D_Q3_small_base.xml"/>
+    <File name="./acous3D_Q5_small_base.xml"/>
   </Included>
 
   <!-- hexahedral mesh generated internally by GEOSX -->

diff --git a/inputFiles/wavePropagation/acous3D_Q5_small_base.xml b/inputFiles/wavePropagation/acous3D_Q5_small_base.xml
@@ -72,7 +72,7 @@
       initialCondition="1"
       objectPath="mesh/FE2/ElementRegions/Region/cb"
       fieldName="acousticDensity"
-      scale="1500"
+      scale="1"
       setNames="{ all }"/>
 
     <!-- 3) The free surface condition the domain -->
@@ -96,7 +96,7 @@
     <!-- two events to output pressure in an hdf5 file -->
     <PeriodicEvent
       name="timeHistoryCollection"
-      timeFrequency="0.0005"
+      timeFrequency="0.001"
       target="/Tasks/pressureCollection"/>
 
     <PeriodicEvent

diff --git a/inputFiles/wavePropagation/benchmarks/acous3D_benchmark_base.xml b/inputFiles/wavePropagation/benchmarks/acous3D_benchmark_base.xml
@@ -84,23 +84,23 @@
       name="initialPressure"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="pressure_n"
       scale="0.0"/>
 
     <FieldSpecification
       name="initialPressure_nm1"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="pressure_nm1"
       scale="0.0"/>
 
     <!-- 2) The velocity in the domain -->
     <FieldSpecification
       name="cellVelocity"
       initialCondition="1"
-      objectPath="ElementRegions/Region/cb"
+      objectPath="mesh/FE1/ElementRegions/Region/cb"
       fieldName="acousticVelocity"
       scale="1500"
       setNames="{ all }"/>

diff --git a/inputFiles/wavePropagation/benchmarks/elas3D_benchmark_base.xml b/inputFiles/wavePropagation/benchmarks/elas3D_benchmark_base.xml
@@ -118,47 +118,47 @@
       name="initialdisplacementnx"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="displacementx_n"
       scale="0.0"/>
 
     <FieldSpecification
       name="initialdisplacementny"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="displacementy_n"
       scale="0.0"/>
 
     <FieldSpecification
       name="initialdisplacementnz"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="displacementz_n"
       scale="0.0"/>
 
     <FieldSpecification
       name="initialdisplacementnm1x"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="displacementx_nm1"
       scale="0.0"/>
 
     <FieldSpecification
       name="initialdisplacementnm1y"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="displacementy_nm1"
       scale="0.0"/>
 
     <FieldSpecification
       name="initialdisplacementnm1z"
       initialCondition="1"
       setNames="{ all }"
-      objectPath="nodeManager"
+      objectPath="mesh/FE1/nodeManager"
       fieldName="displacementz_nm1"
       scale="0.0"/>
 
@@ -167,23 +167,23 @@
     <FieldSpecification
       name="cellVelocityVp"
       initialCondition="1"
-      objectPath="ElementRegions/Region/cb"
+      objectPath="mesh/FE1/ElementRegions/Region/cb"
       fieldName="elasticVelocityVp"
       scale="2000"
       setNames="{ all }"/>
 
     <FieldSpecification
       name="cellVelocityVs"
       initialCondition="1"
-      objectPath="ElementRegions/Region/cb"
+      objectPath="mesh/FE1/ElementRegions/Region/cb"
       fieldName="elasticVelocityVs"
       scale="1155"
       setNames="{ all }"/>
 
     <FieldSpecification
       name="cellDensity"
       initialCondition="1"
-      objectPath="ElementRegions/Region/cb"
+      objectPath="mesh/FE1/ElementRegions/Region/cb"
       fieldName="elasticDensity"
       scale="1"
       setNames="{ all }"/>

diff --git a/inputFiles/wavePropagation/elas3D_Q5_firstOrder_small_base.xml b/inputFiles/wavePropagation/elas3D_Q5_firstOrder_small_base.xml
@@ -99,17 +99,17 @@
 
     <PeriodicEvent
       name="timeHistoryCollectionx"
-      timeFrequency="0.0005"
+      timeFrequency="0.001"
       targetExactTimestep="1"
       target="/Tasks/displacementxCollection"/>
     <PeriodicEvent
       name="timeHistoryCollectiony"
-      timeFrequency="0.0005"
+      timeFrequency="0.001"
       targetExactTimestep="1"
       target="/Tasks/displacementyCollection"/>
     <PeriodicEvent
       name="timeHistoryCollectionz"
-      timeFrequency="0.0005"
+      timeFrequency="0.001"
       targetExactTimestep="1"
       target="/Tasks/displacementzCollection"/>
     <PeriodicEvent

diff --git a/inputFiles/wavePropagation/elas3D_Q5_small_base.xml b/inputFiles/wavePropagation/elas3D_Q5_small_base.xml
@@ -31,17 +31,17 @@
     <!-- two events to output pressure in an hdf5 file -->
     <PeriodicEvent
       name="timeHistoryCollectionx"
-      timeFrequency="0.0005"
+      timeFrequency="0.001"
       targetExactTimestep="1"
       target="/Tasks/displacementxCollection"/>
     <PeriodicEvent
       name="timeHistoryCollectiony"
-      timeFrequency="0.0005"
+      timeFrequency="0.001"
       targetExactTimestep="1"
       target="/Tasks/displacementyCollection"/>
     <PeriodicEvent
       name="timeHistoryCollectionz"
-      timeFrequency="0.0005"
+      timeFrequency="0.001"
       targetExactTimestep="1"
       target="/Tasks/displacementzCollection"/>
     <PeriodicEvent

diff --git a/...les/validationStudies/wellboreProblems/deviatedPoroElasticWellbore/Example2.rst b/...les/validationStudies/wellboreProblems/deviatedPoroElasticWellbore/Example2.rst
@@ -10,7 +10,7 @@ Problem description
 ------------------------------------------------------------------
 
 
-This example deals with the problem of drilling a deviated poro-elastic wellbore. This is an extension of the poroelastic wellbore example :ref:`AdvancedExampleDeviatedPoroElasticWellbore` with the consideration of in-situ stresses and in-situ pore pressure. Both pore pressure and mud pressure are supposed to be nil at the borehole wall following the consideration of `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. Also, the in-situ horizontal stresses are anisotropic, i.e. :math:`\sigma_hmax` > :math:`\sigma_hmin`. The wellbore trajectory is deviated from the directions of the in-situ stresses. Analytical solutions of the pore pressure, the radial and hoop stresses in the near wellbore region are given by `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. They are hereby used to verify the modeling predictions.
+This example deals with the problem of drilling a deviated poro-elastic wellbore. This is an extension of the poroelastic wellbore example :ref:`AdvancedExampleDeviatedPoroElasticWellbore` with the consideration of in-situ stresses and in-situ pore pressure. Both pore pressure and mud pressure are supposed to be nil at the borehole wall following the consideration of `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. Also, the in-situ horizontal stresses are anisotropic, i.e. :math:`\sigma_{hmax}` > :math:`\sigma_{hmin}`. The wellbore trajectory is deviated from the directions of the in-situ stresses. Analytical solutions of the pore pressure, the radial and hoop stresses in the near wellbore region are given by `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. They are hereby used to verify the modeling predictions.
 
 **Input file**
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ Problem description @@
     ------------------------------------------------------------------
-    This example deals with the problem of drilling a deviated poro-elastic wellbore. This is an extension of the poroelastic wellbore example :ref:`AdvancedExampleDeviatedPoroElasticWellbore` with the consideration of in-situ stresses and in-situ pore pressure. Both pore pressure and mud pressure are supposed to be nil at the borehole wall following the consideration of `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. Also, the in-situ horizontal stresses are anisotropic, i.e. :math:`\sigma_hmax` > :math:`\sigma_hmin`. The wellbore trajectory is deviated from the directions of the in-situ stresses. Analytical solutions of the pore pressure, the radial and hoop stresses in the near wellbore region are given by `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. They are hereby used to verify the modeling predictions.
+    This example deals with the problem of drilling a deviated poro-elastic wellbore. This is an extension of the poroelastic wellbore example :ref:`AdvancedExampleDeviatedPoroElasticWellbore` with the consideration of in-situ stresses and in-situ pore pressure. Both pore pressure and mud pressure are supposed to be nil at the borehole wall following the consideration of `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. Also, the in-situ horizontal stresses are anisotropic, i.e. :math:`\sigma_{hmax}` > :math:`\sigma_{hmin}`. The wellbore trajectory is deviated from the directions of the in-situ stresses. Analytical solutions of the pore pressure, the radial and hoop stresses in the near wellbore region are given by `(Abousleiman and Cui, 1998) <https://www.sciencedirect.com/science/article/pii/S0020768398001012>`__. They are hereby used to verify the modeling predictions.
     **Input file**
@@ Expand Down @@