Skip to content

Commit

Permalink
Merge pull request #3216 from CliMA/zs/aerosol_artifact
Browse files Browse the repository at this point in the history
use updated aerosol artifact
  • Loading branch information
szy21 authored Jul 24, 2024
2 parents e3ffce0 + 143e71a commit c8eda95
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Artifacts.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ git-tree-sha1 = "9da4af348af2606764e5e2c94d9439714221dff1"
[[aerosol2005.download]]
sha256 = "952d723b8462439c266dc0df79d0d4e71f774559edb941e03b7979e8ad743f56"
url = "https://caltech.box.com/shared/static/chmel1vdthfvfac0yl61ayw2jqnjzr2c.gz"

[aerosol_concentrations]
git-tree-sha1 = "a4bf66aab365d42abe428129457327d5244ed6b0"
2 changes: 1 addition & 1 deletion config/default_configs/default_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ bubble:
value: true
start_date:
help: "Start date of the simulation"
value: "20050117" # Where the current aerosol data begins
value: "20100101"
forcing:
help: "Forcing [`nothing` (default), `held_suarez`]"
value: ~
Expand Down
5 changes: 4 additions & 1 deletion regression_tests/ref_counter.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
170
171

#=
171:
- Changed start date
170:
- Moved precomputed quantities update of SSPKnoth from beginning of each timestep to end of previous timestep
Expand Down
9 changes: 6 additions & 3 deletions src/cache/tracer_cache.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function tracer_cache(Y, atmos, prescribed_aerosol_names, start_date)
return (;)
end

# Take the aerosol2005/aero_2005.nc file, read the keys with names matching
# Take the aerosol concentration file, read the keys with names matching
# the ones passed in the prescribed_aerosol_names option, and create a
# NamedTuple that uses the same keys and has as values the TimeVaryingInputs
# for those variables.
Expand All @@ -19,8 +19,11 @@ function tracer_cache(Y, atmos, prescribed_aerosol_names, start_date)
timevaryinginputs = [
TimeVaryingInput(
joinpath(
@clima_artifact("aerosol2005", ClimaComms.context(Y.c)),
"aero_2005.nc",
@clima_artifact(
"aerosol_concentrations",
ClimaComms.context(Y.c)
),
"aerosol_concentrations.nc",
),
name,
target_space;
Expand Down

0 comments on commit c8eda95

Please sign in to comment.