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.

Sign up for GitHub

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

Jump to bottom

Update ASC model branch to main #22

Merged
merged 84 commits into from
Oct 20, 2023
Merged

Update ASC model branch to main #22

merged 84 commits into from
Oct 20, 2023

Conversation

jlk9
Copy link
Collaborator

@jlk9 jlk9 commented Oct 20, 2023

No description provided.

glwagner and others added 30 commits June 29, 2023 10:43
@glwagner
Implement model kwarg allowing arbitrary user-defined boundary condit…
56931b0 
…ions
@glwagner
Bugfixes and cleanup
ed6512b
@glwagner
Remove spurious type parameter
e429e61
@glwagner
Add enthalply fluxes
626c32e
@glwagner
Incorporate jbs idealized air-ice and ice-ocean state
c146323
@glwagner
Fix plot label
ab80080
@glwagner
Merge pull request #6 from CliMA/glw/boundary-conditions-api
020d063 
User interface for specifying arbitrary boundary conditions
@glwagner
Start building a coupled ice ocean model
1c539fc
@glwagner
Ignore jld2
f499f1b
@glwagner
Merge remote-tracking branch 'origin/main' into glw/coupled-ice-ocean…
525b5c9 
…-column
@glwagner
Start building a coupled ice-ocean column model setup
f503aa9
@glwagner
Merge pull request #9 from CliMA/glw/coupled-ice-ocean-column
4eeacbb 
Coupled ice-ocean column model
@glwagner
Refactor ThermodynamicSeaIceModel into a new module EulerianThermodyn…
32f45a3 
…amicSeaIceModels
@glwagner
Update examples and add a test
13f34bf
@glwagner
Update formatting
c670be4
@glwagner
Add a github workflow that runs tests
515ba48
@glwagner
Add using Oceananigans
83da69b
@glwagner
Add Manifests
3bb1926
@glwagner
Implements LagrangianThermodynamicSeaIceModels
488fb66
@glwagner
Add compat
73c787a
@glwagner
Update docs manifest
3b9f29e
@glwagner
Change to julia 1.9 for documentation build
c6d7c4d
@glwagner
Make it so the simulation can stop!
0f6d741
@glwagner
Fix docs
f81299e
@glwagner
Minor commit to retrigger docs build
577b763
@glwagner
Merge pull request #10 from CliMA/glw-jlk/two-models
d762263 
Rename ThermodynamicSeaIceModel to EulerianThermodynamicSeaIceModel
@glwagner
Update README.md
d21efe0
@glwagner
Update index.md
49b76ca
@glwagner
Merge pull request #11 from CliMA/glwagner-patch-1
6476cfb 
Update README.md
@jlk9
Update and rename LagrangianThermodynamicSeaIceModels.jl to Prognosti…
d6b586d 
…cThicknessThermodynamicsModels.jl

Rename LagrangianThermodynamicSeaIceModels.jl to PrognosticThicknessThermodynamicsModels.jl
glwagner and others added 28 commits September 1, 2023 21:18
@glwagner
Implement a script that reproduces Semtner 1976
378211b
@glwagner
Perpetual night with ocean...
3141a83
@glwagner
Move implementation out into coupled model and add salinity fluxes
c0db562
@glwagner
Expand coupled model
6c67f71
@glwagner
Trying to get ice concentration to work
19a3880
@glwagner
Implement ice consolidation thickness
6b6066e
@glwagner
Updates
5a7dc42
@glwagner
Merge branch 'glw/one-point-ocean' of https://github.com/CliMA/ClimaS…
611005d 
…eaIce.jl into glw/one-point-ocean
@glwagner
Refactor
014c1be
@glwagner
Spatial dependence test
3af127f
@glwagner
Updates
8447093
@glwagner
Updates
3f327e9
@glwagner
Convert to legit model
197c592
@glwagner
Add thickness advection
5cb5e4d
@navidcy
Create codecov.yml
ad0a3e4 
hopefully this disables codedov's commenting on each line in the diff in a PR that is not covered.
@glwagner
Working on the coupled modle
cd3def5
@glwagner
Merge branch 'glw/one-point-ocean' of https://github.com/CliMA/ClimaS…
ae6e732 
…eaIce.jl into glw/one-point-ocean
@glwagner
Updates
053f748
@glwagner
Melting simulation
55b69c9
@glwagner
Updates
c3aa7cd
@glwagner
Shuffle files around
bcbdefa
@glwagner
Change back to CairoMakie
7986b0e
@glwagner
Merge pull request #18 from CliMA/glw/one-point-ocean
dea9bf9 
Implement a few ice-ocean examples
@glwagner
Update ice_ocean_model.jl
2579c42
@glwagner
Merge pull request #20 from CliMA/glw/bug-fix
05086bb 
Update ice_ocean_model.jl
@glwagner
Change thermal to heat (in most places)
4774171
@glwagner
Change file and directory names
de6d239
@glwagner
Merge pull request #21 from CliMA/glw/call-it-heat
4649a29 
Change "thermal" to "heat" (in most places)
@codecov
Copy link

codecov bot commented Oct 20, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (asc_model_example@efb45ac). Click here to learn what that means.

Additional details and impacted files 
@@                 Coverage Diff                  @@
##             asc_model_example      #22   +/-   ##
====================================================
  Coverage                     ?   22.80%           
====================================================
  Files                        ?       11           
  Lines                        ?      307           
  Branches                     ?        0           
====================================================
  Hits                         ?       70           
  Misses                       ?      237           
  Partials                     ?        0

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jlk9 jlk9 merged commit 72c7b05 into asc_model_example Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jlk9 @glwagner @navidcy