Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions scripts/ci_build_and_test_in_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,7 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then

echo "Running integrated tests..."
integratedTests/geos_ats.sh --baselineCacheDirectory /tmp/geos/baselines
tar -czf ${DATA_EXCHANGE_DIR}/test_logs_${DATA_BASENAME_WE}.tar.gz integratedTests/TestResults


echo "Checking results..."
bin/geos_ats_log_check integratedTests/TestResults/test_results.ini -y ${GEOS_SRC_DIR}/.integrated_tests.yaml &> $tempdir/log_check.txt
cat $tempdir/log_check.txt
Expand All @@ -316,6 +315,10 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
else
echo "IntegratedTests failed. Rebaseline is required."

# process integratedTests failures
echo "Processing logs..."
bin/geos_ats_process_tests_fails --directory integratedTests/TestResults &> integratedTests/TestResults/processedTestsLogs.txt

# Rebaseline and pack into an archive
echo "Rebaselining..."
integratedTests/geos_ats.sh -a rebaselinefailed
Expand All @@ -325,6 +328,9 @@ if [[ "${RUN_INTEGRATED_TESTS}" = true ]]; then
INTEGRATED_TEST_EXIT_STATUS=1
fi

echo "Packing logs..."
tar -czf ${DATA_EXCHANGE_DIR}/test_logs_${DATA_BASENAME_WE}.tar.gz integratedTests/TestResults

echo "Done!"

# INTEGRATED_TEST_EXIT_STATUS=$?
Expand Down
1 change: 0 additions & 1 deletion scripts/pygeosx_preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ def run_problem():
while pygeosx.run() != pygeosx.COMPLETED:
pass


if __name__ == '__main__':
run_problem()
1 change: 1 addition & 0 deletions scripts/setupPythonEnvironment.bash
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ declare -a LINK_SCRIPTS=("preprocess_xml"
"geos_ats_log_check"
"geos_ats_restart_check"
"geos_ats_curve_check"
"geos_ats_process_tests_fails"
"mesh-doctor"
"activate"
"python")
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd
################################
# Add python environment setup
################################
# message(WARNING "Temporarily changing the geosPythonBranch to bugfix/sherman/fixNumpyProd")
# set(GEOS_PYTHON_PACKAGES_BRANCH "bugfix/sherman/fixNumpyProd" CACHE STRING "" FORCE)
message(WARNING "Temporarily changing the geosPythonBranch to cusini/addFailedTestsLogProcessing")
set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/addFailedTestsLogProcessing" CACHE STRING "" FORCE)


if ( Python3_EXECUTABLE )
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ FlowSolverBase::FlowSolverBase( string const & name,
setApplyDefaultValue( 0.1 ).
setDescription( "Maximum (absolute) temperature change in a sequential iteration, used for outer loop convergence check" );

this->registerWrapper( "testingTheLogs", m_testLog ).
setSizedFromParent( 0 ).
setApplyDefaultValue( "Testing" ).
setInputFlag( InputFlags::OPTIONAL ).
setDescription( "Testing logs parsing and diff filtering." );

// allow the user to select a norm
getNonlinearSolverParameters().getWrapper< physicsSolverBaseKernels::NormType >( NonlinearSolverParameters::viewKeysStruct::normTypeString() ).setInputFlag( InputFlags::OPTIONAL );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@ class FlowSolverBase : public PhysicsSolverBase
real64 m_sequentialTempChange;
real64 m_maxSequentialTempChange;

// MATTEO: testing logs parsing
string m_testLog;

/**
* @brief Class used for displaying boundary warning message
*/
Expand Down
Loading