Merge branch 'develop' into test/omarduran/unitest_rttypes

GEOS-DEV · Dec 2, 2024 · 0aeca31 · 0aeca31
2 parents e9d56f8 + da8185a
commit 0aeca31
Show file tree

Hide file tree

Showing 71 changed files with 3,626 additions and 471 deletions.
diff --git a/.integrated_tests.yaml b/.integrated_tests.yaml
@@ -1,6 +1,6 @@
 baselines:
   bucket: geosx
-  baseline: integratedTests/baseline_integratedTests-pr3448-8959-1ff97b3
+  baseline: integratedTests/baseline_integratedTests-pr3381-9063-399123c
 allow_fail:
   all: ''
   streak: ''
diff --git a/BASELINE_NOTES.md b/BASELINE_NOTES.md
@@ -6,6 +6,15 @@ This file is designed to track changes to the integrated test baselines.
 Any developer who updates the baseline ID in the .integrated_tests.yaml file is expected to create an entry in this file with the pull request number, date, and their justification for rebaselining.
 These notes should be in reverse-chronological order, and use the following time format: (YYYY-MM-DD).
 
+PR #3381 (2024-12-01)
+=====================
+A few baseline diffs for order FaceElementSubRegion::m_toFacesRelation map. Not sure why this was changed by this PR, but the previous order seems incorrect for a couple of cases.
+
+
+PR #2957 (2024-11-27)
+=====================
+Added ExternalDataRepository.
+
 PR #3448 (2024-11-21)
 =====================
 Switched the FaceElementSubRegion::m_toFacesRelation and FaceElementSubRegion::m_2dElemToElems back to array2d instead of ArrayOfArray. This results in a reordering m_toFacesRelation back to the "correct" assumed order of "original face first". This fixes a bug that failed to remove the CellStencil entry when a FaceElement splits two cells.

diff --git a/host-configs/apple/macOS_base.cmake b/host-configs/apple/macOS_base.cmake
@@ -29,7 +29,7 @@ set(ENABLE_DOXYGEN ON CACHE BOOL "" FORCE)
 set(ENABLE_SPHINX ON CACHE BOOL "" FORCE)
 set(ENABLE_MATHPRESSO ON CACHE BOOL "" FORCE )
 
-set(GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+set(GEOS_BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 
 
 

diff --git a/...Files/lagrangianContactMechanics/LagrangeContactBubbleStab_singleFracCompression_base.xml b/...Files/lagrangianContactMechanics/LagrangeContactBubbleStab_singleFracCompression_base.xml
@@ -130,8 +130,8 @@
       plotLevel="2"
       format="binary"
       plotFileRoot="bubbleStab"/>
-    </Outputs>
-
     <Restart
       name="restartOutput"/> 
+  </Outputs>
+
 </Problem>
diff --git a/inputFiles/singlePhaseFlow/FieldCaseTutorial3_composite_smoke.xml b/inputFiles/singlePhaseFlow/FieldCaseTutorial3_composite_smoke.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" ?>
+
+<Problem>
+  <Included>
+    <File name="./FieldCaseTutorial3_base.xml" />
+  </Included>
+
+  <!-- SPHINX_FIELD_CASE_COMPOSITE_MESH -->
+  <ExternalDataSource>
+    <VTKHierarchicalDataSource
+      name="synthetic"
+      file="synthetic.vtpc"/>
+  </ExternalDataSource>
+
+  <Mesh>
+    <VTKMesh
+      name="SyntheticMesh"
+      dataSourceName="synthetic">
+      <Region
+        name="Region1"
+        id="1"
+        pathInRepository="/Root/Mesh/Region1"/>
+      <Region
+        name="Region2"
+        id="2"
+        pathInRepository="/Root/Mesh/Region2"/>
+      <Region
+        name="Region3"
+        id="3"
+        pathInRepository="/Root/Mesh/Region3"/>
+    </VTKMesh>
+  </Mesh>
+  <!-- SPHINX_FIELD_CASE_COMPOSITE_MESH -->
+
+  <!-- SPHINX_FIELD_CASE_EVENTS -->
+  <Events maxTime="100.0e6">
+    <PeriodicEvent name="solverApplications"
+                   forceDt="10.0e6"
+                   target="/Solvers/SinglePhaseFlow" />
+
+    <PeriodicEvent name="outputs"
+                   timeFrequency="10.0e6"
+                   target="/Outputs/reservoir_with_properties" />
+  </Events>
+  <!-- SPHINX_FIELD_CASE_EVENTS_END -->
+
+</Problem>
diff --git a/inputFiles/singlePhaseFlow/synthetic.vtpc b/inputFiles/singlePhaseFlow/synthetic.vtpc
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<VTKFile type="vtkPartitionedDataSetCollection" version="1.0" byte_order="LittleEndian" header_type="UInt32" compressor="vtkZLibDataCompressor">
+  <vtkPartitionedDataSetCollection>
+    <Partitions index="0" name="Region1">
+      <DataSet index="0" file="synthetic/synthetic_0_0.vtu"/>
+    </Partitions>
+    <Partitions index="1" name="Region2">
+      <DataSet index="0" file="synthetic/synthetic_1_0.vtu"/>
+    </Partitions>
+    <Partitions index="2" name="Region3">
+      <DataSet index="0" file="synthetic/synthetic_2_0.vtu"/>
+    </Partitions>
+    <DataAssembly encoding="base64">
+      PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxSb290IHR5cGU9InZ0a0RhdGFBc3NlbWJseSIgdmVyc2lvbj0iMS4wIiBpZD0iMCIgdnRrX3R5cGU9IjM4IiB2dGtfY2F0ZWdvcnk9Inhmb3JtZWRfaGllcmFyY2h5IiBsYWJlbD0iZGF0YSI+CiAgPE1lc2ggaWQ9IjEiIGxhYmVsPSJTeW50aGV0aWNNZXNoIj4KICAgIDxSZWdpb24xIGlkPSIyIiBsYWJlbD0iUmVnaW9uMSIgbnVtYmVyX29mX3BhcnRpdGlvbnM9IjEiPgogICAgICA8ZGF0YXNldCBpZD0iMCIgLz4KICAgIDwvUmVnaW9uMT4KICAgIDxSZWdpb24yIGlkPSIzIiBsYWJlbD0iUmVnaW9uMiIgbnVtYmVyX29mX3BhcnRpdGlvbnM9IjEiPgogICAgICA8ZGF0YXNldCBpZD0iMSIgLz4KICAgIDwvUmVnaW9uMj4KICAgIDxSZWdpb24zIGlkPSI0IiBsYWJlbD0iUmVnaW9uMyIgbnVtYmVyX29mX3BhcnRpdGlvbnM9IjEiPgogICAgICA8ZGF0YXNldCBpZD0iMiIgLz4KICAgIDwvUmVnaW9uMz4KICA8L01lc2g+CjwvUm9vdD4K
+    </DataAssembly>
+  </vtkPartitionedDataSetCollection>
+</VTKFile>
diff --git a/inputFiles/singlePhaseFlow/synthetic/synthetic_0_0.vtu b/inputFiles/singlePhaseFlow/synthetic/synthetic_0_0.vtu
diff --git a/inputFiles/singlePhaseFlow/synthetic/synthetic_1_0.vtu b/inputFiles/singlePhaseFlow/synthetic/synthetic_1_0.vtu
diff --git a/inputFiles/singlePhaseFlow/synthetic/synthetic_2_0.vtu b/inputFiles/singlePhaseFlow/synthetic/synthetic_2_0.vtu
diff --git a/inputFiles/surfaceGeneration/cube_8.vtu b/inputFiles/surfaceGeneration/cube_8.vtu
@@ -0,0 +1,84 @@
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian">
+  <UnstructuredGrid>
+    <Piece NumberOfPoints="27" NumberOfCells="8">
+      <PointData GlobalIds="GLOBAL_IDS_POINTS">
+        <DataArray type="Int64" IdType="1" Name="GLOBAL_IDS_POINTS" format="ascii">
+          0 1 2
+          3 4 5 
+          6 7 8 
+          9 10 11
+          12 13 14 
+          15 16 17
+          18 19 20
+          21 22 23
+          24 25 26 
+        </DataArray>
+      </PointData>
+      <CellData GlobalIds="GLOBAL_IDS_CELLS" Scalars="attribute">
+        <DataArray type="Int64" IdType="1" Name="GLOBAL_IDS_CELLS" format="ascii">
+          0 1 2 3 4 5 6 7
+        </DataArray>
+        <DataArray type="Int32" Name="attribute" format="ascii">
+          3 3 3 3 3 3
+          3 3 3 3 3 3
+        </DataArray>
+      </CellData>
+      <Points>
+        <DataArray type="Float32" Name="coordinates" NumberOfComponents="3" format="ascii">
+          -1 -1 -1
+          0 -1 -1
+          1 -1 -1
+          -1 0 -1
+          0 0 -1
+          1 0 -1
+          -1 1 -1
+          0 1 -1
+          1 1 -1
+          -1 -1 0
+          0 -1 0
+          1 -1 0
+          -1 0 0
+          0 0 0
+          1 0 0
+          -1 1 0
+          0 1 0
+          1 1 0
+          -1 -1 1
+          0 -1 1
+          1 -1 1
+          -1 0 1
+          0 0 1
+          1 0 1
+          -1 1 1
+          0 1 1
+          1 1 1
+        </DataArray>
+      </Points>
+      <Cells>
+        <DataArray type="Int32" Name="connectivity" format="ascii">
+          0 1 4 3 9 10 13 12
+          1 2 5 4 10 11 14 13
+          3 4 7 6 12 13 16 15
+          4 5 8 7 13 14 17 16
+          9 10 13 12 18 19 22 21
+          10 11 14 13 19 20 23 22
+          12 13 16 15 21 22 25 24
+          13 14 17 16 22 23 26 25
+        </DataArray>
+        <DataArray type="Int32" Name="offsets" format="ascii">
+          8
+          16
+          24
+          32
+          40
+          48
+          56
+          64
+        </DataArray>
+        <DataArray type="UInt8" Name="types" format="ascii">
+          12 12 12 12 12 12 12 12
+        </DataArray>
+      </Cells>
+    </Piece>
+  </UnstructuredGrid>
+</VTKFile>