diff --git a/appl/coupling-ff-pm/fvca-monolithic-reversed/run-monolithic-simulations.sh b/appl/coupling-ff-pm/fvca-monolithic-reversed/run-monolithic-simulations.sh index 929628b40c32073d59baf475fa915d287ebb02b4..9c16fe150ec048fec515844fbc139e50da760146 100755 --- a/appl/coupling-ff-pm/fvca-monolithic-reversed/run-monolithic-simulations.sh +++ b/appl/coupling-ff-pm/fvca-monolithic-reversed/run-monolithic-simulations.sh @@ -25,6 +25,10 @@ inputTemplate="fvca-monolithic-base.input" #configurations="configs-${testcase}.txt" +# Initial clean up + +rm -f *.csv *.pvd *.vtu *.log *.txt + #echo "" > ${configurations} basedir="${PWD}" for hasInertiaTerms in "${hasInertiaTerms[@]}"; do @@ -44,10 +48,6 @@ for hasInertiaTerms in "${hasInertiaTerms[@]}"; do # Generate name of test case and create directories casename="${flowProblemName}-${mesh}-${alpha}-${permeability}-${dp}" echo "${casename}" - mkdir -p "${casename}" - cd ${casename} -# ln -s "../${solver}" "${solver}" - cp "../${solver}" . # Setting up input file inputFile="${casename}.input" @@ -58,7 +58,7 @@ for hasInertiaTerms in "${hasInertiaTerms[@]}"; do -e "s/ALPHA/${alpha}/g" \ -e "s/HASINERTIATERMS/${hasInertiaTerms}/g" \ -e "s/CASENAME/${casename}/g" \ - "../${inputTemplate}" > ${inputFile} + "${inputTemplate}" > ${inputFile} # Running simulation solverCmd="./${solver} ${inputFile}" @@ -68,6 +68,18 @@ for hasInertiaTerms in "${hasInertiaTerms[@]}"; do $(time ./${solver} "${inputFile}" > solver.log) # $(./${solverCmd} ${inputFile} > solver.log) + + mkdir -p "${casename}" + mv *.csv ${casename} + mv *.vtu ${casename} + mv *.pvd ${casename} + mv *.log ${casename} + mv *.txt ${casename} + mv "${inputFile}" ${casename} + #cd ${casename} +# ln -s "../${solver}" "${solver}" + #cp "../${solver}" . + # Go back to root dir cd "${basedir}" done diff --git a/appl/coupling-ff-pm/iterative-reversed/main_ff-reversed.cc b/appl/coupling-ff-pm/iterative-reversed/main_ff-reversed.cc index ded656b0fb633c1083349072cab02989dd2512b9..5e53fca3303e426748b900b7af7a362da672c5da 100644 --- a/appl/coupling-ff-pm/iterative-reversed/main_ff-reversed.cc +++ b/appl/coupling-ff-pm/iterative-reversed/main_ff-reversed.cc @@ -484,6 +484,18 @@ int main(int argc, char** argv) try << " max: " << max << std::endl << " sum: " << sum << std::endl; std::cout.precision( prec ); + { + const std::string filenameFlow="free-flow-statistics.txt"; + std::ofstream ofs( filenameFlow+".txt", std::ofstream::out | std::ofstream::trunc); + const auto prec = ofs.precision(); + ofs << "Velocity statistics (free flow):" << std::endl + << std::setprecision(std::numeric_limits<double>::digits10 + 1) + << " min: " << min << std::endl + << " max: " << max << std::endl + << " sum: " << sum << std::endl; + ofs.precision( prec ); + ofs.close(); + } } { const std::string filename = getParam<std::string>("Problem.Name") + "-" + freeFlowProblem->name() + "-interface-pressure"; diff --git a/appl/coupling-ff-pm/iterative-reversed/main_pm-reversed.cc b/appl/coupling-ff-pm/iterative-reversed/main_pm-reversed.cc index cbdcd05fb2e0b400111a2ba98acc765fbbc219c2..b8b26bedff43b18ee3d3e49f33b309e473f3b0fd 100644 --- a/appl/coupling-ff-pm/iterative-reversed/main_pm-reversed.cc +++ b/appl/coupling-ff-pm/iterative-reversed/main_pm-reversed.cc @@ -520,6 +520,18 @@ int main(int argc, char** argv) try << " max: " << max << std::endl << " sum: " << sum << std::endl; std::cout.precision( prec ); + { + const std::string filenameFlow="darcy-statistics.txt"; + std::ofstream ofs( filenameFlow+".txt", std::ofstream::out | std::ofstream::trunc); + const auto prec = ofs.precision(); + ofs << "Velocity statistics (free flow):" << std::endl + << std::setprecision(std::numeric_limits<double>::digits10 + 1) + << " min: " << min << std::endl + << " max: " << max << std::endl + << " sum: " << sum << std::endl; + ofs.precision( prec ); + ofs.close(); + } } { const std::string filename = getParam<std::string>("Problem.Name") + "-" + darcyProblem->name() + "-interface-pressure";