Skip to content

Commit

Permalink
build: update Mathpresso (#3360)
Browse files Browse the repository at this point in the history
* update GEOS_TPL_TAG. Update version tag. enable mathpresso on osx. enable xml tools on osx

* runs on ruby with new LC path and new schema modifications from a previous contribution

* update LvArray hash. Move geosx_docs inside schema generation guard
  • Loading branch information
rrsettgast authored Sep 20, 2024
1 parent 1616ea4 commit 08d5eeb
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"build": {
"dockerfile": "Dockerfile",
"args": {
"GEOS_TPL_TAG": "257-513"
"GEOS_TPL_TAG": "284-535"
}
},
"runArgs": [
Expand Down
2 changes: 1 addition & 1 deletion host-configs/apple/macOS_base.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set( LAPACK_LIBRARIES ${HOMEBREW_DIR}/opt/lapack/lib/liblapack.dylib CACHE PATH

set(ENABLE_DOXYGEN ON CACHE BOOL "" FORCE)
set(ENABLE_SPHINX ON CACHE BOOL "" FORCE)
set(ENABLE_MATHPRESSO OFF CACHE BOOL "" FORCE )
set(ENABLE_MATHPRESSO ON CACHE BOOL "" FORCE )

set(GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)

Expand Down
12 changes: 5 additions & 7 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ install( FILES ${CMAKE_INSTALL_PREFIX}/bin/geosx
RENAME geos
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )

if( ENABLE_XML_UPDATES AND ENABLE_MPI AND UNIX AND NOT CMAKE_HOST_APPLE AND NOT ENABLE_CUDA AND NOT ENABLE_HIP )
if( ENABLE_XML_UPDATES AND ENABLE_MPI AND UNIX AND NOT ENABLE_CUDA AND NOT ENABLE_HIP )

set(SCHEMA_DIR ${CMAKE_SOURCE_DIR}/coreComponents/schema)
set(SCRIPT_DIR ${CMAKE_SOURCE_DIR}/../scripts)
Expand Down Expand Up @@ -184,18 +184,16 @@ if( ENABLE_XML_UPDATES AND ENABLE_MPI AND UNIX AND NOT CMAKE_HOST_APPLE AND NOT
DEPENDS geosx_generate_schema
COMMENT "Validating all XML files in the repository against the schema"
)
if( SPHINX_FOUND )
blt_add_sphinx_target( geosx_docs )
add_dependencies( geosx_docs geosx_build_datastructure_tables )
endif()
endif()

if( ENABLE_PYGEOSX )
add_subdirectory( pygeosx )
endif()

if( SPHINX_FOUND )
blt_add_sphinx_target( geosx_docs )
add_dependencies( geosx_docs geosx_build_datastructure_tables )
endif()


install( DIRECTORY ../examples/
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}/examples )

Expand Down
2 changes: 1 addition & 1 deletion src/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION_ID = v1.0.1
VERSION_ID = v1.1.0
6 changes: 3 additions & 3 deletions src/coreComponents/schema/schema.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -2851,7 +2851,7 @@ Equal to 1 for surface conditions, and to 0 for reservoir conditions-->
<xsd:attribute name="sourceCoordinates" type="real64_array2d" default="{{0}}" />
<!--sourceForce => Force of the source: 3 real values for a vector source, and 6 real values for a tensor source (in Voigt notation).The default value is { 0, 0, 0 } (no net force).-->
<xsd:attribute name="sourceForce" type="R1Tensor" default="{0,0,0}" />
<!--sourceMoment => Moment of the source: 6 real values describing a symmetric tensor in Voigt notation.The default value is { 1, 1, 1, 0, 0, 0 } (diagonal moment, corresponding to a pure explosion).-->
<!--sourceMoment => Moment of the source: 6 real values describing a symmetric tensor in Voigt notation.The default value is { 1, 1, 1, 0, 0, 0 } (diagonal moment, corresponding to a seismic charge).-->
<xsd:attribute name="sourceMoment" type="R2SymTensor" default="{1,1,1,0,0,0}" />
<!--targetRegions => Allowable regions that the solver may be applied to. Note that this does not indicate that the solver will be applied to these regions, only that allocation will occur such that the solver may be applied to these regions. The decision about what regions this solver will beapplied to rests in the EventManager.-->
<xsd:attribute name="targetRegions" type="groupNameRef_array" use="required" />
Expand Down Expand Up @@ -3213,11 +3213,11 @@ Local- Add jump stabilization on interior of macro elements-->
<xsd:element name="LinearSolverParameters" type="LinearSolverParametersType" maxOccurs="1" />
<xsd:element name="NonlinearSolverParameters" type="NonlinearSolverParametersType" maxOccurs="1" />
</xsd:choice>
<!--backgroundStressingRate => Background stressing rate-->
<!--backgroundStressingRate => Background stressing rate (Pa/s).-->
<xsd:attribute name="backgroundStressingRate" type="real64" use="required" />
<!--cflFactor => Factor to apply to the `CFL condition <http://en.wikipedia.org/wiki/Courant-Friedrichs-Lewy_condition>`_ when calculating the maximum allowable time step. Values should be in the interval (0,1] -->
<xsd:attribute name="cflFactor" type="real64" default="0.5" />
<!--directEffect => Rate-and-state friction direct effect parameter-->
<!--directEffect => Rate-and-state friction direct effect parameter.-->
<xsd:attribute name="directEffect" type="real64" use="required" />
<!--faultNormalDirection => Fault normal direction-->
<xsd:attribute name="faultNormalDirection" type="R1Tensor" default="{0,0,0}" />
Expand Down

0 comments on commit 08d5eeb

Please sign in to comment.