From f8f0dd23b09881ddeccb56e4b62f6e1c2ad24574 Mon Sep 17 00:00:00 2001 From: Piotr Dziekan <pdziekanp@gmail.com> Date: Mon, 15 Jan 2024 12:17:00 +0100 Subject: [PATCH 1/3] record hostname --- CMakeLists.txt | 6 +++--- src/solvers/slvr_common.hpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab8a6ce7a8..35e73481f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,10 +133,10 @@ set_target_properties(uwlcm PROPERTIES CXX_EXTENSIONS OFF) target_compile_features(uwlcm PRIVATE cxx_std_14) # search for Boost -find_package(Boost COMPONENTS thread iostreams system timer program_options filesystem REQUIRED) -if(TARGET Boost::thread AND TARGET Boost::iostreams AND TARGET Boost::system AND TARGET Boost::timer AND TARGET Boost::program_options AND TARGET Boost::filesystem AND TARGET Boost::atomic AND TARGET Boost::regex) # atomic and regex are required by some other libs and boost was trying to link them via target although the target didnt exist +find_package(Boost COMPONENTS thread iostreams system timer program_options filesystem asio REQUIRED) +if(TARGET Boost::thread AND TARGET Boost::iostreams AND TARGET Boost::system AND TARGET Boost::timer AND TARGET Boost::program_options AND TARGET Boost::asio AND TARGET Boost::filesystem AND TARGET Boost::atomic AND TARGET Boost::regex) # atomic and regex are required by some other libs and boost was trying to link them via target although the target didnt exist message("linkiing boost targets") - target_link_libraries(uwlcm PRIVATE Boost::thread Boost::iostreams Boost::system Boost::timer Boost::program_options Boost::filesystem Boost::atomic Boost::regex) + target_link_libraries(uwlcm PRIVATE Boost::thread Boost::iostreams Boost::system Boost::timer Boost::program_options Boost::asio Boost::filesystem Boost::atomic Boost::regex) else() message("linkiing boost without targets") # we dont link using targets, because they are not set if there is some discrepancy between cmake and boost version diff --git a/src/solvers/slvr_common.hpp b/src/solvers/slvr_common.hpp index 757c937f0c..00105e862c 100644 --- a/src/solvers/slvr_common.hpp +++ b/src/solvers/slvr_common.hpp @@ -7,6 +7,7 @@ #include <libcloudph++/common/output.hpp> #include "../detail/get_uwlcm_git_revision.hpp" #include "../detail/ForceParameters.hpp" +#include <boost/asio/ip/host_name.hpp> struct smg_tag {}; struct iles_tag {}; @@ -106,6 +107,7 @@ class slvr_common : public slvr_dim<ct_params_t> std::string run_command; for(int i=0; i<ac; ++i) run_command += std::string(av[i]) + std::string(" "); + this->record_aux_const("hostname", "misc", boost::asio::ip::host_name()); this->record_aux_const("run command", "misc", run_command); this->record_aux_const("omp_max_threads (on MPI rank 0)", omp_get_max_threads()); this->record_aux_const("MPI compiler (true/false)", "MPI details", From 1a064ac6f856653f3dd22439ebf319aae204f745 Mon Sep 17 00:00:00 2001 From: Piotr Dziekan <pdziekanp@gmail.com> Date: Mon, 15 Jan 2024 12:25:20 +0100 Subject: [PATCH 2/3] dont look for boost::asio in cmake, its a header lib --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35e73481f9..ab8a6ce7a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,10 +133,10 @@ set_target_properties(uwlcm PROPERTIES CXX_EXTENSIONS OFF) target_compile_features(uwlcm PRIVATE cxx_std_14) # search for Boost -find_package(Boost COMPONENTS thread iostreams system timer program_options filesystem asio REQUIRED) -if(TARGET Boost::thread AND TARGET Boost::iostreams AND TARGET Boost::system AND TARGET Boost::timer AND TARGET Boost::program_options AND TARGET Boost::asio AND TARGET Boost::filesystem AND TARGET Boost::atomic AND TARGET Boost::regex) # atomic and regex are required by some other libs and boost was trying to link them via target although the target didnt exist +find_package(Boost COMPONENTS thread iostreams system timer program_options filesystem REQUIRED) +if(TARGET Boost::thread AND TARGET Boost::iostreams AND TARGET Boost::system AND TARGET Boost::timer AND TARGET Boost::program_options AND TARGET Boost::filesystem AND TARGET Boost::atomic AND TARGET Boost::regex) # atomic and regex are required by some other libs and boost was trying to link them via target although the target didnt exist message("linkiing boost targets") - target_link_libraries(uwlcm PRIVATE Boost::thread Boost::iostreams Boost::system Boost::timer Boost::program_options Boost::asio Boost::filesystem Boost::atomic Boost::regex) + target_link_libraries(uwlcm PRIVATE Boost::thread Boost::iostreams Boost::system Boost::timer Boost::program_options Boost::filesystem Boost::atomic Boost::regex) else() message("linkiing boost without targets") # we dont link using targets, because they are not set if there is some discrepancy between cmake and boost version From 507d3b466ac93afd0201f30768c39ae31d8c3c67 Mon Sep 17 00:00:00 2001 From: Piotr Dziekan <pdziekanp@gmail.com> Date: Wed, 31 Jan 2024 16:01:33 +0100 Subject: [PATCH 3/3] minor changes to moist_thermal blk_1m refdata, reasons unknown --- tests/moist_thermal/refdata/stats_blk_ens_1.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/moist_thermal/refdata/stats_blk_ens_1.txt b/tests/moist_thermal/refdata/stats_blk_ens_1.txt index a992a47eb6..d64ec0d5e8 100644 --- a/tests/moist_thermal/refdata/stats_blk_ens_1.txt +++ b/tests/moist_thermal/refdata/stats_blk_ens_1.txt @@ -5,9 +5,9 @@ blk_1m (0,10) [ 0 0 0 0 0 0 0 0 0 0 0 ] (0,10) -[ 0 842.513 917.064 1021.59 1133.5 1231.77 1304.93 1355.7 1399.55 1420.29 1412.15 ] +[ 0 842.513 917.063 1021.59 1133.5 1231.78 1304.91 1355.76 1399.75 1420.06 1412.81 ] (0,10) -[ 0 842.513 917.064 1021.59 1133.5 1231.77 1304.93 1355.7 1399.55 1420.29 1412.15 ] +[ 0 842.513 917.063 1021.59 1133.5 1231.78 1304.91 1355.76 1399.75 1420.06 1412.81 ] rc_avg blk_1m (0,10) @@ -15,9 +15,9 @@ blk_1m (0,10) [ 0 0 0 0 0 0 0 0 0 0 0 ] (0,10) -[ 0 0 0.192135 0.369521 0.533292 0.675522 0.737115 0.738637 0.66149 0.493945 0.376956 ] +[ 0 0 0.192136 0.369522 0.533303 0.675598 0.738208 0.740045 0.65895 0.494113 0.384123 ] (0,10) -[ 0 0 0.192135 0.369521 0.533292 0.675522 0.737115 0.738637 0.66149 0.493945 0.376956 ] +[ 0 0 0.192136 0.369522 0.533303 0.675598 0.738208 0.740045 0.65895 0.494113 0.384123 ] rc_std_dev blk_1m (0,10) @@ -25,9 +25,9 @@ blk_1m (0,10) [ 0 0 0 0 0 0 0 0 0 0 0 ] (0,10) -[ 0 0 0.0220711 0.0761175 0.153982 0.205269 0.273749 0.324464 0.326298 0.261709 0.223169 ] +[ 0 0 0.0220706 0.0761182 0.153964 0.205153 0.272817 0.323494 0.328416 0.262572 0.227212 ] (0,10) -[ 0 0 0.0220711 0.0761175 0.153982 0.205269 0.273749 0.324464 0.326298 0.261709 0.223169 ] +[ 0 0 0.0220706 0.0761182 0.153964 0.205153 0.272817 0.323494 0.328416 0.262572 0.227212 ] actconc_avg blk_1m (0,10) @@ -105,6 +105,6 @@ blk_1m (0,10) [ 0 0 0 0 0 0 0 0 0 0 0 ] (0,10) -[ 0 0 0.0231496 0.0246564 0.0257979 0.0255696 0.0256153 0.0239258 0.0213689 0.0188119 0.0115976 ] +[ 0 0 0.0231496 0.0246564 0.0257979 0.0255696 0.0255696 0.0238802 0.0214602 0.0189489 0.0116433 ] (0,10) -[ 0 0 0.0231496 0.0246564 0.0257979 0.0255696 0.0256153 0.0239258 0.0213689 0.0188119 0.0115976 ] +[ 0 0 0.0231496 0.0246564 0.0257979 0.0255696 0.0255696 0.0238802 0.0214602 0.0189489 0.0116433 ]