made precipation tests compatible with coupled transport

firedrakeproject · Aug 8, 2023 · f70f4d4 · f70f4d4
1 parent a3c5e7b
commit f70f4d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/integration-tests/equations/test_forced_advection.py b/integration-tests/equations/test_forced_advection.py
@@ -58,7 +58,6 @@ def run_forced_advection(tmpdir):
     physics_parametrisations = [InstantRain(meqn, msat, rain_name="rain",
                                             parameters=None)]
 
-
     # I/O
     output = OutputParameters(dirname=str(tmpdir), dumpfreq=1)
     diagnostic_fields = [CourantNumber()]

diff --git a/integration-tests/physics/test_precipitation.py b/integration-tests/physics/test_precipitation.py
@@ -30,11 +30,15 @@ def setup_fallout(dirname):
     domain = Domain(mesh, dt, "CG", 1)
     x = SpatialCoordinate(mesh)
 
+    # Define the tracers
+    rho = ActiveTracer(name='rho', space='DG1_equispaced', variable_type=TracerVariableType.density)
+    rain = Rain(space='DG1_equispaced')
+
+    Vu = domain.spaces("HDiv")
+
     # Equation
-    Vrho = domain.spaces("DG1_equispaced")
-    active_tracers = [Rain(space='DG1_equispaced')]
-    eqn = CoupledTransportEquation(domain, Vrho, "rho", active_tracers=active_tracers)
-    transport_method = DGUpwind(eqn, "rho")
+    eqn = CoupledTransportEquation(domain, active_tracers=[rho, rain], Vu=Vu)
+    transport_method = [DGUpwind(eqn, "rho"), DGUpwind(eqn, "rain")]
 
     # I/O
     output = OutputParameters(dirname=dirname+"/fallout", dumpfreq=10, dumplist=['rain'])