Skip to content

Commit

Permalink
fixed some errors with schema and pygeosx
Browse files Browse the repository at this point in the history
  • Loading branch information
@rrsettgast
rrsettgast committed Aug 17, 2024
1 parent 831436e commit c29a9f7
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 8 deletions.
2 changes: 1 addition & 1 deletion inputFiles/singlePhaseFlowFractures/fractureFlow_conforming_2d_vtk_input.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<Mesh>
<VTKMesh
surfacicFieldsToImport="{aperture}"
surfacicFieldsInGEOSX="{elementAperture}"
surfacicFieldsInGEOS="{elementAperture}"
name="mesh1"
useGlobalIds="1"
faceBlocks="{fracture}"
Expand Down
1 change: 1 addition & 0 deletions src/coreComponents/constitutiveDrivers/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ set( constitutiveDrivers_sources
relativePermeability/RelpermDriverVanGenuchtenStone2RunTest.cpp
relativePermeability/RelpermDriverTableRelativeRunTest.cpp
relativePermeability/RelpermDriverTableRelativeHysteresisRunTest.cpp
solid/TriaxialDriver.cpp
)

set( dependencyList ${parallelDeps} constitutive events )
Expand Down
12 changes: 12 additions & 0 deletions src/coreComponents/schema/docs/HydraulicApertureTable.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@


================= ============ ======== =============================================================================================================================================================================================================================================================================================================================================================================================================================================================
Name Type Default Description
================= ============ ======== =============================================================================================================================================================================================================================================================================================================================================================================================================================================================
apertureTableName groupNameRef required Name of the aperture table
apertureTolerance real64 1e-09 Value to be used to avoid floating point errors in expressions involving aperture. For example in the case of dividing by the actual aperture (not the effective aperture that results from the aperture function) this value may be used to avoid the 1/0 error. Note that this value may have some physical significance in its usage, as it may be used to smooth out highly nonlinear behavior associated with 1/0 in addition to avoiding the 1/0 error.
name groupName required A name is required for any non-unique nodes
referenceAperture real64 1e-06 Reference hydraulic aperture. It is the aperture at zero normal stress.
================= ============ ======== =============================================================================================================================================================================================================================================================================================================================================================================================================================================================


9 changes: 9 additions & 0 deletions src/coreComponents/schema/docs/HydraulicApertureTable_other.rst
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@


==== ==== ============================
Name Type Description
==== ==== ============================
(no documentation available)
==== ==== ============================


4 changes: 2 additions & 2 deletions src/coreComponents/schema/docs/VTKMesh.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Name Type Default Description
====================== ======================== ========= ============================================================================================================================================================================================================================================================================================================================================================================================================================================================================
faceBlocks groupNameRef_array {} For multi-block files, names of the face mesh block.
fieldNamesInGEOS groupNameRef_array {} Names of the volumic fields in GEOS to import into
fieldNamesInGEOS groupNameRef_array {} Names of the volumic fields in GEOS to import into
fieldsToImport groupNameRef_array {} Volumic fields to be imported from the external mesh file
file path required Path to the mesh file
logLevel integer 0 Log level
Expand All @@ -15,7 +15,7 @@ partitionMethod geos_vtk_PartitionMethod parmetis Method (library) used
partitionRefinement integer 1 Number of partitioning refinement iterations (defaults to 1, recommended value).A value of 0 disables graph partitioning and keeps simple kd-tree partitions (not recommended). Values higher than 1 may lead to slightly improved partitioning, but yield diminishing returns.
regionAttribute groupNameRef attribute Name of the VTK cell attribute to use as region marker
scale R1Tensor {1,1,1} Scale the coordinates of the vertices by given scale factors (after translation)
surfacicFieldsInGEOS groupNameRef_array {} Names of the surfacic fields in GEOS to import into
surfacicFieldsInGEOS groupNameRef_array {} Names of the surfacic fields in GEOS to import into
surfacicFieldsToImport groupNameRef_array {} Surfacic fields to be imported from the external mesh file
translate R1Tensor {0,0,0} Translate the coordinates of the vertices by a given vector (prior to scaling)
useGlobalIds integer 0 Controls the use of global IDs in the input file for cells and points. If set to 0 (default value), the GlobalId arrays in the input mesh are used if available, and generated otherwise. If set to a negative value, the GlobalId arrays in the input mesh are not used, and generated global Ids are automatically generated. If set to a positive value, the GlobalId arrays in the input mesh are used and required, and the simulation aborts if they are not available
Expand Down
8 changes: 4 additions & 4 deletions src/coreComponents/schema/schema.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1691,8 +1691,8 @@ stress - traction is applied to the faces as specified by the inner product of i
</xsd:choice>
<!--faceBlocks => For multi-block files, names of the face mesh block.-->
<xsd:attribute name="faceBlocks" type="groupNameRef_array" default="{}" />
<!--fieldNamesInGEOSX => Names of the volumic fields in GEOSX to import into-->
<xsd:attribute name="fieldNamesInGEOSX" type="groupNameRef_array" default="{}" />
<!--fieldNamesInGEOS => Names of the volumic fields in GEOS to import into-->
<xsd:attribute name="fieldNamesInGEOS" type="groupNameRef_array" default="{}" />
<!--fieldsToImport => Volumic fields to be imported from the external mesh file-->
<xsd:attribute name="fieldsToImport" type="groupNameRef_array" default="{}" />
<!--file => Path to the mesh file-->
Expand All @@ -1711,8 +1711,8 @@ stress - traction is applied to the faces as specified by the inner product of i
<xsd:attribute name="regionAttribute" type="groupNameRef" default="attribute" />
<!--scale => Scale the coordinates of the vertices by given scale factors (after translation)-->
<xsd:attribute name="scale" type="R1Tensor" default="{1,1,1}" />
<!--surfacicFieldsInGEOSX => Names of the surfacic fields in GEOSX to import into-->
<xsd:attribute name="surfacicFieldsInGEOSX" type="groupNameRef_array" default="{}" />
<!--surfacicFieldsInGEOS => Names of the surfacic fields in GEOS to import into-->
<xsd:attribute name="surfacicFieldsInGEOS" type="groupNameRef_array" default="{}" />
<!--surfacicFieldsToImport => Surfacic fields to be imported from the external mesh file-->
<xsd:attribute name="surfacicFieldsToImport" type="groupNameRef_array" default="{}" />
<!--translate => Translate the coordinates of the vertices by a given vector (prior to scaling)-->
Expand Down
3 changes: 2 additions & 1 deletion src/pygeosx/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set( python_headers pygeosx.hpp )

set( python_sources pygeosx.cpp )

set( dependencyList ${extraComponentsLinkList} ${externalComponentsLinkList} Python3::Python )
set( dependencyList ${extraComponentsLinkList} ${externalComponentsLinkList} mainInterface Python3::Python )

blt_add_library( NAME pygeosx
SOURCES ${python_sources}
Expand All @@ -26,6 +26,7 @@ add_custom_command( TARGET pygeosx
COMMAND ln -sf ${CMAKE_BINARY_DIR}/lib/pylvarray.so ${CMAKE_BINARY_DIR}/lib/PYGEOSX/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/ )

target_include_directories( pygeosx PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
target_include_directories( pygeosx PUBLIC ${CMAKE_BINARY_DIR}/include )

geosx_add_code_checks( PREFIX pygeosx )

Expand Down

0 comments on commit c29a9f7

Please sign in to comment.