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

Improve surface fluxes #556

Merged
merged 1 commit into from
Jul 29, 2020
Merged

Improve surface fluxes #556

merged 1 commit into from
Jul 29, 2020

Conversation

charleskawczynski
Copy link
Member

@charleskawczynski charleskawczynski commented Nov 21, 2019 •
edited
Loading

This PR:

  • Removed the Byun functions, since we'll want to use a discretization-independent model (as is done in the Nishizawa paper)
  • Combines the functions into a single function call
  • Now offers to pass the potential temperature flux as an optional argument. If not given, the surface fluxes are computed as is done in the Nishizawa paper. Otherwise, the friction velocity and temperature scale are computed in a decoupled system of equations.
  • Adjusted the docs accordingly
  • Removes use of PlanetParameters and uses CLIMAParameters

More tests would be great to add, but I'm not sure how to do that at the moment.

@charleskawczynski charleskawczynski mentioned this pull request Nov 21, 2019
Closed
@simonbyrne
Copy link
Member

simonbyrne commented Dec 12, 2019 •
edited
Loading

Needs a rebase or merge + squash

@charleskawczynski
Copy link
Member Author

Needs a rebase or merge + squash

@simonbyrne done.

@codecov
Copy link

codecov bot commented Jan 9, 2020 •
edited
Loading

Codecov Report

Merging #556 into master will decrease coverage by 2.27%.
The diff coverage is 80.7%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #556      +/-   ##
==========================================
- Coverage    70.3%   68.02%   -2.28%     
==========================================
  Files         103       99       -4     
  Lines        6672     6997     +325     
==========================================
+ Hits         4691     4760      +69     
- Misses       1981     2237     +256
Impacted Files Coverage Δ
...s/Parameterizations/SurfaceFluxes/SurfaceFluxes.jl 83.07% <80.7%> (-8.51%) ⬇️
...rc/Ocean/HydrostaticBoussinesq/SimpleBoxProblem.jl 0% <0%> (-100%) ⬇️
src/Mesh/Filters_kernels.jl 0% <0%> (-100%) ⬇️
...ydrostaticBoussinesq/HydrostaticBoussinesqModel.jl 1.01% <0%> (-80.92%) ⬇️
...n/HydrostaticBoussinesq/OceanBoundaryConditions.jl 0% <0%> (-72.35%) ⬇️
src/Ocean/HydrostaticBoussinesq/LinearHBModel.jl 0% <0%> (-69.24%) ⬇️
src/Atmos/Model/courant.jl 46.15% <0%> (-33.85%) ⬇️
src/Mesh/Filters.jl 51.21% <0%> (-21.96%) ⬇️
src/DGmethods/DGmodel.jl 80.55% <0%> (-11.86%) ⬇️
src/ODESolvers/ODESolvers.jl 80.76% <0%> (-10.41%) ⬇️
... and 63 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2cf03cf...f86c27e. Read the comment docs.

@charleskawczynski charleskawczynski mentioned this pull request Mar 19, 2020
Merged
1 task
@charleskawczynski
Copy link
Member Author

@simonbyrne Can we merge this after resolving the packages? I'd rather replace CLIMA parameters for surface fluxes after this PR is merged than before. The GPU issue with NLsolve may be resolved soon

@charleskawczynski charleskawczynski force-pushed the ImproveSurfaceFluxes branch 2 times, most recently from cbefb6e to db1a601 Compare April 11, 2020 22:57
@charleskawczynski charleskawczynski force-pushed the ImproveSurfaceFluxes branch 2 times, most recently from 23295b8 to 059ab67 Compare May 11, 2020 16:49
@simonbyrne
Copy link
Member

JuliaDiffEq includes its own nlsolver
https://github.com/SciML/OrdinaryDiffEq.jl/blob/master/src/nlsolve/type.jl#L11

@blallen blallen mentioned this pull request Jul 23, 2020
Open
18 tasks
@charleskawczynski charleskawczynski force-pushed the ImproveSurfaceFluxes branch 3 times, most recently from 0aee03f to 409b99d Compare July 28, 2020 20:44
@charleskawczynski
Copy link
Member Author

The surface fluxes module will likely need more iterations but, since @akshaysridhar is working on tests for the current interface, let's merge this and we can work on the next iteration once better tests are hooked in.

@charleskawczynski charleskawczynski force-pushed the ImproveSurfaceFluxes branch 2 times, most recently from 93147b6 to c54e81b Compare July 28, 2020 21:29
@charleskawczynski
Copy link
Member Author

bors r+

@bors
Copy link
Contributor

bors bot commented Jul 29, 2020

Build succeeded:

@bors bors bot merged commit 031b2b8 into master Jul 29, 2020
@bors bors bot deleted the ImproveSurfaceFluxes branch July 29, 2020 06:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@simonbyrne simonbyrne simonbyrne left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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