Refactor tests to match new API

Author: ethan-pierce

basis/src/__pycache__/basis.cpython-310.pyc

@@ -474,7 +474,8 @@ def run_one_step(self, dt: float, erode = True, entrain = True, advect = True):
             self.entrain_sediment(dt)
 
         if advect:
-            self.advect_sediment(dt)
+            self.advect_fringe(dt)
+            self.advect_dispersed_layer(dt)
 
         self.time_elapsed += dt
 

basis/src/basis.py

@@ -31,6 +31,7 @@ till_grain_radius = 4e-5
 critical_depth = 10
 cluster_volume_fraction = 0.64
 initial_dispersed_concentration = 0.05
+numerical_diffusivity = 1e-7
 
 [inputs]
 [inputs.ice_thickness]

basis/test/__pycache__/test_basis.cpython-310-pytest-7.4.4.pyc

@@ -185,7 +185,7 @@ def test_entrain_sediment():
     BIS.entrain_sediment(1.0)
 
     assert_approx_equal(BIS.grid.at_node['till_thickness'][5], 5.0, significant=4)
-    assert_approx_equal(BIS.grid.at_node['fringe_thickness'][5], 0.001027, significant=4)
+    assert_approx_equal(BIS.grid.at_node['fringe_thickness'][5], 0.0007933, significant=4)
     assert_approx_equal(BIS.grid.at_node['dispersed_layer_thickness'][5], 1.188e-10, significant=4)
 
 def test_advect_sediment():
@@ -205,11 +205,12 @@ def test_advect_sediment():
 
     BIS.entrain_sediment(100.0)
 
-    BIS.advect_sediment(100.0)
+    BIS.advect_fringe(100.0)
+    BIS.advect_dispersed_layer(100.0)
 
-    assert_approx_equal(BIS.grid.at_node['till_thickness'][5], 4.999, significant=4)
-    assert_approx_equal(BIS.grid.at_node['fringe_thickness'][5], 0.003655, significant=4)
-    assert_approx_equal(BIS.grid.at_node['dispersed_layer_thickness'][5], 1.188e-8, significant=4)
+    assert_approx_equal(BIS.grid.at_node['till_thickness'][5], 5.021, significant=4)
+    assert_approx_equal(BIS.grid.at_node['fringe_thickness'][5], 1e-6, significant=4)
+    assert_approx_equal(BIS.grid.at_node['dispersed_layer_thickness'][5], 0.001, significant=4)
 
 def test_run_one_step():
     """Test that the model can rull all update routines together."""
@@ -229,5 +230,5 @@ def test_run_one_step():
     BIS.run_one_step(1.0)
 
     assert_approx_equal(BIS.grid.at_node['till_thickness'][5], 5.0, significant=4)
-    assert_approx_equal(BIS.grid.at_node['fringe_thickness'][5], 0.001027, significant=4)
-    assert_approx_equal(BIS.grid.at_node['dispersed_layer_thickness'][5], 1.188e-10, significant=4)
+    assert_approx_equal(BIS.grid.at_node['fringe_thickness'][5], 0.001067, significant=4)
+    assert_approx_equal(BIS.grid.at_node['dispersed_layer_thickness'][5], 0.001, significant=4)

basis/test/__pycache__/test_tvd_advection.cpython-310-pytest-7.4.4.pyc

@@ -61,14 +61,14 @@ def test_calc_flux_limiter(tvd):
 def test_calc_rate_of_change(tvd):
     tvd.calc_rate_of_change(tvd._grid, tvd._field, tvd._vel, 1.0)
 
-    assert_array_equal(tvd._grid.at_link['flux'][15], [5.0])
-    assert_array_equal(tvd._grid.at_link['flux'][24], [50.0])
-    assert_array_equal(tvd._grid.at_link['flux'][19], [5.0])
-    assert_array_equal(tvd._grid.at_link['flux'][20], [50.0])
+    assert_array_equal(tvd._grid.at_link['test_flux'][15], [5.0])
+    assert_array_equal(tvd._grid.at_link['test_flux'][24], [50.0])
+    assert_array_equal(tvd._grid.at_link['test_flux'][19], [5.0])
+    assert_array_equal(tvd._grid.at_link['test_flux'][20], [50.0])
 
-    assert_array_equal(tvd._grid.at_node['flux_div'][12], [-9.0])
-    assert_array_equal(tvd._grid.at_node['flux_div'][13], [4.5])
-    assert_array_equal(tvd._grid.at_node['flux_div'][17], [4.5])
+    assert_array_equal(tvd._grid.at_node['test_flux_div'][12], [9.0])
+    assert_array_equal(tvd._grid.at_node['test_flux_div'][13], [-4.5])
+    assert_array_equal(tvd._grid.at_node['test_flux_div'][17], [-4.5])
 
 def test_update(tvd):
     tvd.update(1.0)

basis/test/input_file.toml

@@ -20,6 +20,7 @@ cmcrameri = "^1.7"
 scikit-image = "^0.22.0"
 geopandas = "^0.14.0"
 rioxarray = "^0.15.0"
+pytest = "^7.4.4"
 
 
 [build-system]