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

OceanSeaIceModel for coupled ocean-sea-ice simulations with prescribed atmospheric state and radiative fluxes #49

Merged
merged 195 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from 175 commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
6891c57
Implement prototype ice ocean model
glwagner Oct 5, 2023
a108beb
Add OceanOnlyModel
glwagner Oct 5, 2023
1eab2c0
Add constructor for ocean only model
glwagner Oct 5, 2023
11d7550
starting out
simone-silvestri Oct 6, 2023
1126d03
airseafluxes
simone-silvestri Oct 6, 2023
12e89d4
atmospheric state
simone-silvestri Oct 6, 2023
923030b
more changes
simone-silvestri Oct 6, 2023
74dbc06
changes...
simone-silvestri Oct 6, 2023
cf8a8d9
easy bulk formulae
simone-silvestri Oct 6, 2023
4a65d44
comment
simone-silvestri Oct 6, 2023
ce19c04
more
simone-silvestri Oct 6, 2023
f1f02ce
comment
simone-silvestri Oct 6, 2023
3877387
comment
simone-silvestri Oct 6, 2023
85e9139
cleaning up a bit
simone-silvestri Oct 6, 2023
8c46826
air_ice fluxes?
simone-silvestri Oct 6, 2023
1250d91
comment
simone-silvestri Oct 6, 2023
473d73c
comment
simone-silvestri Oct 6, 2023
8f7e13d
small change
simone-silvestri Oct 6, 2023
262ca98
placeholder
simone-silvestri Oct 6, 2023
baada0a
update field time series
simone-silvestri Oct 6, 2023
d80a9f9
Change IceOcean to OceanSeaIce
glwagner Oct 11, 2023
f87c6f0
Merge branch 'main' into glw-ss/ice-ocean-model
glwagner Oct 12, 2023
9a32e41
Build up OMIP simulation and shuffle files
glwagner Oct 13, 2023
ab42a30
Updates to omip setup
glwagner Oct 13, 2023
322b642
It runs
glwagner Oct 14, 2023
e100e7a
Update
glwagner Oct 16, 2023
f9f3dc3
Update Oceananigans compat
glwagner Oct 16, 2023
4e0edd2
Change Model to Models
glwagner Oct 16, 2023
bdfcf4f
Fix name error
glwagner Oct 16, 2023
c37012d
Comment out AtmosphericForcings for now
glwagner Oct 16, 2023
8723076
Small updates
glwagner Oct 16, 2023
600dfed
Updates
glwagner Oct 16, 2023
49021af
Major updates and cleanup
glwagner Oct 20, 2023
3f8044d
Merge remote-tracking branch 'origin/main' into glw-ss/ice-ocean-model
glwagner Nov 13, 2023
0e3a926
Clean up examples dir
glwagner Nov 13, 2023
aa8c053
Implement JRA55 momentum forcing
glwagner Nov 15, 2023
d7a20d0
Implementing momentum fluxes
glwagner Nov 15, 2023
c108b8d
Really a revamp
glwagner Nov 15, 2023
9a16526
Radiation, cross realm fluxs, bulk formula
glwagner Nov 16, 2023
1713ee1
Starts implementing better interface for fluxes
glwagner Nov 20, 2023
f18e716
Let structure take shape
glwagner Nov 20, 2023
e530248
We have momentum flux
glwagner Nov 20, 2023
5e47a56
Forgot to interpolate JRA55 data
glwagner Nov 21, 2023
2292cf8
Add radiation
glwagner Nov 21, 2023
a16c354
Get the radiation fluxes in there
glwagner Nov 21, 2023
bd51759
Add radiative fluxes
glwagner Nov 30, 2023
ccf0497
Updates
glwagner Nov 30, 2023
6ed41de
All the formulas now
glwagner Dec 2, 2023
4498677
Constant coefficient bulk formula working except evaporation
glwagner Dec 4, 2023
cddd224
Introducing timings into omip script
glwagner Dec 6, 2023
21f54e1
GPU-friendly copyto!
glwagner Dec 6, 2023
b155626
Its a lot of progress
glwagner Dec 13, 2023
d388a66
Merge branch 'glw-ss/ice-ocean-model' of https://github.com/CliMA/Cli…
glwagner Dec 13, 2023
01c1a51
Updates
glwagner Dec 13, 2023
29e0b35
Massive rearrangement
glwagner Jan 8, 2024
8c9ac24
Fluxes coming together
glwagner Jan 10, 2024
daa0085
Much progress
glwagner Jan 19, 2024
fc69210
Regional simulation script
glwagner Jan 22, 2024
05e7918
Update regional setup
glwagner Jan 22, 2024
e5590cc
Negative evaporation = deposition?
glwagner Jan 23, 2024
d5f4ce8
Freshwater density parameter and some cleanup
glwagner Jan 23, 2024
c03487e
Fiddle with flux convention
glwagner Jan 23, 2024
3b70905
Delete OMIP atmosphere
glwagner Jan 23, 2024
98a0786
Clean up
glwagner Jan 23, 2024
0f7bf44
Update packages
glwagner Jan 23, 2024
ae86c03
Package gymnastics
glwagner Jan 23, 2024
d09aa99
Its condensation of course
glwagner Jan 23, 2024
cf573a4
Merge remote-tracking branch 'origin/main' into glw-ss/ice-ocean-model
glwagner Jan 24, 2024
bff00b0
Update default date for ecco2_field
glwagner Jan 24, 2024
876879d
Fix chunked halo filling
glwagner Jan 25, 2024
e56ec34
Merge branch 'glw-ss/ice-ocean-model' of https://github.com/CliMA/Cli…
glwagner Jan 25, 2024
0c382d0
Add adapt method for similarity turbulent fluxes
glwagner Jan 26, 2024
160358c
Adds adapt method for TwoStreamRadiation
glwagner Jan 26, 2024
bc80140
Add functionality to compute R_v
glwagner Jan 26, 2024
3a2e220
Import R_v into PrescribedAtmospheres
glwagner Jan 26, 2024
a2352a6
Import R_d
glwagner Jan 26, 2024
34b897a
Add the molmass ratio
glwagner Jan 26, 2024
06b4e5f
Offload JRA55 on disk
simone-silvestri Jan 26, 2024
88cc9bd
docstring
simone-silvestri Jan 26, 2024
40d832d
fix
simone-silvestri Jan 26, 2024
09cec7a
alignment
simone-silvestri Jan 26, 2024
340c6ff
bugs fixed
simone-silvestri Jan 26, 2024
e64cfb7
more info
simone-silvestri Jan 26, 2024
3f35743
last fix
simone-silvestri Jan 26, 2024
515b288
coment
simone-silvestri Jan 26, 2024
e0c0a9e
Add cp_d
glwagner Jan 27, 2024
a6035fa
Merge branch 'glw-ss/ice-ocean-model' of https://github.com/CliMA/Cli…
glwagner Jan 27, 2024
9832d2e
Try to fix JRA55.jl
glwagner Jan 27, 2024
7092553
Add cv_v
glwagner Jan 27, 2024
ef09154
Add some more accessor functions
glwagner Jan 27, 2024
c0c1c50
Fix bug PrescribedAtmospheres
glwagner Jan 27, 2024
0710e96
Add e_int_v0
glwagner Jan 29, 2024
dfb9750
Add LH_f0
glwagner Jan 29, 2024
41c68fc
Fix bug in PrescribedAtmospheres
glwagner Jan 29, 2024
63f0c5d
inline getter functions for SimilarityTurbulentFluxes
glwagner Jan 29, 2024
0128137
Make universal_func_type non-dynamic
glwagner Jan 29, 2024
7826a93
Hard code BusingerType
glwagner Jan 29, 2024
2d7e90d
Update packages
glwagner Jan 29, 2024
5dee805
update variable names
navidcy Jan 29, 2024
68cf30b
F -> Jˢ
navidcy Jan 29, 2024
a50598f
some more F -> Jˢ + fix NC output_attributes
navidcy Jan 29, 2024
cb3190f
Makie new syntax: Figure(resolution=...) -> Figure(size=...)
navidcy Jan 29, 2024
c4fdadb
Start working on JRA55 field time series on disk
glwagner Jan 29, 2024
d279fe3
Merge branch 'glw-ss/ice-ocean-model' of https://github.com/CliMA/Cli…
glwagner Jan 29, 2024
8bfa300
More work ondisk JRA55
glwagner Jan 29, 2024
a21ae07
Add preprocessing ability to JRA55 time series
glwagner Jan 29, 2024
eb73cac
Implement a preprocessing feature in JRA55_field_time_series
glwagner Jan 29, 2024
04f1817
jra55 -> JRA55
glwagner Jan 29, 2024
c79ad16
Better warning
glwagner Jan 29, 2024
0f0b210
Update tests
glwagner Jan 29, 2024
68b4958
Fix up JRA55 tests
glwagner Jan 29, 2024
bc13f4a
Fix bug for InMemory{Colon} and specify Float32 JRA55
glwagner Jan 29, 2024
b42dcb0
Add correct Oceananigans version
glwagner Jan 29, 2024
40df5e5
add compat entry for Oceananigans
navidcy Jan 31, 2024
9dc9789
update deps
navidcy Jan 31, 2024
0912e8a
use Oceananigans#ss-glw/time-bcs
navidcy Jan 31, 2024
e0431d8
fix
navidcy Jan 31, 2024
f2e7663
use oceananigans 0.90.6
navidcy Jan 31, 2024
73d3452
Update interface to JRA55_prescribed_atmosphere
glwagner Jan 31, 2024
cf200ff
Merge branch 'glw-ss/ice-ocean-model' of https://github.com/CliMA/Cli…
glwagner Jan 31, 2024
10ece45
Remove artifact from JRA55.jl
glwagner Jan 31, 2024
da6b835
Switch to assuming that we always interpolate atmos fields
glwagner Feb 2, 2024
ce22dbf
Update surface fluxes script
glwagner Feb 2, 2024
93c17c7
Start working on similarity theory fluxes
glwagner Feb 3, 2024
1f7551a
Updates
glwagner Feb 3, 2024
d44cd19
Shuffle omip components
glwagner Feb 5, 2024
e77e2f2
Updates for freely decaying sea ice simulation
glwagner Feb 5, 2024
cb07591
Get freely decaying ice simulation working
glwagner Feb 5, 2024
6f21488
Get sea ice decaying simulation running
glwagner Feb 5, 2024
989593b
Working on fixed point iteration
glwagner Feb 5, 2024
ba99021
Updates for single column simulation
glwagner Feb 6, 2024
be569b5
Single column test
glwagner Feb 7, 2024
73d4e93
Always use the same clock...
glwagner Feb 7, 2024
3679b34
Bugfixes
glwagner Feb 7, 2024
f3b927a
Remove unneeded imports
glwagner Feb 7, 2024
80d7142
Convert FieldTimeSeries to OffsetArray before computing fluxes
glwagner Feb 7, 2024
e684762
Working on turublnet fluxes
glwagner Feb 8, 2024
de0a69d
Add in similarity theory flux computation
glwagner Feb 8, 2024
b055722
Delete compute turbulent fluxes
glwagner Feb 8, 2024
1e54fd5
Bugfix
glwagner Feb 8, 2024
3aeb255
Minimal implementation working
glwagner Feb 8, 2024
45d49bd
Split flux calculation into two kernels
glwagner Feb 8, 2024
3e0aded
Updates to get sea ice working provisionally
glwagner Feb 10, 2024
f57edb3
resolve deps
navidcy Feb 12, 2024
d628e0f
import compute_sea_ice_ocean_fluxes!
navidcy Feb 12, 2024
1633849
Seems to be working with constant roughness length
glwagner Feb 12, 2024
d0c2dc6
Merge branch 'glw-ss/ice-ocean-model' of https://github.com/CliMA/Cli…
glwagner Feb 12, 2024
fde49ac
Fix sign error in flux-scale relationship
glwagner Feb 12, 2024
0a891d8
Start working on realistic roughness length
glwagner Feb 12, 2024
8dcda7f
Merge branch 'glw-ss/ice-ocean-model' of https://github.com/CliMA/Cli…
glwagner Feb 12, 2024
298c1c5
Change notation and fix a bug
glwagner Feb 12, 2024
8079f1b
Allow old fluxes to be used for first guess
glwagner Feb 12, 2024
003b744
Add a silly sea ice model
glwagner Feb 12, 2024
df649b9
Bugfixes
glwagner Feb 12, 2024
89a51a5
Implement custom backend in JRA55
glwagner Feb 13, 2024
f1a6a5b
Fix bug in FreezingLimitedTemperature sea ice model
glwagner Feb 13, 2024
a9d26da
Update regional omip to use new JRA55 backend
glwagner Feb 13, 2024
91a777a
Complete JRA55NetCDFBackend
glwagner Feb 14, 2024
4d44845
Fix some bugs
glwagner Feb 17, 2024
86565bc
New CATKE values?
glwagner Feb 26, 2024
cb0386b
Remove cruft
glwagner Feb 28, 2024
08c094d
Clean up omip components
glwagner Feb 28, 2024
b19b658
nuke docs/Manifest
navidcy Mar 28, 2024
35ea53a
use tagged version of Oceananigans
navidcy Mar 28, 2024
a24cf5b
use latest deps
navidcy Mar 28, 2024
54cb9b7
updates
navidcy Mar 28, 2024
e4ce25c
merge main
navidcy Mar 28, 2024
1c26cae
merge main
simone-silvestri Apr 4, 2024
8172bba
some things lost in merge
navidcy Apr 4, 2024
46b8917
add back Manifest
navidcy Apr 4, 2024
38c9fd7
some more fixes
navidcy Apr 4, 2024
3836fb0
resolve
navidcy Apr 4, 2024
8c91b2a
add docs/src/literated/
navidcy Apr 4, 2024
bf789d5
working docs
navidcy Apr 4, 2024
43229cb
fixes
navidcy Apr 4, 2024
d35ef11
use ClimaSeaIce v0.1
navidcy Apr 7, 2024
c75dfdd
some fixes; still not all tests pass
navidcy Apr 11, 2024
badffb7
Merge branch 'main' into glw-ss/ice-ocean-model
navidcy Apr 11, 2024
f230f06
Update src/DataWrangling/JRA55.jl
navidcy Apr 11, 2024
3c47d88
fixed the docs
simone-silvestri Apr 23, 2024
9731163
updated Oceananigans to #main
simone-silvestri Apr 23, 2024
256cabb
text fix
simone-silvestri Apr 24, 2024
7899dd3
fixed all tests
simone-silvestri Apr 24, 2024
9ac4f27
Removed methods that already exist in oceananigans
simone-silvestri Apr 24, 2024
44cd894
now everything should work
simone-silvestri Apr 24, 2024
b5da34b
another fix
simone-silvestri Apr 24, 2024
faaf418
bugfix
simone-silvestri Apr 24, 2024
2f0d679
OnDisk not possible for JRA55!
simone-silvestri Apr 24, 2024
57de400
comment why we cannot use OnDisk
simone-silvestri Apr 24, 2024
c716cbd
another bugfix
simone-silvestri Apr 24, 2024
db6b8d4
some changes
simone-silvestri Apr 24, 2024
067c4a5
probably now it should work
simone-silvestri Apr 24, 2024
ac9137f
Update src/OceanSeaIceModels/CrossRealmFluxes/similarity_theory_turbu…
simone-silvestri Apr 26, 2024
12357ac
fixed tests
simone-silvestri Apr 30, 2024
1179247
Merge branch 'glw-ss/ice-ocean-model' of github.com:CliMA/ClimaOcean.…
simone-silvestri Apr 30, 2024
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
6 changes: 5 additions & 1 deletion .github/workflows/Documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ jobs:
version: '1.10'
show-versioninfo: true
- name: Install dependencies
run: julia --color=yes --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
run: |
julia --color=yes --project -e 'using Pkg; Pkg.instantiate()'
julia --color=yes --project -e 'using Pkg; Pkg.precompile()'
julia --color=yes --project=docs/ -e 'using Pkg; Pkg.instantiate()'
julia --color=yes --project=docs/ -e 'using Pkg; Pkg.precompile()'
- name: Build and deploy
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ deps/src/
# Build artifacts for creating documentation generated by the Documenter package
docs/build/
docs/site/
docs/Manifest.toml
docs/src/literated/

# File generated by Pkg, the package manager, based on a corresponding Project.toml
# It records a fixed state of all packages used by the project. As such, it should not be
Expand All @@ -31,3 +31,4 @@ docs/Manifest.toml
*.swp
*.svg
*.gif
*.zip
Loading
Loading