Skip to content

Commit 841b3cb

Browse files
csshermancssherman
committed
Resolving merge conflict
1 parent 1b250bb commit 841b3cb

File tree

4 files changed

+86
-12
lines changed

4 files changed

+86
-12
lines changed

‎inputFiles/solidMechanics/beamBending.ats‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,14 @@ decks = [
3131
partitions=partitions,
3232
restart_step=0,
3333
check_step=1,
34-
restartcheck_params=restartcheck_params)
34+
restartcheck_params=restartcheck_params),
35+
TestDeck(name="beamBending_expect_failure",
36+
description="Tests failure check.",
37+
partitions=((1, 1, 1),),
38+
restart_step=0,
39+
check_step=1,
40+
restartcheck_params=restartcheck_params,
41+
curvecheck_params=curvecheck_params)
3542
]
3643

3744
generate_geos_tests(decks)

‎inputFiles/solidMechanics/beamBending_expect_failure.xml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" ?>
2+
3+
<Problem>
4+
5+
<Included>
6+
<File name="./beamBending_base.xml"/>
7+
</Included>
8+
9+
<!-- SPHINX_Gravity -->
10+
<Solvers
11+
gravityVector="{ 0.0, 0.0, 0.0 }">
12+
<!-- SPHINX_GravityEnd -->
13+
<!-- SPHINX_SolidMechanicsSolver -->
14+
<SolidMechanicsLagrangianSSLE
15+
name="incorrectSolverName"
16+
timeIntegrationOption="QuasiStatic"
17+
discretization="FE1"
18+
targetRegions="{ mesh1/Region2 }"
19+
>
20+
<!-- SPHINX_SolidMechanicsSolverEnd -->
21+
<NonlinearSolverParameters
22+
newtonTol="1.0e-6"
23+
newtonMaxIter="8"/>
24+
<LinearSolverParameters
25+
directParallel="0"/>
26+
</SolidMechanicsLagrangianSSLE>
27+
</Solvers>
28+
29+
<!-- SPHINX_FEDiscretization -->
30+
<NumericalMethods>
31+
<FiniteElements>
32+
<FiniteElementSpace
33+
name="FE1"
34+
order="1"/>
35+
</FiniteElements>
36+
</NumericalMethods>
37+
38+
<!-- SPHINX_FEDiscretizationEnd -->
39+
40+
<!-- SPHINX_BeamBendingMesh -->
41+
<Mesh>
42+
<InternalMesh
43+
name="mesh1"
44+
elementTypes="{ C3D8 }"
45+
xCoords="{ 0, 80 }"
46+
yCoords="{ 0, 8 }"
47+
zCoords="{ 0, 4 }"
48+
nx="{ 80 }"
49+
ny="{ 8 }"
50+
nz="{ 4 }"
51+
cellBlockNames="{ cb1 }"/>
52+
</Mesh>
53+
54+
</Problem>

‎scripts/ci_build_and_test_in_container.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,9 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
302302
if grep -q "Overall status: PASSED" "$tempdir/log_check.txt"; then
303303
echo "IntegratedTests passed. No rebaseline required."
304304
INTEGRATED_TEST_EXIT_STATUS=0
305+
elif grep -q "Overall status: FAIL RUN" "$tempdir/log_check.txt"; then
306+
echo "Some integratedTests failed to run. Skipping rebaseline process."
307+
INTEGRATED_TEST_EXIT_STATUS=1
305308
else
306309
echo "IntegratedTests failed. Rebaseline is required."
307310

‎src/CMakeLists.txt‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ install( DIRECTORY ${PROJECT_BINARY_DIR}/include DESTINATION . )
106106
# Generate version information
107107
################################
108108
include( cmake/GeosxVersion.cmake )
109-
message( STATUS "Configuring GEOSX version ${GEOS_VERSION_FULL}" )
109+
message( STATUS "Configuring GEOSX version ${GEOSX_VERSION_FULL}" )
110110

111111

112112
################################
@@ -127,25 +127,35 @@ if( ENABLE_CUDA )
127127
list( APPEND extraComponentsLinkList cuda )
128128
endif()
129129

130-
if( ENABLE_CUDA AND ENABLE_CUDA_NVTOOLSEXT )
130+
if( ENABLE_CUDA_NVTOOLSEXT )
131131
list( APPEND extraComponentsLinkList CUDA::nvToolsExt )
132132
endif()
133133

134134
if( ENABLE_HIP )
135135
list( APPEND extraComponentsLinkList blt::hip )
136136
endif()
137137

138+
if ( GEOSX_BUILD_SHARED_LIBS )
139+
list( APPEND extraComponentsLinkList geosx_core )
140+
else()
141+
list( APPEND extraComponentsLinkList ${geosx_core_libs} )
142+
endif()
143+
138144
blt_add_executable( NAME geosx
139145
SOURCES main/main.cpp
140-
DEPENDS_ON geosx_core
141-
${extraComponentsLinkList}
146+
DEPENDS_ON ${extraComponentsLinkList}
142147
${externalComponentsLinkList} )
143148

144149
# Seems to be required on some CMake versions (e.g. 3.16) to get enforce device linking
145150
if( ${ENABLE_HYPRE_DEVICE} STREQUAL "CUDA" )
146151
set_target_properties( geosx PROPERTIES CUDA_RESOLVE_DEVICE_SYMBOLS TRUE )
147152
endif()
148153

154+
# Removing all transitive link dependencies from geosx_core target to circumvent
155+
# the BLT behavior which imposes all dependencies to be public
156+
#set_target_properties(geosx_core PROPERTIES INTERFACE_LINK_LIBRARIES "")
157+
158+
target_include_directories( geosx PUBLIC ${CMAKE_SOURCE_DIR}/coreComponents )
149159

150160
# To change the runtime path during installation
151161
set_target_properties( geosx PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" )
@@ -211,7 +221,7 @@ add_custom_target( geosx_generate_install_schema
211221
COMMENT "Generating XML schema to install"
212222
)
213223

214-
if( NOT GEOS_INSTALL_SCHEMA )
224+
if( NOT GEOSX_INSTALL_SCHEMA )
215225
set_target_properties(geosx_generate_install_schema PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
216226
endif()
217227

@@ -222,8 +232,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd
222232
################################
223233
# Add python environment setup
224234
################################
225-
# message(WARNING "Temporarily changing the geosPythonBranch to feature/packaging")
226-
# set(GEOS_PYTHON_PACKAGES_BRANCH "feature/packaging" CACHE STRING "" FORCE)
235+
message(WARNING "Temporarily changing the geosPythonBranch to feature/sherman/skipRebaselineFailRun")
236+
set(GEOS_PYTHON_PACKAGES_BRANCH "feature/sherman/skipRebaselineFailRun" CACHE STRING "" FORCE)
227237

228238

229239
if ( Python3_EXECUTABLE )
@@ -255,19 +265,19 @@ if ( Python3_EXECUTABLE )
255265
set(GEOS_PYTHON_PACKAGES_BRANCH "main" CACHE STRING "" FORCE)
256266
endif()
257267

258-
set( GEOS_PYTHON_TOOLS_BINS
268+
set( GEOSX_PYTHON_TOOLS_BINS
259269
"${CMAKE_BINARY_DIR}/bin/preprocess_xml"
260270
"${CMAKE_BINARY_DIR}/bin/format_xml" )
261271

262-
add_custom_command( OUTPUT ${GEOS_PYTHON_TOOLS_BINS}
272+
add_custom_command( OUTPUT ${GEOSX_PYTHON_TOOLS_BINS}
263273
COMMAND bash ${CMAKE_SOURCE_DIR}/../scripts/setupPythonEnvironment.bash -p ${PYTHON_POST_EXECUTABLE} -b ${CMAKE_BINARY_DIR}/bin --python-pkg-branch ${GEOS_PYTHON_PACKAGES_BRANCH}
264274
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
265275

266276
add_custom_target( geosx_python_tools
267-
DEPENDS ${GEOS_PYTHON_TOOLS_BINS} )
277+
DEPENDS ${GEOSX_PYTHON_TOOLS_BINS} )
268278

269279
add_custom_target( geosx_python_tools_clean
270-
COMMAND rm ${GEOS_PYTHON_TOOLS_BINS} )
280+
COMMAND rm ${GEOSX_PYTHON_TOOLS_BINS} )
271281

272282
add_custom_target( geosx_python_tools_test
273283
COMMAND ${CMAKE_BINARY_DIR}/python/geosx/bin/test_geosx_xml_tools

0 commit comments

Comments
 (0)