wip

CliMA · May 13, 2024 · b6f9ebe · b6f9ebe
1 parent cd9a8f4
commit b6f9ebe
Show file tree

Hide file tree

Showing 21 changed files with 1,251 additions and 849 deletions.
diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
@@ -1,6 +1,5 @@
 agents:
   queue: new-central
-  slurm_mem_per_cpu: 8G
   modules: climacommon/2024_04_30
 
 env:
@@ -33,6 +32,7 @@ steps:
     agents:
       slurm_cpus_per_task: 8
       slurm_gpus: 1
+      slurm_ntasks: 1
     env:
       JULIA_NUM_PRECOMPILE_TASKS: 8
 
@@ -54,6 +54,7 @@ steps:
       #   env:
       #     JOB_NAME: "longrun_zalesak_tracer_energy_bw_rhoe_equil_highres"
 
+<<<<<<< HEAD
       - label: ":computer: SSP baroclinic wave (ρe_tot) equilmoist high resolution centered diff"
         command:
           - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
@@ -64,22 +65,45 @@ steps:
           slurm_time: 24:00:00
         env:
           JOB_NAME: "longrun_ssp_bw_rhoe_equil_highres"
+=======
+      # - label: ":computer: SSP baroclinic wave (ρe_tot) equilmoist high resolution centered diff"
+      #   command:
+      #     - "srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml"
+      #   artifact_paths: "$$JOB_NAME/output_active/*"
+      #   agents:
+      #     slurm_ntasks: 32
+      #     slurm_nodes: 2
+      #     slurm_time: 24:00:00
+      #   env:
+      #     JOB_NAME: "longrun_ssp_bw_rhoe_equil_highres"
+>>>>>>> fec1acee0 (wip)
+
+      # - label: ":computer: aquaplanet equilmoist clearsky radiation + prognostic edmf diffusion only + 0M microphysics"
+      #   command:
+      #     - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml
+      #   artifact_paths: "$$JOB_NAME/output_active/*"
+      #   agents:
+      #     slurm_ntasks: 64
+      #     slurm_nodes: 4
+      #     slurm_mem_per_cpu: 16GB
+      #     slurm_time: 24:00:00
+      #   env:
+      #     JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M"
 
-      - label: ":computer: aquaplanet equilmoist clearsky radiation + prognostic edmf diffusion only + 0M microphysics"
+      - label: ":computer: aquaplanet equilmoist allsky radiation + prognostic edmf + 0M microphysics"
         command:
           - srun julia --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml --job_id $$JOB_NAME
         artifact_paths: "$$JOB_NAME/output_active/*"
         agents:
-          slurm_ntasks: 64
-          slurm_nodes: 4
-          slurm_mem_per_cpu: 16GB
+          slurm_gpus: 1
           slurm_time: 24:00:00
+          slurm_mem: 32GB
         env:
-          JOB_NAME: "longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_diffonly_0M"
+          JOB_NAME: "longrun_aquaplanet_equil_helem12_allsky_progedmf_0M"
 
-  - group: "Low resolution long runs"
+  # - group: "Low resolution long runs"
 
-    steps:
+  #   steps:
 
       - label: ":computer: low resolution aquaplanet equilmoist clearsky radiation + time-varying insolation + slab ocean"
         command:

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
diff --git a/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_progedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_equil_helem12_allsky_progedmf_0M.yml
@@ -0,0 +1,38 @@
+h_elem: 12
+z_max: 55000.0
+z_elem: 30
+dz_bottom: 100.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+override_τ_precip: false
+rad: "allskywithclear"
+dt_rad: "6hours"
+surface_setup: "DefaultMoninObukhov"
+turbconv: "prognostic_edmfx"
+implicit_sgs_advection: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+max_newton_iters_ode: 3
+prognostic_tke: true
+edmfx_upwinding: "first_order"
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
+edmfx_filter: true
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+rayleigh_sponge: true
+restart_file: "/central/groups/esm/zhaoyi/climaatmos/longrun_1560/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M/output_active/day30.0.hdf5"
+dt_save_state_to_disk: "10days"
+dt: "20secs"
+t_end: "60days"
+toml: [toml/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M.toml]
+netcdf_output_at_levels: true
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
+    period: 1days
+  - short_name: [arup, waup, rhoaup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 1days
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 1days
diff --git a/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_0M.yml b/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_0M.yml
@@ -0,0 +1,23 @@
+h_elem: 12
+z_max: 55000.0
+z_elem: 30
+dz_bottom: 100.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+override_τ_precip: false
+rad: "clearsky"
+dt_rad: "6hours"
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "FriersonDiffusion"
+rayleigh_sponge: true
+dt_save_state_to_disk: "10days"
+dt: "200secs"
+t_end: "100days"
+toml: [toml/longrun_aquaplanet_equil_helem12_clearsky_0M.toml]
+netcdf_output_at_levels: true
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
+    period: 10days
+  - short_name: [lmix, bgrad, strain, edt, evu]
+    period: 10days
diff --git a/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_0M_viscous.yml b/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_0M_viscous.yml
@@ -0,0 +1,24 @@
+h_elem: 12
+z_max: 55000.0
+z_elem: 30
+dz_bottom: 100.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+override_τ_precip: false
+rad: "clearsky"
+dt_rad: "6hours"
+surface_setup: "DefaultMoninObukhov"
+vert_diff: "FriersonDiffusion"
+rayleigh_sponge: true
+viscous_sponge: true
+dt_save_state_to_disk: "10days"
+dt: "200secs"
+t_end: "100days"
+toml: [toml/longrun_aquaplanet_equil_helem12_clearsky_0M_viscous.toml]
+netcdf_output_at_levels: true
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
+    period: 10days
+  - short_name: [lmix, bgrad, strain, edt, evu]
+    period: 10days
diff --git a/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M.yml
@@ -0,0 +1,39 @@
+h_elem: 12
+z_max: 55000.0
+z_elem: 30
+dz_bottom: 100.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+override_τ_precip: false
+rad: "clearsky"
+dt_rad: "6hours"
+surface_setup: "DefaultMoninObukhov"
+turbconv: "prognostic_edmfx"
+implicit_sgs_advection: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+max_newton_iters_ode: 3
+prognostic_tke: true
+edmfx_upwinding: "first_order"
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
+edmfx_filter: true
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+rayleigh_sponge: true
+viscous_sponge: true
+restart_file: "/central/groups/esm/zhaoyi/climaatmos/longrun_1560/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M/output_active/day30.0.hdf5"
+dt_save_state_to_disk: "10days"
+dt: "20secs"
+t_end: "32days"
+toml: [toml/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M.toml]
+netcdf_output_at_levels: true
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
+    period: 1days
+  - short_name: [arup, waup, rhoaup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 1days
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 1days
diff --git a/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M_asym.yml b/config/longrun_configs/longrun_aquaplanet_equil_helem12_clearsky_progedmf_0M_asym.yml
@@ -0,0 +1,38 @@
+h_elem: 12
+z_max: 55000.0
+z_elem: 30
+dz_bottom: 100.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+override_τ_precip: false
+surface_temperature: "ZonallyAsymmetric"
+rad: "clearsky"
+dt_rad: "6hours"
+surface_setup: "DefaultMoninObukhov"
+turbconv: "prognostic_edmfx"
+implicit_sgs_advection: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+max_newton_iters_ode: 3
+prognostic_tke: true
+edmfx_upwinding: "first_order"
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
+edmf_filter: true
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+rayleigh_sponge: true
+dt_save_state_to_disk: "10days"
+dt: "40secs"
+t_end: "100days"
+toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_0M.toml]
+netcdf_output_at_levels: true
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
+    period: 10days
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 10days
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 10days
diff --git a/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_0M.yml b/config/longrun_configs/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_0M.yml
@@ -0,0 +1,37 @@
+h_elem: 16
+z_max: 55000.0
+z_elem: 63
+dz_bottom: 30.0
+dz_top: 3000.0
+moist: "equil"
+precip_model: "0M"
+override_τ_precip: false
+rad: "clearsky"
+dt_rad: "6hours"
+surface_setup: "DefaultMoninObukhov"
+turbconv: "prognostic_edmfx"
+implicit_sgs_advection: true
+implicit_diffusion: true
+approximate_linear_solve_iters: 2
+max_newton_iters_ode: 3
+prognostic_tke: true
+edmfx_upwinding: "first_order"
+edmfx_entr_model: "Generalized"
+edmfx_detr_model: "Generalized"
+edmfx_nh_pressure: true
+edmf_filter: true
+edmfx_sgs_mass_flux: true
+edmfx_sgs_diffusive_flux: true
+rayleigh_sponge: true
+dt_save_state_to_disk: "3hours"
+dt: "40secs"
+t_end: "10days"
+toml: [toml/longrun_aquaplanet_rhoe_equil_55km_nz63_clearsky_progedmf_0M.toml]
+netcdf_output_at_levels: true
+diagnostics:
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
+    period: 1days
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 1days
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
+    period: 1days
diff --git a/config/model_configs/prognostic_edmfx_adv_test_column.yml b/config/model_configs/prognostic_edmfx_adv_test_column.yml
@@ -20,5 +20,7 @@ netcdf_interpolation_num_points: [2, 2, 63]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 10mins
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke, lmix]
+  - short_name: [arup, waup, taup, thetaaup, haup, rhoaup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke, lmix]
+    period: 10mins
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
diff --git a/config/model_configs/prognostic_edmfx_aquaplanet.yml b/config/model_configs/prognostic_edmfx_aquaplanet.yml
@@ -17,9 +17,12 @@ dt_save_state_to_disk: 600secs
 toml: [toml/prognostic_edmfx.toml]
 output_default_diagnostics: false
 diagnostics:
-  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hfes, hur, hus, cl, clw, cli, evspsbl, rsd, rsu, rld, rlu]
+  - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     reduction_time: average
     period: 1hours
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, tke, lmix]
+  - short_name: [arup, waup, taup, thetaaup, haup, rhoaup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke, lmix]
+    reduction_time: average
+    period: 1hours
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     reduction_time: average
     period: 1hours
diff --git a/config/model_configs/prognostic_edmfx_trmm_column_0M.yml b/config/model_configs/prognostic_edmfx_trmm_column_0M.yml
@@ -32,5 +32,7 @@ netcdf_interpolation_num_points: [8, 8, 82]
 diagnostics:
   - short_name: [ts, ta, thetaa, ha, pfull, rhoa, ua, va, wa, hur, hus, cl, clw, cli, hussfc, evspsbl]
     period: 10mins
-  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke, lmix]
+  - short_name: [arup, waup, taup, thetaaup, haup, husup, hurup, clwup, cliup, waen, taen, thetaaen, haen, husen, huren, clwen, clien, tke]
+    period: 10mins
+  - short_name: [entr, detr, lmix, bgrad, strain, edt, evu]
     period: 10mins
diff --git a/post_processing/ci_plots.jl b/post_processing/ci_plots.jl
@@ -1123,26 +1123,26 @@ function make_plots(
 
     short_names = [
         "ua",
-        "wa",
+        "va",
+        "tke",
+        "lmix",
+        "bgrad",
+        "strain",
         "thetaa",
         "thetaaup",
         "ta",
         "taup",
         "ha",
         "haup",
+        "wa",
         "waup",
-        "tke",
-        "lmix",
         "arup",
         "hus",
         "husup",
         "hur",
         "hurup",
-        "cl",
         "clw",
         "clwup",
-        "cli",
-        "cliup",
         precip_names...,
     ]
     reduction = "inst"
@@ -1174,6 +1174,13 @@ function make_plots(
         ([slice(v, time = LAST_SNAP) for v in group]...,) for
         group in var_groups_zt
     ]
+    # var_groups_z = [
+    #     (
+    #         [
+    #             ClimaAnalysis.window(v, "time", left = 14400, right = 21600) |> ClimaAnalysis.average_time for v in group
+    #         ]...,
+    #     ) for group in var_groups_zt
+    # ]
 
     tmp_file = make_plots_generic(
         output_paths,

diff --git a/src/initial_conditions/initial_conditions.jl b/src/initial_conditions/initial_conditions.jl
@@ -881,6 +881,13 @@ end
 The `InitialCondition` described in [Brown2002](@cite), but with a
 hydrostatically balanced pressure profile.
 """
+
+bomex_tke(::Type{FT}) where {FT} = z -> if (z <= 2500.0)
+    FT(1) - z / 3000
+else
+    FT(0)
+end
+
 Base.@kwdef struct ARM_SGP <: InitialCondition
     prognostic_tke::Bool = false
 end
@@ -918,7 +925,7 @@ for IC in (:Soares, :Bomex, :LifeCycleTan2018, :ARM_SGP)
                 ),
                 velocity = Geometry.UVector(u(z)),
                 turbconv_state = EDMFState(;
-                    tke = prognostic_tke ? FT(0) : tke(z),
+                    tke = prognostic_tke ? bomex_tke(FT)(z) : tke(z),
                 ),
             )
         end