-
Notifications
You must be signed in to change notification settings - Fork 21
Half degree simulation prototype script #659
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
Draft
xkykai
wants to merge
331
commits into
main
Choose a base branch
from
xk/half-degree-simulation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
331 commits
Select commit
Hold shift + click to select a range
5f53219
bugfix
simone-silvestri 9209bbf
add sea-ice ocean stress
simone-silvestri 62b4629
Merge branch 'main' into ss/multi-year-JRA55
simone-silvestri 4d963ea
fix tests
simone-silvestri 52c91d9
Merge branch 'ss/multi-year-JRA55' of github.com:CliMA/ClimaOcean.jl …
simone-silvestri 1ee41af
bugfix
simone-silvestri 1d58772
Update JRA55_field_time_series.jl
simone-silvestri 0c020d0
Update JRA55_field_time_series.jl
simone-silvestri bafe3c7
simplify
simone-silvestri 350b657
add the inmemory stuff
simone-silvestri 4a49b40
start with this
simone-silvestri fea1854
default to inmemory
simone-silvestri 4441567
Merge remote-tracking branch 'origin/ss/multi-year-JRA55' into ss/omi…
simone-silvestri 7c4aa61
go!
simone-silvestri 24f7d93
add a failsafe + a test
simone-silvestri d231995
some cleanup
simone-silvestri ca1980c
better to write last
simone-silvestri f448eeb
Merge remote-tracking branch 'origin/ss/multi-year-JRA55' into ss/omi…
simone-silvestri fed209b
Merge branch 'main' into ss/sea-ice-momentum-stress
simone-silvestri aeedd2f
last index
simone-silvestri f954c69
Merge branch 'ss/sea-ice-momentum-stress' of github.com:CliMA/ClimaOc…
simone-silvestri ddee7f0
add this
simone-silvestri daeb12f
add a clock
simone-silvestri 629d582
add the arctic
simone-silvestri 54165a0
Merge branch 'ss/sea-ice-momentum-stress' into ss/omip-prototype
simone-silvestri 35fe01d
try it out
simone-silvestri 5548a99
correct dates
simone-silvestri dfb8590
Update experiments/omip_prototype/quarter_degree_omip.jl
simone-silvestri a049dc1
Update experiments/omip_prototype/quarter_degree_omip.jl
simone-silvestri d1e6faf
add stuff
simone-silvestri 7186256
Merge branch 'main' into ss/omip-prototype
simone-silvestri a6d758d
going sixth degree
simone-silvestri 0b8624e
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri f18a772
some changes
simone-silvestri 6679bbd
synchronize the clocks for the moment
simone-silvestri 50a7226
Merge branch 'main' into ss/omip-prototype
simone-silvestri 7975dd4
Update test_jra55.jl
simone-silvestri 77e440b
bugfix
simone-silvestri 5e3c729
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri b05fb83
improve it quickly for now
simone-silvestri 501b3fa
continue
simone-silvestri f258e29
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri 5751899
another try...
simone-silvestri af67adc
bugfix for the salt flux
simone-silvestri d008026
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri 83f97e9
try it out
simone-silvestri 03e7f19
correction
simone-silvestri 1e02dd9
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri 1eedc44
correct
simone-silvestri 202212c
update
simone-silvestri efa566c
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri 0c8d8b1
go for it
simone-silvestri 0f04d0f
Update src/SeaIceSimulations.jl
simone-silvestri e28b9a4
Update SeaIceSimulations.jl
simone-silvestri 0e1d4ca
Merge branch 'ss/default-sea-ice' into ss/omip-prototype
simone-silvestri 2eeed4c
some.. salinity
simone-silvestri b27ac12
Merge branch 'main' into ss/omip-prototype
simone-silvestri 4d09283
Merge branch 'main' into ss/omip-prototype
simone-silvestri 1507936
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri 702fe64
update sea ice simulation
simone-silvestri 9664584
try like this for the moment and let it go
simone-silvestri 8392922
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri d28b611
added project
simone-silvestri 4b763ee
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri c306b0f
retry like this
simone-silvestri 83331f8
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri 4857647
hmmm this was explicit
simone-silvestri 668bc53
use a fixed dt
simone-silvestri dcce9e2
update to new syntax
simone-silvestri d5288c1
go like this
simone-silvestri 1322148
add a one-degree to test it out
simone-silvestri 2490da2
Update one_degree_simulation.jl
simone-silvestri c411c71
Update one_degree_simulation.jl
simone-silvestri f762205
try without implicit solver
simone-silvestri 759c1ac
Update Project.toml
simone-silvestri 01e9f05
Update near_global_ocean_simulation.jl
simone-silvestri e48a2b5
Update one_degree_simulation.jl
simone-silvestri 0765874
changes
simone-silvestri 808e6c9
try it in both
simone-silvestri 88bd4e8
Merge branch 'ss/adapt-to-new-oceananigans' into ss/zstar
simone-silvestri 7cacb1d
adding the correct zstar branch
simone-silvestri 7cb8d6b
added CUDA
simone-silvestri 469883a
Update pipeline.yml
simone-silvestri 86d0bce
revert CUDA
simone-silvestri 509d6b4
enforce using a specific branch
navidcy 308c9e3
Delete Manifest.toml
navidcy 06d895c
Update Project.toml
navidcy 6397010
enforce using Oceananigans#ss/fix-zstar-bc
navidcy ea59ebb
drop geebrish
navidcy 352a3ef
enforce using Oceananigans#ss/fix-zstar-bc
navidcy 2beac0e
use julia v1.10.10
navidcy ea86989
precompile again
navidcy 89af369
use julia v1.10.10
navidcy 9e2482b
first oceananigans; then develop
navidcy 9affa64
add CUDA
navidcy 7717533
using CUDA + record from Makie not CUDA
navidcy 6e0be09
Update one_degree_simulation.jl
simone-silvestri 4488c2e
some changes
simone-silvestri 26fde07
Merge branch 'ss/zstar' of github.com:CliMA/ClimaOcean.jl into ss/zstar
simone-silvestri a436bed
increase a bit
simone-silvestri 5746652
add more stuff
simone-silvestri 5127f05
improvements
simone-silvestri 1037980
improve
simone-silvestri 71c82f5
add an equatorial single column
simone-silvestri bc33d07
possibly remove a bug?
simone-silvestri ed0d210
Update atmosphere_sea_ice_fluxes.jl
simone-silvestri 5b5b747
Update atmosphere_sea_ice_fluxes.jl
simone-silvestri 28d3e4e
adding the correct Manifest
simone-silvestri 00a2933
Merge branch 'ss/zstar' of github.com:CliMA/ClimaOcean.jl into ss/zstar
simone-silvestri d7ef440
update
simone-silvestri b0d1fd3
Merge branch 'main' into ss/zstar
navidcy 860ff09
Merge branch 'main' into ss/zstar
simone-silvestri 5637600
Merge branch 'ss/zstar' of github.com:CliMA/ClimaOcean.jl into ss/zstar
simone-silvestri b3ab48b
remove equatorial single column
simone-silvestri d1c7450
remove manifest
simone-silvestri a1ede1f
revert
simone-silvestri 4015bf4
token
simone-silvestri 970ffeb
Revert "token"
simone-silvestri 4b4f64e
Merge remote-tracking branch 'origin/ss/zstar' into ss/omip-prototype
simone-silvestri e6ff0d4
changed JRA55
simone-silvestri ef45d0c
added Project
simone-silvestri d96c32b
merged
simone-silvestri ea3ee12
bugfix
simone-silvestri 9165bd2
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri add5526
this should fix it
simone-silvestri 35e2df6
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri 92fda28
change sea ice
simone-silvestri ec70ca0
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri 469bcb1
consolidate sea ice temperature
simone-silvestri 736ac4c
adding the manifest
simone-silvestri 6db860a
adding Manifest
simone-silvestri 5e0997c
comment out for now
simone-silvestri 049dacd
go for it
simone-silvestri cf22586
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri 17a2250
improve
simone-silvestri d024542
Merge remote-tracking branch 'origin/main' into ss/omip-prototype
simone-silvestri 7d6ce58
improving the performance
simone-silvestri 5e66a54
speed up
simone-silvestri 9063e3e
recorrect Oceananigans
simone-silvestri 4fb3526
Merge branch 'main' into ss/omip-prototype
simone-silvestri e7845a5
new Manifest
simone-silvestri fca5484
do not add Oceananigans
simone-silvestri 09d22a3
Update make.jl
simone-silvestri 3885668
one-degree-ompi for calibration
simone-silvestri 8bbc3b8
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri 988ec77
update one degree
simone-silvestri 3419022
use the correct value
simone-silvestri b1430e2
remove this for the moment
simone-silvestri abced34
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri cf2e735
Update make.jl
simone-silvestri d0b3bf9
reduced the timestep
simone-silvestri 5f3452d
Merge branch 'ss/omip-prototype' of github.com:CliMA/ClimaOcean.jl in…
simone-silvestri f9613d8
enforce real minimum depth
simone-silvestri 557ddc9
Merge branch 'main' into ss/omip-prototype
simone-silvestri 3861dba
Merge branch 'main' into ss/omip-prototype
xkykai d126260
Merge branch 'main' into ss/omip-prototype
xkykai 22d6f31
Merge branch 'main' into ss/omip-prototype
xkykai 19b09fd
Add one-eighth degree ocean simulation model implementation
xkykai cb89c6b
Add PythonCall import to one-eighth degree simulation script
xkykai 60ff1b7
Enhance one-eighth degree simulation with detailed logging and initia…
xkykai 743fa84
Merge branch 'main' into ss/omip-prototype
simone-silvestri ee23b69
Merge branch 'main' into xk/oneeighth-degree-simulation
xkykai 09d5b2a
Update one-eighth degree simulation parameters and configurations
xkykai 87f5ab6
Adjust vertical grid resolution to 80 levels in one-eighth degree sim…
xkykai 8d8244a
Refactor initial condition setup to improve inpainting parameter hand…
xkykai ca25c22
change to 60 vertical levels
xkykai cf49b61
distributed is the way
xkykai 578e262
Merge branch 'ss/omip-prototype' into xk/oneeighth-degree-simulation
xkykai 4f01721
add Manifest for reproducibility
xkykai 79a61c0
create minimal script for debugging
xkykai abac838
use oceananigans fixed branch
xkykai 7f2f37d
a "technically working" script
xkykai 3de93e9
Refactor sea-ice initialization and adjust simulation time step
xkykai 76f5528
no inpainting for sea ice!
xkykai a2fef5c
Refactor sea-ice initial condition setting for improved clarity
xkykai f3b1b97
merge commit
simone-silvestri 0d1dcd7
Merge branch 'main' into xk/oneeighth-degree-simulation
xkykai fd06826
Merge branch 'ss/omip-prototype' into xk/oneeighth-degree-simulation
xkykai bad6fb1
first fix, doesn't solve the nan issue yet
xkykai fb34727
write ValueInpainting, but leaves vestigial maxiter value
xkykai dee9a17
remove fill_nans functionaloty
xkykai a8df621
update default_inpainting to return ValueInpainting for sea ice metrics
xkykai c33ab40
Update sea-ice initial conditions and fix minor typos in simulation s…
xkykai 3d0a6ff
Update Julia version and dependencies in Manifest.toml
xkykai c06f864
update ClimaSeaIce and Oceananigans
xkykai 009ad6a
API
xkykai c4e9f45
minimal 1deg example
xkykai 48ec24b
Add directory path for forcing data in one_degree_omip_minimal.jl
xkykai 4f6ede7
Create directory for forcing data in one_degree_omip_minimal.jl
xkykai f42bb7c
rename MWE script
xkykai 9dce3bd
try GPU
xkykai 37f487f
change date, use MultiYearJRA55
xkykai 0c272b0
set ECCO date too
xkykai d4c22a0
Switch architecture to CPU for minimal_script_MWE.jl
xkykai 5ed95ac
remove GM, change WENO, remove S restoring, start date for MultiYearJ…
xkykai 59d3004
refactor location function for clarity and consistency in CopernicusM…
xkykai 9bcc290
Add logging for architecture setup in minimal_script_MWE.jl
xkykai eac9e52
update atmosphere state to load correct time indices
xkykai 7dfce31
Merge branch 'xk/fix-glorys-seaice' into xk/oneeighth-degree-simulation
xkykai e4e685d
Merge branch 'xk/fix-prescribed-atmos-time-indexing' into xk/oneeight…
xkykai 7e2f67a
fix spacing
xkykai 78ccac8
Merge branch 'xk/fix-prescribed-atmos-time-indexing' into xk/oneeight…
xkykai 58f62d3
just to test simulation
xkykai b6ff54a
using glorys to initialize
xkykai 3166ed2
fix EN4 start date argument
xkykai d580079
add info logs for one-eighth degree simulation setup
xkykai e5d53ac
fix: correct argument name for temperature and salinity metadata in o…
xkykai 50fa8fc
add MPIPreferences, up Manifest
xkykai 5a95d16
fix: update GPU architecture setup and simulation parameters in minim…
xkykai a6d8d19
fix: update sea ice model reference in OMIP setup
xkykai 33588ac
increase halo size for native grid in bathymetry regridding
xkykai c461625
pin CUDA at v0.8.5
xkykai 207fcc4
a "working version" on google cloud
xkykai ee9a1b0
Merge branch 'xk/oneeighth-degree-simulation' of https://github.com/C…
xkykai 0da47b2
oneeighth!
xkykai e783413
Add memory usage logging to progress function
xkykai c21aab6
Merge branch 'main' into ss/omip-prototype
taimoorsohail 01af82e
Merge branch 'main' into ss/omip-prototype
navidcy 695c052
Refactor ocean simulation parameters and enhance progress logging
xkykai b234fe1
Create directory for JRA55 data and initialize dataset
xkykai 60f9431
Merge remote-tracking branch 'origin/xk/oneeighth-degree-simulation' …
xkykai eb0105d
Update Julia version and project dependencies in Manifest.toml
xkykai 47929f4
first trial of half degree simulation!
xkykai 5e61395
Enhance logging for ocean and sea ice model setup and initialization
xkykai 915512c
Adjust dataset memory settings for salinity restoring and JRA55 backend
xkykai eff629b
Add logging for simulation script startup
xkykai b29c25a
Remove startup logging and ensure JRA55 data directory is created
xkykai 94fa5a3
Simone's version
xkykai f9f9e64
Fix z_surf assignment to use correct function call for ExponentialDis…
xkykai 4944de4
Fix eddy_closure instantiation by adding missing semicolon for keywor…
xkykai b3a21b5
add buoyancy push
xkykai 3e525b5
Fix import statement for buoyancy formulations by removing unnecessar…
xkykai 1bf8a99
Add logging for κ_skew and κ_symmetric values in command line arguments
xkykai 01c98ac
script for running calibration samples
xkykai 25faf57
update Manifest
xkykai 8848dd1
Add CUDA version info output after command line argument parsing
xkykai f368383
20year run script to get samples faster
xkykai a744e81
Enhance command line argument parsing for simulation parameters and r…
xkykai aaac833
Add UCX library detection and logging for MPI+CUDA compatibility
xkykai 463901e
Add UCX library detection and logging for MPI+CUDA compatibility
xkykai 036bf64
temporary hack to use AveragedTimeInterval to average calibration target
xkykai e06d494
bump Oceananigans
xkykai 582f80d
a grave error!
xkykai 8361e1d
Add sampling length argument to command line parser and update relate…
xkykai c9ae84e
Update filename for ocean output writer to include sampling length
xkykai 091f658
Add one-degree OMIP calibration samples script with command line pars…
xkykai 667c5da
Update bathymetry regrid interpolation passes and change salinity dat…
xkykai 0009799
Update data directory paths to use EN4 and ECCO datasets
xkykai 3fce119
Update data directory and salinity dataset to use ECCO4Monthly
xkykai 3a2046f
half degree omip with correct ecco initialization
xkykai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why
const?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess because it's used in a function later?
@inline mask(x, y, z, t) = z ≥ z_surf - 1