From 54a1056832fc840135da42a66a4ab81ff64a79d4 Mon Sep 17 00:00:00 2001 From: Tim Spain Date: Thu, 22 Aug 2024 11:46:04 +0200 Subject: [PATCH 1/2] Reverse the order of thermodynamics and dynamics in PrognosticData. --- core/src/PrognosticData.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/core/src/PrognosticData.cpp b/core/src/PrognosticData.cpp index 9ac0b146e..924adcb21 100644 --- a/core/src/PrognosticData.cpp +++ b/core/src/PrognosticData.cpp @@ -81,18 +81,15 @@ void PrognosticData::update(const TimestepTime& tst) pOcnBdy->updateBefore(tst); pAtmBdy->update(tst); - // Fill the values of the true ice and snow thicknesses. - iceGrowth.initializeThicknesses(); - // Fill the updated ice temperature array - ticeUpd.data().setData(m_tice); - pDynamics->update(tst); - updatePrognosticFields(); - // Take the updated values of the true ice and snow thicknesses, and reset hice0 and hsnow0 // IceGrowth updates its own fields during update iceGrowth.update(tst); updatePrognosticFields(); + pDynamics->update(tst); + + updatePrognosticFields(); + pOcnBdy->updateAfter(tst); } From 732c7eca4adb609ae05920b721d1ee9c1099fab7 Mon Sep 17 00:00:00 2001 From: Tim Spain Date: Fri, 23 Aug 2024 11:08:49 +0200 Subject: [PATCH 2/2] Add explicit specialization of the base class to module.cpp --- scripts/module_builder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/module_builder.py b/scripts/module_builder.py index f779f3076..9ad600a1d 100644 --- a/scripts/module_builder.py +++ b/scripts/module_builder.py @@ -101,6 +101,8 @@ def write_source_file(source, config, strings): {{ addToConfiguredModules<{strings[class_name]}, {strings[module_class_name]}>(); }} + +template class {module_templ}; """) source.write(""" } /* namespace Module */