remove old EDMF

CliMA · Oct 26, 2023 · bc93117 · bc93117
1 parent a1ca826
commit bc93117
Show file tree

Hide file tree

Showing 62 changed files with 28 additions and 3,888 deletions.
diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
@@ -210,19 +210,6 @@ steps:
         env:
           JOB_NAME: "longrun_aquaplanet_rhoe_equil_highres_allsky_ft32"
 
-
-  - group: "TurbulenceConvection"
-    steps:
-
-      - label: ":balloon: Compressible single column EDMF TRMM_LBA"
-        command: "julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/$$JOB_NAME.yml"
-        artifact_paths: "$$JOB_NAME/*"
-        agents:
-          slurm_mem_per_cpu: 20GB
-          slurm_time: 24:00:00
-        env: 
-          JOB_NAME: "longrun_compressible_edmf_trmm"
-
   - group: "DYAMOND"
 
     steps:

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -360,22 +360,6 @@ steps:
         agents:
           slurm_mem: 20GB
 
-      - label: ":computer: aquaplanet (ρe_tot) equilmoist with EDMF"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_equilmoist_edmf.yml
-
-          julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl
-          --data_dir sphere_baroclinic_wave_rhoe_equilmoist_edmf
-          --out_dir sphere_baroclinic_wave_rhoe_equilmoist_edmf
-
-          julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl
-          --nc_dir sphere_baroclinic_wave_rhoe_equilmoist_edmf
-          --fig_dir sphere_baroclinic_wave_rhoe_equilmoist_edmf --case_name dry_held_suarez
-        artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_edmf/*"
-        agents:
-          slurm_mem: 20GB
-
       - label: ":computer: aquaplanet (ρe_tot) equilmoist allsky radiation monin_obukhov varying insolation gravity wave (raw_topo) high top zonally asymmetric"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
@@ -709,147 +693,6 @@ steps:
         agents:
           slurm_mem: 20GB
 
-  - group: "TurbulenceConvection"
-    steps:
-
-      - label: ":balloon: SCM EDMF GABLS (Dry, JFNK IMEX EDMF)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_gabls_jfnk_imex.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_gabls_jfnk_imex --out_dir edmf_gabls_jfnk_imex
-        artifact_paths: "edmf_gabls_jfnk_imex/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF: Nieuwstadt (Dry)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_nieuwstadt.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_nieuwstadt --out_dir edmf_nieuwstadt
-        artifact_paths: "edmf_nieuwstadt/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF: Nieuwstadt (Dry, JFNK IMEX EDMF)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_nieuwstadt_jfnk_imex.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_nieuwstadt_jfnk_imex --out_dir edmf_nieuwstadt_jfnk_imex
-        artifact_paths: "edmf_nieuwstadt_jfnk_imex/*"
-        soft_fail: true
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF Soares"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_soares.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_soares --out_dir edmf_soares
-        artifact_paths: "edmf_soares/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF Soares (JFNK IMEX EDMF)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_soares_jfnk_imex.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_soares_jfnk_imex --out_dir edmf_soares_jfnk_imex
-        artifact_paths: "edmf_soares_jfnk_imex/*"
-        soft_fail: true
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF Bomex (Default: Newton's method)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_bomex.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_bomex --out_dir edmf_bomex
-        artifact_paths: "edmf_bomex/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF Bomex (JFNK)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_bomex_jfnk.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_bomex_jfnk --out_dir edmf_bomex_jfnk
-        artifact_paths: "edmf_bomex_jfnk/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF Bomex (JFNK IMEX EDMF)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_bomex_jfnk_imex.yml
-        artifact_paths: "edmf_bomex_jfnk_imex/*"
-        agents:
-          slurm_mem: 20GB
-      - label: ":balloon: SCM EDMF DYCOMS_RF01"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_dycoms_rf01.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_dycoms_rf01 --out_dir edmf_dycoms_rf01
-        artifact_paths: "edmf_dycoms_rf01/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF LifeCycleTan2018"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_life_cycle_tan2018.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_life_cycle_tan2018 --out_dir edmf_life_cycle_tan2018
-        artifact_paths: "edmf_life_cycle_tan2018/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF Rico"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_rico.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_rico --out_dir edmf_rico
-        artifact_paths: "edmf_rico/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":balloon: SCM EDMF TRMM_LBA (Short, 1-moment micro, sponge)"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_trmm.yml
-
-          julia --color=yes --project=examples regression_tests/test_mse.jl
-          --job_id edmf_trmm --out_dir edmf_trmm
-        artifact_paths: "edmf_trmm/*"
-        agents:
-          slurm_mem: 20GB
-
-      - label: ":dart: SCM EDMF Consistency test Bomex"
-        command: >
-          julia --color=yes --project=examples examples/hybrid/driver.jl
-          --config_file $CONFIG_PATH/edmf_bomex_consistency.yml
-        artifact_paths: "edmf_bomex_consistency/*"
-        agents:
-          slurm_mem: 20GB
-
   - group: "GPU"
     steps:
 
@@ -1029,14 +872,6 @@ steps:
         agents:
           slurm_mem: 24GB
 
-      - label: ":fire: Flame graph: perf target (edmf)"
-        command: >
-          julia --color=yes --project=perf perf/flame.jl
-          $PERF_CONFIG_PATH/flame_perf_target_edmf.yml
-        artifact_paths: "flame_perf_target_edmf/*"
-        agents:
-          slurm_mem: 24GB
-
       - label: ":fire: Flame graph: perf target (Threaded)"
         command: >
           julia --threads 8 --color=yes --project=perf perf/flame.jl

diff --git a/Project.toml b/Project.toml
@@ -19,7 +19,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
-Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
 ImageFiltering = "6a3955dd-da59-5b1f-98d4-e7296123deb5"
@@ -28,7 +27,6 @@ Interpolations = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
 IntervalSets = "8197267c-284f-5f27-9208-e0e47529a953"
 JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
-LambertW = "984bce1d-4616-540c-a9ee-88d1112d94c9"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 NCDatasets = "85f8d34a-cbdd-5861-8df4-14fed0d494ab"
@@ -43,7 +41,6 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 SurfaceFluxes = "49b00bb7-8bd4-4f2b-b78c-51cd0450215f"
-TerminalLoggers = "5d786b92-1e48-4d6f-9151-6b4477ca9bed"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Thermodynamics = "b60c26fb-14c3-4610-9d3e-2d17fe7ff00c"
 YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
@@ -62,7 +59,6 @@ Colors = "0.12"
 Dierckx = "0.5"
 DiffEqBase = "6"
 DiffEqCallbacks = "2"
-Distributions = "0.25"
 DocStringExtensions = "0.8, 0.9"
 FastGaussQuadrature = "0.4, 0.5, 1"
 ImageFiltering = "0.7"
@@ -71,7 +67,6 @@ Interpolations = "0.14"
 IntervalSets = "0.5, 0.6, 0.7"
 JLD2 = "0.4"
 Krylov = "0.9"
-LambertW = "0.4"
 NCDatasets = "0.11, 0.12, 0.13"
 NVTX = "0.3"
 Pkg = "1.8"
@@ -81,7 +76,6 @@ SciMLBase = "1, 2"
 StaticArrays = "1"
 StatsBase = "0.33, 0.34"
 SurfaceFluxes = "0.8.0"
-TerminalLoggers = "0.1"
 Thermodynamics = "0.11"
 YAML = "0.4"
 julia = "1.7"

diff --git a/config/default_configs/default_edmf_config.yml b/config/default_configs/default_edmf_config.yml
@@ -1,16 +1,7 @@
 # EDMF configuration
 turbconv:
-  help: "Turbulence convection scheme [`nothing` (default), `edmf`, 'prognostic_edmfx', 'diagnostic_edmfx']"
+  help: "Turbulence convection scheme [`nothing` (default), 'prognostic_edmfx', 'diagnostic_edmfx']"
   value: ~
-test_edmf_consistency:
-  help: "Test edmf equation consistency [`false` (default), `true`]"
-  value: false
-imex_edmf_gm:
-  help: "Whether to split EDMF's `compute_gm_tendencies!` into implicit and explicit components"
-  value: false
-imex_edmf_turbconv:
-  help: "Whether to split EDMF's `compute_turbconv_tendencies!` into implicit and explicit components"
-  value: false
 advection_test:
   help: "Switches off all grid-scale and subgrid-scale momentum tendencies [`false` (default), `true`]"
   value: false

diff --git a/config/longrun_configs/longrun_compressible_edmf_trmm.yml b/config/longrun_configs/longrun_compressible_edmf_trmm.yml
diff --git a/config/model_configs/edmf_bomex.yml b/config/model_configs/edmf_bomex.yml
diff --git a/config/model_configs/edmf_bomex_consistency.yml b/config/model_configs/edmf_bomex_consistency.yml
diff --git a/config/model_configs/edmf_bomex_jfnk.yml b/config/model_configs/edmf_bomex_jfnk.yml
diff --git a/config/model_configs/edmf_bomex_jfnk_imex.yml b/config/model_configs/edmf_bomex_jfnk_imex.yml
diff --git a/config/model_configs/edmf_dycoms_rf01.yml b/config/model_configs/edmf_dycoms_rf01.yml