From 9bc289e1f48e9a15fe8c405e232a7682893e3b9c Mon Sep 17 00:00:00 2001
From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
Date: Tue, 16 Jan 2024 14:52:56 -0800
Subject: [PATCH] modify some longrun configs

---
 config/default_configs/default_perf.yml                   | 2 ++
 config/gpu_configs/gpu_aquaplanet_dyamond.yml             | 1 -
 config/longrun_configs/longrun_aquaplanet_amip.yml        | 7 ++++---
 config/longrun_configs/longrun_aquaplanet_dyamond.yml     | 1 -
 ...ongrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml | 1 -
 ..._aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml | 1 -
 ...rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml | 1 -
 ...quaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml | 1 -
 ..._aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml | 1 -
 config/model_configs/diagnostic_edmfx_aquaplanet.yml      | 8 +++++---
 config/perf_configs/flame_perf_target_threaded.yml        | 1 +
 config/perf_configs/flame_perf_target_tracers.yml         | 1 +
 config/perf_configs/jet_n_failures.yml                    | 1 +
 perf/flame.jl                                             | 2 +-
 14 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/config/default_configs/default_perf.yml b/config/default_configs/default_perf.yml
index a262df6052..26e53a75cd 100644
--- a/config/default_configs/default_perf.yml
+++ b/config/default_configs/default_perf.yml
@@ -5,6 +5,8 @@ dt: "1secs"
 surface_setup: "DefaultExchangeCoefficients"
 t_end: "10secs"
 vert_diff: "true"
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
 h_elem: 12
 forcing: "held_suarez"
 precip_model: "0M"
diff --git a/config/gpu_configs/gpu_aquaplanet_dyamond.yml b/config/gpu_configs/gpu_aquaplanet_dyamond.yml
index ea5f01e6c1..c8c87b1d46 100644
--- a/config/gpu_configs/gpu_aquaplanet_dyamond.yml
+++ b/config/gpu_configs/gpu_aquaplanet_dyamond.yml
@@ -14,6 +14,5 @@ rayleigh_sponge: true
 dt_save_state_to_disk: "3hours"
 dt: "50secs" 
 t_end: "1days"
-FLOAT_TYPE: "Float32"
 job_id: "gpu_aquaplanet_dyamond" 
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_amip.yml b/config/longrun_configs/longrun_aquaplanet_amip.yml
index df0894db00..c3d24368d3 100644
--- a/config/longrun_configs/longrun_aquaplanet_amip.yml
+++ b/config/longrun_configs/longrun_aquaplanet_amip.yml
@@ -11,6 +11,8 @@ idealized_insolation: false
 dt_rad: "1hours"
 surface_setup: "DefaultMoninObukhov" 
 turbconv: "diagnostic_edmfx" 
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
 prognostic_tke: true
 edmfx_upwinding: "first_order" 
 edmfx_entr_model: "Generalized" 
@@ -20,9 +22,8 @@ edmfx_sgs_mass_flux: true
 edmfx_sgs_diffusive_flux: true
 rayleigh_sponge: true
 dt_save_state_to_disk: "1days"
-dt: "50secs" 
-t_end: "10days"
-FLOAT_TYPE: "Float32"
+dt: "100secs" 
+t_end: "30days"
 job_id: "longrun_aquaplanet_amip" 
 toml: [toml/longrun_aquaplanet_amip.toml]
 output_default_diagnostics: false
diff --git a/config/longrun_configs/longrun_aquaplanet_dyamond.yml b/config/longrun_configs/longrun_aquaplanet_dyamond.yml
index a0c70a9ed4..b3585f1abe 100644
--- a/config/longrun_configs/longrun_aquaplanet_dyamond.yml
+++ b/config/longrun_configs/longrun_aquaplanet_dyamond.yml
@@ -15,6 +15,5 @@ rayleigh_sponge: true
 dt_save_state_to_disk: "3hours"
 dt: "50secs" 
 t_end: "1days"
-FLOAT_TYPE: "Float32"
 job_id: "longrun_aquaplanet_dyamond" 
 toml: [toml/longrun_aquaplanet_dyamond.toml]
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml
index 7ea772f5b4..46ecc884ec 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M.yml
@@ -1,4 +1,3 @@
-FLOAT_TYPE: "Float32"
 dt_save_state_to_disk: "10days"
 dt: "150secs"
 t_end: "300days"
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml
index 9369c22122..302557d39c 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_0M_earth.yml
@@ -1,4 +1,3 @@
-FLOAT_TYPE: "Float32"
 dt_save_state_to_disk: "10days"
 dt: "40secs"
 t_end: "200days"
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
index 50aaa3d685..f91cef8ca5 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_tvinsol_0M_slabocean.yml
@@ -1,4 +1,3 @@
-FLOAT_TYPE: "Float32"
 dt_save_to_disk: "10days"
 dt: "150secs"
 t_end: "100days"
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml
index cae64d0c2a..1f49d0619f 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean.yml
@@ -1,4 +1,3 @@
-FLOAT_TYPE: "Float32"
 dt_save_state_to_disk: "10days"
 t_end: "100days"
 moist: "equil"
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml
index 44f0b24162..2a560afafe 100644
--- a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml
+++ b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_highres_clearsky_ft32_earth.yml
@@ -13,7 +13,6 @@ h_elem: 16
 use_reference_state: false
 vorticity_hyperdiffusion_coefficient: 4.0
 scalar_hyperdiffusion_coefficient: 4.0
-FLOAT_TYPE: "Float32"
 precip_model: "0M"
 topography: "Earth"
 dt_save_to_sol: "10days"
diff --git a/config/model_configs/diagnostic_edmfx_aquaplanet.yml b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
index bd40b17f74..f34d52df6b 100644
--- a/config/model_configs/diagnostic_edmfx_aquaplanet.yml
+++ b/config/model_configs/diagnostic_edmfx_aquaplanet.yml
@@ -1,7 +1,9 @@
 job_id: diagnostic_edmfx_aquaplanet
-surface_setup: DefaultExchangeCoefficients 
-rad: gray
+surface_setup: DefaultMoninObukhov
+rad: clearsky
 turbconv: diagnostic_edmfx 
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
 prognostic_tke: true
 edmfx_upwinding: first_order 
 edmfx_entr_model: "Generalized" 
@@ -12,7 +14,7 @@ edmfx_sgs_diffusive_flux: true
 moist: equil 
 precip_model: 0M
 override_τ_precip: false
-dt: 50secs 
+dt: 100secs 
 t_end: 1hours 
 dt_save_state_to_disk: 600secs
 toml: [toml/diagnostic_edmfx_trmm_box.toml]
diff --git a/config/perf_configs/flame_perf_target_threaded.yml b/config/perf_configs/flame_perf_target_threaded.yml
index 9f6b830521..30dd7a4527 100644
--- a/config/perf_configs/flame_perf_target_threaded.yml
+++ b/config/perf_configs/flame_perf_target_threaded.yml
@@ -1 +1,2 @@
 job_id: "flame_perf_target_threaded"
+implicit_diffusion: false
diff --git a/config/perf_configs/flame_perf_target_tracers.yml b/config/perf_configs/flame_perf_target_tracers.yml
index 4436eae5bd..d0ef688e8c 100644
--- a/config/perf_configs/flame_perf_target_tracers.yml
+++ b/config/perf_configs/flame_perf_target_tracers.yml
@@ -1,2 +1,3 @@
 job_id: "flame_perf_target_tracers"
 perf_mode: "PerfExperimental"
+implicit_diffusion: false
diff --git a/config/perf_configs/jet_n_failures.yml b/config/perf_configs/jet_n_failures.yml
index 4c358b7748..ade25ec157 100644
--- a/config/perf_configs/jet_n_failures.yml
+++ b/config/perf_configs/jet_n_failures.yml
@@ -1 +1,2 @@
 job_id: "jet_n_failures"
+implicit_diffusion: false
diff --git a/perf/flame.jl b/perf/flame.jl
index 3ea625f61e..197951676b 100644
--- a/perf/flame.jl
+++ b/perf/flame.jl
@@ -44,7 +44,7 @@ allocs_limit["flame_perf_diagnostics"] = 26_645_600
 allocs_limit["flame_perf_target_diagnostic_edmfx"] = 1415848
 allocs_limit["flame_sphere_baroclinic_wave_rhoe_equilmoist_expvdiff"] =
     4_018_252_656
-allocs_limit["flame_perf_target_frierson"] = 8030507312
+allocs_limit["flame_perf_target_frierson"] = 8030551088
 allocs_limit["flame_perf_target_threaded"] = 1_276_864
 allocs_limit["flame_perf_target_callbacks"] = 386_584
 allocs_limit["flame_perf_gw"] = 3268961856