Merge pull request #3472 from CliMA/zs/conservation

lower conservation error threshold

examples/hybrid/driver.jl

@@ -127,19 +127,9 @@ if config.parsed_args["check_conservation"]
     @info "    Net mass change / total mass: $mass_conservation"
     @info "    Net water change / total water: $water_conservation"
 
-    sfc = p.atmos.surface_model
-
-    if CA.has_no_source_or_sink(config.parsed_args)
-        @test energy_conservation ≈ 0 atol = 50 * eps(FT)
-        @test mass_conservation ≈ 0 atol = 50 * eps(FT)
-        @test water_conservation ≈ 0 atol = 50 * eps(FT)
-    else
-        @test energy_conservation ≈ 0 atol = sqrt(eps(FT))
-        @test mass_conservation ≈ 0 atol = sqrt(eps(FT))
-        if sfc isa CA.PrognosticSurfaceTemperature
-            @test water_conservation ≈ 0 atol = sqrt(eps(FT))
-        end
-    end
+    @test energy_conservation ≈ 0 atol = 100 * eps(FT)
+    @test mass_conservation ≈ 0 atol = 100 * eps(FT)
+    @test water_conservation ≈ 0 atol = 100 * eps(FT)
 end
 
 # Visualize the solution

src/utils/utilities.jl

@@ -16,13 +16,6 @@ is_tracer_var(symbol) = !(
     is_turbconv_var(symbol)
 )
 
-has_no_source_or_sink(parsed_args) = all((
-    isnothing(parsed_args["forcing"]),
-    parsed_args["vert_diff"] == "false",
-    isnothing(parsed_args["turbconv"]),
-    isnothing(parsed_args["precip_model"]),
-))
-
 # we may be hitting a slow path:
 # https://stackoverflow.com/questions/14687665/very-slow-stdpow-for-bases-very-close-to-1
 fast_pow(x, y) = exp(y * log(x))