Fix the ice thermo tests. (#700)

# ModelComponent fix 3 Fixes #614 (partially, incrementally) --- # Change Description Add masking to the thermodynamics test. --- # Test Description The thermodynamics tests now pass.
nextsimhub · Sep 9, 2024 · 4906892 · 4906892
2 parents 3fe4b37 + e1fbd1a
commit 4906892
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/physics/test/ThermoIce0_test.cpp b/physics/test/ThermoIce0_test.cpp
@@ -147,10 +147,14 @@ TEST_CASE("Threshold ice")
 
     fluxData.setData(ModelState::DataMap());
 
+
     TimestepTime tst = { TimePoint("2000-01-01T00:00:00"), Duration(600) };
     ThermoIce0 ti0t;
     ti0t.configure();
     ti0t.setData(ModelState::DataMap());
+    HField mask(ModelArray::Type::H);
+    mask = 1;
+    ti0t.setOceanMask(mask);
     ti0t.update(tst);
 
     ModelArrayRef<Shared::H_ICE> hice(ModelComponent::getStore());

diff --git a/physics/test/ThermoWintonTemperature_test.cpp b/physics/test/ThermoWintonTemperature_test.cpp
@@ -119,6 +119,9 @@ TEST_CASE("Melting conditions")
     TimestepTime tst = { TimePoint("2000-001"), Duration("P0-0T0:10:0") };
 
     twin.configure();
+    HField mask(ModelArray::Type::H);
+    mask = 1;
+    twin.setOceanMask(mask);
     twin.update(tst);
     ModelArrayRef<Shared::T_ICE, RO> tice(ModelComponent::getStore());
     ModelArrayRef<Shared::Q_IC, RO> qic(ModelComponent::getStore());
@@ -225,6 +228,9 @@ TEST_CASE("Freezing conditions")
     TimestepTime tst = { TimePoint("2000-001"), Duration("P0-0T0:10:0") };
 
     twin.configure();
+    HField mask(ModelArray::Type::H);
+    mask = 1;
+    twin.setOceanMask(mask);
     twin.update(tst);
 
     ModelArrayRef<Shared::T_ICE, RO> tice(ModelComponent::getStore());
@@ -344,6 +350,9 @@ TEST_CASE("No ice do nothing")
     TimestepTime tst = { TimePoint("2000-001"), Duration("P0-0T0:10:0") };
 
     twin.configure();
+    HField mask(ModelArray::Type::H);
+    mask = 1;
+    twin.setOceanMask(mask);
     twin.update(tst);
 
     ModelArrayRef<Shared::H_ICE, RO> hice(ModelComponent::getStore());