From 45ecee80d22e5af6fffa2243e93eba09b44d8e10 Mon Sep 17 00:00:00 2001 From: "clara.bayley" Date: Mon, 27 May 2024 16:36:53 +0200 Subject: [PATCH 1/2] chore: rename files --- libs/observers/sdmmonitor/CMakeLists.txt | 2 +- ...densation_observer.cpp => monitor_condensation.cpp} | 6 +++--- ...densation_observer.hpp => monitor_condensation.hpp} | 10 +++++----- src/main_impl.hpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) rename libs/observers/sdmmonitor/{condensation_observer.cpp => monitor_condensation.cpp} (93%) rename libs/observers/sdmmonitor/{condensation_observer.hpp => monitor_condensation.hpp} (92%) diff --git a/libs/observers/sdmmonitor/CMakeLists.txt b/libs/observers/sdmmonitor/CMakeLists.txt index 887bd8b9..78bd0fb5 100644 --- a/libs/observers/sdmmonitor/CMakeLists.txt +++ b/libs/observers/sdmmonitor/CMakeLists.txt @@ -12,7 +12,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) # Add executables and create library target set(SOURCES - "condensation_observer.cpp" + "monitor_condensation.cpp" ) # must use STATIC (not(!) SHARED) lib for linking to executable if build is CUDA enabled with Kokkos add_library("${LIBNAME}" STATIC ${SOURCES}) diff --git a/libs/observers/sdmmonitor/condensation_observer.cpp b/libs/observers/sdmmonitor/monitor_condensation.cpp similarity index 93% rename from libs/observers/sdmmonitor/condensation_observer.cpp rename to libs/observers/sdmmonitor/monitor_condensation.cpp index 7892174e..c4a5c18f 100644 --- a/libs/observers/sdmmonitor/condensation_observer.cpp +++ b/libs/observers/sdmmonitor/monitor_condensation.cpp @@ -3,13 +3,13 @@ * * * ----- CLEO ----- - * File: condensation_observer.cpp + * File: monitor_condensation.cpp * Project: sdmmonitor * Created Date: Wednesday 8th May 2024 * Author: Clara Bayley (CB) * Additional Contributors: * ----- - * Last Modified: Saturday 25th May 2024 + * Last Modified: Monday 27th May 2024 * Modified By: CB * ----- * License: BSD 3-Clause "New" or "Revised" License @@ -19,7 +19,7 @@ * functionality to monitor condensation SDM microphysical process */ -#include "./condensation_observer.hpp" +#include "./monitor_condensation.hpp" /** * @brief Parallel loop to fill d_data with zero value. diff --git a/libs/observers/sdmmonitor/condensation_observer.hpp b/libs/observers/sdmmonitor/monitor_condensation.hpp similarity index 92% rename from libs/observers/sdmmonitor/condensation_observer.hpp rename to libs/observers/sdmmonitor/monitor_condensation.hpp index 63e3d616..6b931cf8 100644 --- a/libs/observers/sdmmonitor/condensation_observer.hpp +++ b/libs/observers/sdmmonitor/monitor_condensation.hpp @@ -3,13 +3,13 @@ * * * ----- CLEO ----- - * File: condensation_observer.hpp + * File: monitor_condensation.hpp * Project: sdmmonitor * Created Date: Wednesday 8th May 2024 * Author: Clara Bayley (CB) * Additional Contributors: * ----- - * Last Modified: Saturday 25th May 2024 + * Last Modified: Monday 27th May 2024 * Modified By: CB * ----- * License: BSD 3-Clause "New" or "Revised" License @@ -20,8 +20,8 @@ * microphysical process in each gridbox a constant interval at the start of each timestep. */ -#ifndef LIBS_OBSERVERS_SDMMONITOR_CONDENSATION_OBSERVER_HPP_ -#define LIBS_OBSERVERS_SDMMONITOR_CONDENSATION_OBSERVER_HPP_ +#ifndef LIBS_OBSERVERS_SDMMONITOR_MONITOR_CONDENSATION_HPP_ +#define LIBS_OBSERVERS_SDMMONITOR_MONITOR_CONDENSATION_HPP_ #include #include @@ -93,4 +93,4 @@ inline Observer auto CondensationObserver(const unsigned int interval, Dataset Date: Mon, 27 May 2024 16:59:00 +0200 Subject: [PATCH 2/2] chore: renaming --- libs/observers/sdmmonitor/monitor_condensation.cpp | 4 ++-- libs/observers/sdmmonitor/monitor_condensation.hpp | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libs/observers/sdmmonitor/monitor_condensation.cpp b/libs/observers/sdmmonitor/monitor_condensation.cpp index c4a5c18f..26f59bac 100644 --- a/libs/observers/sdmmonitor/monitor_condensation.cpp +++ b/libs/observers/sdmmonitor/monitor_condensation.cpp @@ -35,8 +35,8 @@ void MonitorCondensation::reset_monitor() const { * * Add totmass_condensed to current value for mass condensed since d_data was last reset. * - * _Note:_ conversion of mass condensed at one timestep from double precision (8 bytes double) to - * single precision (4 bytes float) in output. + * _Note:_ possible conversion of mass condensed at one timestep from double precision + * (8 bytes double) to single precision (4 bytes float) in output depending on datatype alias. * * @param team_member Kokkkos team member in TeamPolicy parallel loop over gridboxes * @param totmass_condensed Mass condensed in one gridbox during one microphysical timestep diff --git a/libs/observers/sdmmonitor/monitor_condensation.hpp b/libs/observers/sdmmonitor/monitor_condensation.hpp index 6b931cf8..5499dede 100644 --- a/libs/observers/sdmmonitor/monitor_condensation.hpp +++ b/libs/observers/sdmmonitor/monitor_condensation.hpp @@ -47,8 +47,8 @@ struct MonitorCondensation { * * Add totmass_condensed to current value for mass condensed since d_data was last reset. * - * _Note:_ conversion of mass condensed at one timestep from double precision (8 bytes double) to - * single precision (4 bytes float) in output. + * _Note:_ possible conversion of mass condensed at one timestep from double precision + * (8 bytes double) to single precision (4 bytes float) in output depending on datatype alias. * * @param team_member Kokkkos team member in TeamPolicy parallel loop over gridboxes * @param totmass_condensed Mass condensed in one gridbox during one microphysical timestep @@ -79,17 +79,16 @@ struct MonitorCondensation { template inline Observer auto CondensationObserver(const unsigned int interval, Dataset& dataset, const size_t maxchunk, const size_t ngbxs) { + using Mo = MonitorCondensation; const auto name = std::string_view("massdelta_cond"); const auto units = std::string_view("g"); constexpr auto scale_factor = dlc::MASS0grams; const auto chunkshape = good2Dchunkshape(maxchunk, ngbxs); const auto dimnames = std::vector{"time", "gbxindex"}; - const auto xzarr_ptr = std::make_shared>( - dataset.template create_array(name, units, scale_factor, - chunkshape, dimnames)); + const auto xzarr_ptr = std::make_shared>( + dataset.template create_array(name, units, scale_factor, chunkshape, dimnames)); - const auto do_obs = DoSDMMonitorObs( - dataset, xzarr_ptr, MonitorCondensation(ngbxs)); + const auto do_obs = DoSDMMonitorObs(dataset, xzarr_ptr, Mo(ngbxs)); return ConstTstepObserver(interval, do_obs); }