Skip to content
This repository has been archived by the owner on Mar 1, 2023. It is now read-only.

Add supermodule Ocean around SWModel and HBModel #1302

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Add supermodule Ocean around SWModel and HBModel #1302

merged 1 commit into from
Jun 30, 2020

Conversation

blallen
Copy link
Contributor

@blallen blallen commented Jun 29, 2020 •
edited
Loading

Description

Split out from #1268. Necessary step towards coupling the SWModel and HBModel. Questionable if a supermodule is better than a base package to inherit from, but we will discuss that in the future. A further improvement with this is to move SimpleBoxProblem.jl up one level to be in Ocean.SimpleBoxProblem instead of Ocean.HydrostaticBoussinesq, but that will probably come in a separate PR (for clarity and because it is of lower importance right now)

I have

  • Written and run all necessary tests with CLIMA by including tests/runtests.jl
  • Followed all necessary style guidelines and run julia .dev/climaformat.jl .
  • Updated the documentation to reflect changes from this PR.

For review by CLIMA developers

  • There are no open pull requests for this already
  • CLIMA developers with relevant expertise have been assigned to review this submission
  • The code conforms to the style guidelines and has consistent naming conventions. julia .dev/format.jl has been run in a separate commit.
  • This code does what it is technically intended to do (all numerics make sense physically and/or computationally)

@blallen blallen added Ocean 🌊 "How inappropriate to call this planet Earth when it is quite clearly Ocean" Refactor Non-behavior changing labels Jun 29, 2020
@blallen blallen self-assigned this Jun 29, 2020
@blallen blallen mentioned this pull request Jun 29, 2020
Merged
7 tasks
@blallen
Copy link
Contributor Author

blallen commented Jun 29, 2020

bors try

bors bot added a commit that referenced this pull request Jun 29, 2020
@bors
Try #1302:
9497e3b
@bors
Copy link
Contributor

bors bot commented Jun 29, 2020

try

Build succeeded:

charleskawczynski
charleskawczynski approved these changes Jun 29, 2020
View reviewed changes
Copy link
Member

@charleskawczynski charleskawczynski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@blallen
Copy link
Contributor Author

blallen commented Jun 29, 2020

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 30, 2020

Build succeeded:

@bors bors bot merged commit 8f86446 into CliMA:master Jun 30, 2020
@blallen blallen deleted the bla/problem_refactor branch July 23, 2020 19:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@charleskawczynski charleskawczynski charleskawczynski approved these changes

Assignees

@blallen blallen

Labels
Ocean 🌊 "How inappropriate to call this planet Earth when it is quite clearly Ocean" Refactor Non-behavior changing
Projects
None yet
Milestone
ClimateMachine.jl v0.2.0 Release
Development

Successfully merging this pull request may close these issues.
2 participants
@blallen @charleskawczynski