Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use deep atmosphere equations by default #3422

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ steps:
julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/sphere_baroclinic_wave_equilmoist_conservation_source.yml
--job_id sphere_baroclinic_wave_equilmoist_conservation_source
artifact_paths: "sphere_baroclinic_wave_equilmoist_conservation_source/output_active/*"

- label: ":computer: baroclinic wave moist check conservation with sources (without bubble correction)"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/sphere_baroclinic_wave_equilmoist_conservation_source_no_bubble.yml
--job_id sphere_baroclinic_wave_equilmoist_conservation_source_no_bubble
artifact_paths: "sphere_baroclinic_wave_equilmoist_conservation_source_no_bubble/output_active/*"

- group: "Sphere Examples (Dycore)"
steps:
Expand Down Expand Up @@ -371,6 +377,15 @@ steps:
artifact_paths: "aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64/output_active/*"
agents:
slurm_mem: 20GB

- label: ":computer: aquaplanet (ρe_tot) slabocean equilmoist allsky radiation monin_obukhov varying insolation float64 (without bubble correction)"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
--config_file $CONFIG_PATH/aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64_nobubble.yml
--job_id aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64_nobubble
artifact_paths: "aquaplanet_rhoe_equil_clearsky_tvinsol_0M_slabocean_ft64_nobubble/output_active/*"
agents:
slurm_mem: 20GB

- label: ":computer: aquaplanet (ρe_tot) rcemipii with diagnostic edmf"
command: >
Expand Down
2 changes: 1 addition & 1 deletion config/default_configs/default_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ log_progress:
value: true
deep_atmosphere:
help: "If true, use deep atmosphere equations and metric terms, otherwise assume columns are cylindrical (shallow atmosphere) [`true`, `false` (default)]"
value: false
value: true
restart_file:
help: "Path to HDF5 file to use as simulation starting point"
value: ~
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FLOAT_TYPE: "Float64"
bubble: false
dt_save_state_to_disk: "5days"
t_end: "5days"
moist: "equil"
precip_model: "0M"
surface_setup: "DefaultMoninObukhov"
vert_diff: "DecayWithHeightDiffusion"
implicit_diffusion: true
approximate_linear_solve_iters: 2
rad: "clearsky"
insolation: "timevarying"
dt_rad: "1hours"
prognostic_surface: "PrognosticSurfaceTemperature"
check_conservation: true
bubble: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
initial_condition: "MoistBaroclinicWave"
bubble: false
dt: "400secs"
t_end: "10days"
moist: "equil"
surface_setup: DefaultMoninObukhov
prognostic_surface: "PrognosticSurfaceTemperature"
rad: "clearsky"
precip_model: "0M"
vert_diff: true
dt_save_state_to_disk: "5days"
check_conservation: true
diagnostics:
- short_name: [massa, energya, watera, energyo, watero]
period: 1days
writer: dict
10 changes: 6 additions & 4 deletions examples/Manifest.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is machine-generated - editing it directly is not advised

julia_version = "1.10.7"
julia_version = "1.10.2"
manifest_format = "2.0"
project_hash = "13bc74579bbfd1b4bab2e5d6cddd05f9a01dba06"

Expand Down Expand Up @@ -353,7 +353,9 @@ weakdeps = ["CUDA", "MPI"]

[[deps.ClimaCore]]
deps = ["Adapt", "BandedMatrices", "BlockArrays", "ClimaComms", "CubedSphere", "DataStructures", "ForwardDiff", "GaussQuadrature", "GilbertCurves", "HDF5", "InteractiveUtils", "IntervalSets", "KrylovKit", "LinearAlgebra", "MultiBroadcastFusion", "NVTX", "PkgVersion", "RecursiveArrayTools", "RootSolvers", "SparseArrays", "StaticArrays", "Statistics", "Unrolled"]
git-tree-sha1 = "7209c2ed595f535db446709b9d19e22f8b000736"
git-tree-sha1 = "3b70643860eafe56ac38516c7b007acc3ba45493"
repo-rev = "main"
repo-url = "https://github.com/CliMA/ClimaCore.jl.git"
uuid = "d414da3d-4745-48bb-8d80-42e94e092884"
version = "0.14.22"
weakdeps = ["CUDA", "Krylov"]
Expand Down Expand Up @@ -546,7 +548,7 @@ weakdeps = ["Dates", "LinearAlgebra"]
[[deps.CompilerSupportLibraries_jll]]
deps = ["Artifacts", "Libdl"]
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
version = "1.1.1+0"
version = "1.1.0+0"

[[deps.CompositionsBase]]
git-tree-sha1 = "802bb88cd69dfd1509f6670416bd4434015693ad"
Expand Down Expand Up @@ -2652,7 +2654,7 @@ version = "0.15.2+0"
[[deps.libblastrampoline_jll]]
deps = ["Artifacts", "Libdl"]
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
version = "5.11.0+0"
version = "5.8.0+1"

[[deps.libfdk_aac_jll]]
deps = ["Artifacts", "JLLWrappers", "Libdl"]
Expand Down
8 changes: 7 additions & 1 deletion reproducibility_tests/ref_counter.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
196
197

# **README**
#
Expand All @@ -20,6 +20,9 @@


#=
197
- Set deep atmos config as default

196
- Set bubble correction to false as default

Expand All @@ -45,6 +48,9 @@
- We don't know why, but the regression tests are failing because there is no reference dataset.
We are bumping the reference counter to see if this fixes the issue.

189
- Deep-atmos configuration is now the default

188
- Updated dependencies

Expand Down
Loading