Merge pull request #677 from CliMA/kd_js_gb/rm_norm

conv checker
CliMA · Jun 26, 2024 · 4bc5337 · 4bc5337
2 parents 44e201a + e7c009a
commit 4bc5337
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -5,6 +5,7 @@ main
 --------
 Improve Performance of soil canopy model
 - PR [#666]
+- PR [#677] Remove norm condition
 Add base global soil canopy run to benchmark and experiments
 - PR [#591] adds benchmark run
 - PR [#669] adds topmodel runoff

diff --git a/docs/tutorials/standalone/Soil/layered_soil.jl b/docs/tutorials/standalone/Soil/layered_soil.jl
@@ -10,7 +10,6 @@
 
 using Plots
 import ClimaUtilities.SpaceVaryingInputs: SpaceVaryingInput
-import NCDatasets
 import SciMLBase
 import ClimaTimeSteppers as CTS
 using ClimaCore
@@ -117,7 +116,7 @@ conv_checker = CTS.ConvergenceChecker(norm_condition = convergence_cond)
 ode_algo = CTS.IMEXAlgorithm(
     stepper,
     CTS.NewtonsMethod(
-        max_iters = 50,
+        max_iters = 10,
         update_j = CTS.UpdateEvery(CTS.NewNewtonIteration),
         convergence_checker = conv_checker,
     ),

diff --git a/experiments/benchmarks/land.jl b/experiments/benchmarks/land.jl
@@ -17,8 +17,7 @@
 # Simulation duration: 6 hours
 # Timestep: 180 s
 # Timestepper: ARS343
-# Maximum iterations: 1
-# Convergence criterion: 1e-8
+# Fixed number of iterations: 1
 # Jacobian update: Every Newton iteration
 # Precipitation data update: every timestep
 import SciMLBase
@@ -622,14 +621,11 @@ function setup_and_solve_problem(; greet = false)
 
     # Define timestepper and ODE algorithm
     stepper = CTS.ARS343()
-    norm_condition = CTS.MaximumError(FT(1e-8))
-    conv_checker = CTS.ConvergenceChecker(; norm_condition = norm_condition)
     ode_algo = CTS.IMEXAlgorithm(
         stepper,
         CTS.NewtonsMethod(
             max_iters = 1,
             update_j = CTS.UpdateEvery(CTS.NewTimeStep),
-            convergence_checker = conv_checker,
         ),
     )
 

diff --git a/experiments/benchmarks/richards.jl b/experiments/benchmarks/richards.jl
@@ -18,8 +18,7 @@
 # Simulation duration: 7 days
 # Timestep: 1800 s (30 min)
 # Timestepper: ARS111
-# Maximum iterations: 2
-# Convergence criterion: 1e-8
+# Fixed number of iterations: 2
 # Jacobian update: Every Newton iteration
 # Precipitation data update: every timestep
 
@@ -303,14 +302,11 @@ function setup_and_solve_problem(; greet = false)
 
     # Define timestepper and ODE algorithm
     stepper = CTS.ARS111()
-    norm_condition = CTS.MaximumError(FT(1e-8))
-    conv_checker = CTS.ConvergenceChecker(; norm_condition = norm_condition)
     ode_algo = CTS.IMEXAlgorithm(
         stepper,
         CTS.NewtonsMethod(
             max_iters = 2,
             update_j = CTS.UpdateEvery(CTS.NewNewtonIteration),
-            convergence_checker = conv_checker,
         ),
     )
 

diff --git a/experiments/integrated/global/global_soil_canopy.jl b/experiments/integrated/global/global_soil_canopy.jl
@@ -341,14 +341,11 @@ imp_tendency! = ClimaLand.make_imp_tendency(land);
 tendency_jacobian! = ClimaLand.make_tendency_jacobian(land);
 set_initial_cache!(p, Y, t0)
 stepper = CTS.ARS343()
-norm_condition = CTS.MaximumError(FT(1e-8))
-conv_checker = CTS.ConvergenceChecker(; norm_condition = norm_condition)
 ode_algo = CTS.IMEXAlgorithm(
     stepper,
     CTS.NewtonsMethod(
         max_iters = 1,
         update_j = CTS.UpdateEvery(CTS.NewTimeStep),
-        convergence_checker = conv_checker,
     ),
 )
 

diff --git a/experiments/standalone/Soil/richards_runoff.jl b/experiments/standalone/Soil/richards_runoff.jl
@@ -220,14 +220,11 @@ tendency_jacobian! = ClimaLand.make_tendency_jacobian(model);
 
 set_initial_cache!(p, Y, t0)
 stepper = CTS.ARS111()
-norm_condition = CTS.MaximumError(FT(1e-8))
-conv_checker = CTS.ConvergenceChecker(; norm_condition = norm_condition)
 ode_algo = CTS.IMEXAlgorithm(
     stepper,
     CTS.NewtonsMethod(
         max_iters = 2,
         update_j = CTS.UpdateEvery(CTS.NewNewtonIteration),
-        convergence_checker = conv_checker,
     ),
 )