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

Version 1.0: North Atlantic Update - Tides, Curved Boundaries, Config, and More!😀🤯🥳 #193

Open
wants to merge 253 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
253 commits
Select commit Hold shift + click to select a range
7870d81
Merge pull request #2 from COSIMA/override-min-depth
ashjbarnes Aug 29, 2024
595c4de
Merge pull request #3 from CROCODILE-CESM/tidy-override-file
ashjbarnes Aug 29, 2024
3270057
having mask table and layout no longer required
ashjbarnes Aug 29, 2024
a262e15
Merge pull request #4 from CROCODILE-CESM/remove-masktable-requirement
ashjbarnes Aug 29, 2024
42c2840
fix layout requirements
ashjbarnes Aug 29, 2024
005fb44
fixed and working
ashjbarnes Aug 29, 2024
9606458
Merge pull request #5 from CROCODILE-CESM/fix-layout-requirements
ashjbarnes Aug 29, 2024
2268c8f
fix typo in find replace
ashjbarnes Sep 4, 2024
875549e
Merge pull request #6 from CROCODILE-CESM/fix-layout-requirements
ashjbarnes Sep 4, 2024
b6fab83
Merge branch 'COSIMA:main' into main
ashjbarnes Sep 4, 2024
6147803
replace minimum layers with min depth
ashjbarnes Sep 4, 2024
7caae56
black
ashjbarnes Sep 4, 2024
718dc1c
fix tests
ashjbarnes Sep 4, 2024
88938a2
update notebook
ashjbarnes Sep 4, 2024
31a6139
Merge pull request #7 from CROCODILE-CESM/move-minimum-layers
ashjbarnes Sep 4, 2024
a21e564
bugfix setup rundir when overwriting
ashjbarnes Sep 4, 2024
2488100
fix issue where ocean mask would fail to remove values lower than oce…
ashjbarnes Sep 5, 2024
d28a5d3
Start Setup Tides
manishvenu Sep 17, 2024
09a1a2f
First Attempt: RM6 Tides
manishvenu Sep 17, 2024
d73e84a
Clean up setup_tides and adjust rect_boundaries with hard-coded segme…
manishvenu Sep 18, 2024
86a349a
SOFT BREAK: Change Function Names, Add Rough Horiz Subset (See Below)
manishvenu Sep 18, 2024
5a40076
Write MOM6 Vars
manishvenu Sep 19, 2024
8adb479
Add Docstring Cite and Merge Functions
manishvenu Sep 19, 2024
586832e
Minor Path Function Changes
manishvenu Sep 19, 2024
89f9d1f
Merge branch 'croc_with_req_changes' of github.com:manishvenu/regiona…
manishvenu Sep 19, 2024
c4ff6d3
First Implementation w/ Tides
manishvenu Sep 19, 2024
ff8dc2c
Minor Edit
manishvenu Sep 20, 2024
6a92604
Additional Formatting Changes
manishvenu Sep 20, 2024
1aed99f
Additional Debugging
manishvenu Sep 20, 2024
533e3ed
remove login step so that command can be run via subprocess
ashjbarnes Sep 23, 2024
b6aa46b
Update pyproject.toml
ashjbarnes Sep 25, 2024
7466ff8
Merge pull request #11 from manishvenu/croc_with_req_changes
ashjbarnes Sep 25, 2024
3d5c61c
black refomat
ashjbarnes Sep 25, 2024
eabbc8c
Officially change boundary function names to verb names
manishvenu Sep 25, 2024
5b78b7c
Minor debugging
manishvenu Sep 26, 2024
5e44fba
Black formatting
manishvenu Sep 26, 2024
f3cd80c
Change function name for rect orientation
manishvenu Sep 26, 2024
b38508d
Remove Greek letters
manishvenu Sep 26, 2024
3804531
Black Formatting
manishvenu Sep 26, 2024
66bb465
Replace rectangular brushcut coords with GFDL self.coords
manishvenu Sep 26, 2024
d16fc4c
Black formatting
manishvenu Sep 26, 2024
127c7ec
Fix F-strings
manishvenu Sep 26, 2024
34be7e2
Add angled_grids testing for debugging
manishvenu Sep 27, 2024
5efb3b0
black formatting
manishvenu Sep 27, 2024
52347df
Skip this test in git workflow for now
manishvenu Sep 27, 2024
c52b49b
Wrap up tides adjustments, includinincluding string to tpxo number co…
manishvenu Sep 27, 2024
6fb8c13
mend
manishvenu Sep 27, 2024
51bf014
Change functions to verb start
manishvenu Sep 27, 2024
08288ee
Remove test from github workflow
manishvenu Sep 27, 2024
bfefbe8
Formatting
manishvenu Sep 27, 2024
ea5a9c3
Add properties and change function names
manishvenu Sep 27, 2024
b42e44d
Shifting MOM_input to MOM_override Part 1
manishvenu Sep 27, 2024
2ba990b
Minor Changes
manishvenu Sep 27, 2024
fefcc41
Add flexible OBC to help fix Issue #8, Move OBC params to MOM Overrid…
manishvenu Sep 30, 2024
b6a96b2
Deleting MOM_input Indexed OBC Vars
manishvenu Sep 30, 2024
be8195a
Config File: First Attempt
manishvenu Sep 30, 2024
1dd7692
Black Formatting
manishvenu Sep 30, 2024
4bf2044
Start of Testing
manishvenu Oct 1, 2024
f0fcbe9
Add testing for pr 12
manishvenu Oct 1, 2024
34fd055
Minor bug in config read/write
manishvenu Oct 1, 2024
55d169a
Remove MOM_input OBC segment specific code
manishvenu Oct 1, 2024
2a882ae
Responding to @ajbarnes comments
manishvenu Oct 1, 2024
874e012
remove horizontal subsets from tides
ashjbarnes Oct 1, 2024
1237dcd
Merge remote-tracking branch 'upstream/manish' into start_angled_boun…
manishvenu Oct 1, 2024
1b1532d
Black formatting
manishvenu Oct 1, 2024
6d05448
Responding to @ajbarnes comments
manishvenu Oct 1, 2024
2675021
Change testing branch
manishvenu Oct 1, 2024
41aa82d
Merge branch 'manish' of github.com:CROCODILE-CESM/regional-mom6 into…
manishvenu Oct 1, 2024
70ef6eb
Additional comments
manishvenu Oct 1, 2024
35901a8
Black formatting
manishvenu Oct 1, 2024
245066e
Merge various quality-of-life changes & tides boundary functions (Fro…
manishvenu Oct 1, 2024
e250852
Merge branch 'croc_with_req_changes' into start_angled_boundaries
manishvenu Oct 1, 2024
867e90c
Fix tides test
manishvenu Oct 1, 2024
4171c35
bathymetry now uses original land mask. Regrid in serial. Improve pri…
ashjbarnes Oct 3, 2024
4d17aec
update test to match
ashjbarnes Oct 5, 2024
5060e8d
black
ashjbarnes Oct 5, 2024
399e16c
Merge pull request #17 from CROCODILE-CESM/bathymetry-efficiency
ashjbarnes Oct 5, 2024
903d329
allow reading of lon lat extents from pre existing hgrid
ashjbarnes Oct 5, 2024
69407fd
black
ashjbarnes Oct 5, 2024
bb8b9ec
bugfixing curved boundary regridding for tracer IC and bathymetry
ashjbarnes Oct 9, 2024
848a712
black
ashjbarnes Oct 9, 2024
60c59b7
update tests
ashjbarnes Oct 9, 2024
dee8457
typo
ashjbarnes Oct 9, 2024
3f86a14
Update regional_mom6/regional_mom6.py
manishvenu Oct 9, 2024
ae58573
Black Format
manishvenu Oct 9, 2024
fcca7cf
Merge branch 'main' into start_angled_boundaries
manishvenu Oct 9, 2024
292ebfa
Merge pull request #13 from CROCODILE-CESM/start_angled_boundaries
ashjbarnes Oct 9, 2024
f562b1f
Update regional_mom6.py
ashjbarnes Oct 9, 2024
19583c9
Merge remote-tracking branch 'upstream/main'
manishvenu Oct 11, 2024
cd987f5
Remove unused test
manishvenu Oct 11, 2024
5b1c816
Minor Bug Fixes/Improvements to create_empty, change_MOM_param, & set…
manishvenu Oct 14, 2024
2ee186d
allow __getattr__ to read in data arrays from disk (#23)
ashjbarnes Oct 14, 2024
61398c9
Remove the deletion of MOM_input params in change_MOM_param
manishvenu Oct 14, 2024
5ff128c
Merge branch 'main' of github.com:CROCODILE-CESM/regional-mom6
manishvenu Oct 14, 2024
7d7216e
Update Config for Computer Independence, fix change_MOM_param, and fi…
manishvenu Oct 17, 2024
90e90a6
Change Boundary Arguments to __init__ and adjust respective functions…
manishvenu Oct 24, 2024
7861c18
minor changes ahead of visualCaseGen integration in CrocoDash:
alperaltuntas Dec 29, 2024
8f59ebb
Add aiohttp and copernicusmarine dependencies
alperaltuntas Dec 31, 2024
bbda1b9
add hgrid_path and vgrid_path args to __init__ to allow non-standard …
alperaltuntas Dec 31, 2024
9665892
black reformatting
alperaltuntas Jan 6, 2025
53ad69e
Merge pull request #39 from CROCODILE-CESM/visualCaseGen_integration
alperaltuntas Jan 7, 2025
6dbb9ca
Fix tides on angled boundaries, consolidate regridded of velocity and…
manishvenu Jan 17, 2025
31c6019
Correcting Code from Angus G's Review (#40)
manishvenu Jan 17, 2025
96005b3
Minor Edit Review
manishvenu Jan 17, 2025
cf7b13e
Change tidal constituent param default to None
manishvenu Jan 17, 2025
c65ee62
Change tidal constituent param default to None
manishvenu Jan 17, 2025
022dd01
Property Updates based on Review
manishvenu Jan 21, 2025
1062b2d
Adding example notebook to demonstrate new features (#41)
helenmacdonald Jan 22, 2025
5a0c7b3
Add BYO to Docs, try different python kernel version
manishvenu Jan 23, 2025
ea1d1b4
Merge remote-tracking branch 'cosima/main'
manishvenu Jan 23, 2025
a87846d
Change tidal check string
manishvenu Jan 23, 2025
91d4d32
Fix Demo Bugs (#43)
manishvenu Jan 23, 2025
17911e4
Test one output to disable nbsphinx in reanalysis_forced notebook
manishvenu Jan 23, 2025
1f4395d
Revert "Test one output to disable nbsphinx in reanalysis_forced note…
manishvenu Jan 23, 2025
0a05e51
Disable NBSphinx Notebook Execution
manishvenu Jan 23, 2025
dd4c2b5
Merge branch 'COSIMA:main' into main
navidcy Jan 23, 2025
65b87e1
rename file
navidcy Jan 23, 2025
4c40aff
no acronym for regional-mom6
navidcy Jan 23, 2025
c4f7b69
streamline
navidcy Jan 23, 2025
26b683b
Update regional_mom6/regional_mom6.py
navidcy Jan 23, 2025
cea9985
more streamline
navidcy Jan 23, 2025
4a45c7b
Merge branch 'main' of github.com:CROCODILE-CESM/regional-mom6
navidcy Jan 23, 2025
9e04166
make link linkable
navidcy Jan 23, 2025
c1de55a
better phrasing
navidcy Jan 23, 2025
361b2d6
try to understand what ap2ep does
navidcy Jan 23, 2025
838374b
fix formatting
navidcy Jan 23, 2025
26820a0
properly document Enum
navidcy Jan 23, 2025
065abd0
docstring formatting
navidcy Jan 23, 2025
6175f1c
updates
navidcy Jan 23, 2025
05ea795
update
navidcy Jan 23, 2025
720d5e6
more formatting
navidcy Jan 24, 2025
1cfbfa5
more formatting
navidcy Jan 24, 2025
17de58a
more formatting
navidcy Jan 24, 2025
6df2560
gather contributing docs
navidcy Jan 24, 2025
77d17db
gather contributing docs
navidcy Jan 24, 2025
1c5ec94
gather contributing docs
navidcy Jan 24, 2025
fe8fad7
gather contributing docs
navidcy Jan 24, 2025
06cf511
more work on docs
navidcy Jan 24, 2025
91b03b0
more work on docs
navidcy Jan 24, 2025
d343dbc
more work on docs
navidcy Jan 24, 2025
c0dc09c
more work on docs
navidcy Jan 24, 2025
478fd4d
more work on docs
navidcy Jan 24, 2025
0c4b09a
more work on docs
navidcy Jan 24, 2025
88e6e92
more work on docs
navidcy Jan 24, 2025
15d9437
more work on docs
navidcy Jan 24, 2025
4a8c600
more work on docs
navidcy Jan 24, 2025
d406abb
more work on docs
navidcy Jan 24, 2025
6f6138a
don't import dask.diagnostics.ProgressBar
navidcy Jan 24, 2025
7a60a35
remove duplicate Path import
navidcy Jan 24, 2025
2392cf3
fix buffer comment
navidcy Jan 24, 2025
ba39a18
fix docs
navidcy Jan 24, 2025
9038e1a
fix docs
navidcy Jan 24, 2025
200448d
fix docs
navidcy Jan 24, 2025
0ae3589
fix docs
navidcy Jan 24, 2025
f9ee2f4
fix docs
navidcy Jan 24, 2025
61ad98b
fix docs
navidcy Jan 24, 2025
f05e6e2
fix docs
navidcy Jan 24, 2025
09ab15c
fix docs
navidcy Jan 24, 2025
493bac2
fix docs
navidcy Jan 24, 2025
8ad05aa
add BYO-domain.ipynb in tests
navidcy Jan 25, 2025
9052bd0
docstring for RotationMethod
navidcy Jan 25, 2025
2edefa1
docstring updates
navidcy Jan 25, 2025
1dc6bbb
docstring updates
navidcy Jan 25, 2025
8dcbb25
docstring updates
navidcy Jan 25, 2025
f9b5246
docstring updates
navidcy Jan 25, 2025
47abb7e
docstring updates
navidcy Jan 25, 2025
78ce81b
docstring updates
navidcy Jan 25, 2025
78eec84
docstring updates
navidcy Jan 25, 2025
9c5faa0
docstring updates
navidcy Jan 25, 2025
4129328
docstring updates
navidcy Jan 25, 2025
fb45cd8
docstring updates
navidcy Jan 25, 2025
909f1ff
docstring updates
navidcy Jan 25, 2025
ef8115b
try nbsphinx_execute = 'always'
navidcy Jan 25, 2025
894dc4f
try nbsphinx_execute = 'never'
navidcy Jan 25, 2025
a198cb5
try nbsphinx_execute = 'never'
navidcy Jan 25, 2025
4fa6c23
try nbsphinx_execute = 'never'
navidcy Jan 25, 2025
9d3f6d2
add .swp
navidcy Jan 25, 2025
577b9bf
add credit to modulo function
navidcy Jan 25, 2025
88aa367
fix modulo docs
navidcy Jan 25, 2025
1ae9a2f
fix modulo docs
navidcy Jan 25, 2025
d152b35
fix modulo docs
navidcy Jan 25, 2025
9c5489e
fix modulo docs
navidcy Jan 25, 2025
4d6ad17
fix modulo docs
navidcy Jan 25, 2025
7937024
remove duplicate comment
navidcy Jan 25, 2025
df829b9
better docker instructions
navidcy Jan 25, 2025
f9ed0ff
better docker instructions
navidcy Jan 25, 2025
ca4e15e
Update docker_image_dev.md
navidcy Jan 25, 2025
6fcf0bf
Black Formatting + Change Docker Container to Cosima
manishvenu Jan 29, 2025
74baa8e
Adjust demo + github action for pytest
manishvenu Jan 29, 2025
a2e2a35
Change Hgrid name in BYO-domain for pytest
manishvenu Jan 29, 2025
6465987
Fix Github Action extra statement and Adjust Hgrid name in BYO Domain
manishvenu Jan 29, 2025
53f91e0
Skip tidal and change file paths to match the other demo
manishvenu Jan 29, 2025
a1bd7e7
Ignore some plotting things and fix bug in setup_run_directory
manishvenu Jan 29, 2025
ba8400c
Black
manishvenu Jan 29, 2025
190f39f
Adj Era5 dates
manishvenu Jan 29, 2025
b2e9fd4
One more attempt on ERA5 and Bathy issues
manishvenu Jan 29, 2025
056bd5e
Try to fix bathy bug
manishvenu Jan 29, 2025
5f71a9c
Black formmatting:
manishvenu Jan 29, 2025
dddc3ae
Skip Bathymetry Steps in second demo
manishvenu Jan 29, 2025
dfe6d5e
CopernicusMarine version change (#44)
manishvenu Feb 4, 2025
9c05a4c
Review Comments
manishvenu Feb 4, 2025
dfa27bb
Merge branch 'main' of github.com:CROCODILE-CESM/regional-mom6
manishvenu Feb 4, 2025
fc831d8
better phrasing
navidcy Feb 4, 2025
280300c
better phrasing
navidcy Feb 4, 2025
6ceaaac
better comments
navidcy Feb 4, 2025
96dcb29
remove first person; use we
navidcy Feb 4, 2025
e0583bc
bathy -> bathymetry
navidcy Feb 4, 2025
7c63601
fix typo + markdown instead of commented code
navidcy Feb 5, 2025
8b46768
elaborate on pseudo-grid expansion
navidcy Feb 9, 2025
43e78ea
Update angle_calculation.md
ashjbarnes Feb 10, 2025
5b2b589
Update regional_mom6.py
ashjbarnes Feb 10, 2025
d349b08
Update index.rst
ashjbarnes Feb 10, 2025
32a17d2
3rd person in all features
navidcy Feb 10, 2025
6cf382f
Update regional_mom6.py
ashjbarnes Feb 10, 2025
ffd1cfa
Update BYO-domain.ipynb
ashjbarnes Feb 10, 2025
4b76fe7
Update reanalysis-forced.ipynb
ashjbarnes Feb 10, 2025
58f7dfe
Update reanalysis-forced.ipynb
ashjbarnes Feb 10, 2025
e8e8b44
Update reanalysis-forced.ipynb
ashjbarnes Feb 10, 2025
5e01c9e
streamline and update default demo
ashjbarnes Feb 10, 2025
859004e
rename toolpath_dir to fre_tools_dir
ashjbarnes Feb 10, 2025
225bbd8
rename toolpath_dir to fre_tools_dir
ashjbarnes Feb 10, 2025
8ce741b
update byo domain
ashjbarnes Feb 10, 2025
0c009d8
update tests
ashjbarnes Feb 10, 2025
fd28122
ignore-output
ashjbarnes Feb 10, 2025
9500e0b
ignore-output
ashjbarnes Feb 10, 2025
8321602
update notebook, include plot outputs
ashjbarnes Feb 10, 2025
2b29c2d
update byo domain
ashjbarnes Feb 10, 2025
4a164e4
add matplotlib note
ashjbarnes Feb 10, 2025
a4bd306
Bugfix MOM_layout and create_expt_from_config
manishvenu Feb 10, 2025
202c702
Revert "Bugfix MOM_layout and create_expt_from_config"
manishvenu Feb 10, 2025
e516b34
Update docs/angle_calculation.md
navidcy Feb 10, 2025
3c49f31
Update docs/angle_calculation.md
navidcy Feb 10, 2025
e97c260
Update docs/angle_calculation.md
navidcy Feb 10, 2025
4fba3c5
Update angle_calculation.md
navidcy Feb 10, 2025
1010c6a
Update BYO-domain.ipynb
navidcy Feb 10, 2025
5793cc2
MOM6 Angle Calc Source Code pointer in docstring
manishvenu Feb 10, 2025
27af60d
Merge branch 'ashjbarnes-patch-1' of github.com:CROCODILE-CESM/region…
manishvenu Feb 10, 2025
e20270b
Merge pull request #45 from CROCODILE-CESM/ashjbarnes-patch-1
ashjbarnes Feb 10, 2025
ea823af
Merge pull request #46 from CROCODILE-CESM/Remove-boundary_type-argument
ashjbarnes Feb 10, 2025
7be12ef
fix repo url
navidcy Feb 11, 2025
d715e18
Update testing.yml
manishvenu Feb 11, 2025
7445258
Expose get_glorys_data
manishvenu Feb 11, 2025
75ec3c6
Black
manishvenu Feb 11, 2025
f4dbd13
fixs: Write MOM_layout, and removing the /forcing from era5 path
ashjbarnes Feb 13, 2025
dbca34a
Add Path Return to Glorys
manishvenu Feb 14, 2025
c684904
an attempt to make the code more interpretable
navidcy Feb 15, 2025
7cbe6dc
match the MOM6 implementation
navidcy Feb 15, 2025
9702180
Update regional_mom6/rotation.py
manishvenu Feb 15, 2025
40e46b4
No longer need 90 degree transformation
manishvenu Feb 15, 2025
0770041
merge conflicts
navidcy Feb 16, 2025
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
8 changes: 5 additions & 3 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- '**'
- '!joss-paper'

pull_request:
jobs:
formatting:
runs-on: ubuntu-latest
Expand All @@ -18,7 +18,7 @@ jobs:
testing:
needs: formatting
runs-on: ubuntu-latest
container: ghcr.io/cosima/regional-test-env:updated
container: ghcr.io/cosima/regional-test-env:updated_curvilinear
defaults:
run:
shell: bash -el {0}
Expand Down Expand Up @@ -54,7 +54,9 @@ jobs:
ln -s /data demos/PATH_TO_GLORYS_DATA
ln -s /data demos/PATH_TO_GEBCO_FILE
ln -s /build/FRE-NCtools/tools demos/PATH_TO_FRE_TOOLS
python -m pytest --nbval demos/reanalysis-forced.ipynb --nbval-current-env --cov=regional_mom6 --cov-report=xml tests/
ln -s /data demos/PATH_TO_YOUR_HORIZONTAL_GRID
ln -s /data demos/PATH_TO_ERA5_DATA
python -m pytest --nbval demos/reanalysis-forced.ipynb demos/BYO-domain.ipynb --nbval-current-env --cov=regional_mom6 --cov-report=xml tests/

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ regional_mom6.egg-info
.env
env
docker
*.swp

inputdir/
rundir/

Empty file added __init__.py
Empty file.
Loading
Loading