-
Notifications
You must be signed in to change notification settings - Fork 148
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MOM6: Merge branch 'gustavo-marques-legacy_diabatic_driver' into dev/…
…master - PR from NCAR to dev/master - NOAA-GFDL/MOM6@7b8698c Merge branch 'gustavo-marques-legacy_diabatic_driver' into dev/master - NOAA-GFDL/MOM6@c6020a1 Merge branch 'legacy_diabatic_driver' of https://github.com/gustavo-marques/MOM6 into gustavo-marques-legacy_diabatic_driver - NOAA-GFDL/MOM6@4f5dee8 Merge pull request #59 from gustavo-marques/add_legacy_diabatic_driver - NOAA-GFDL/MOM6@387f4e6 Add a legacy version of diabatic_driver - NOAA-GFDL/MOM6@5a58c34 Merge pull request #58 from alperaltuntas/update_halo_OBLdepth - NOAA-GFDL/MOM6@adc133e Merge remote-tracking branch 'origin/dev/ncar' into HEAD - NOAA-GFDL/MOM6@90e8f93 Update halo OBLdepth before smoothing - NOAA-GFDL/MOM6@439041a Merge pull request #57 from alperaltuntas/merge_with_candidate_may15 - NOAA-GFDL/MOM6@91e459a 2/2 - merge with candidate may15 - NOAA-GFDL/MOM6@e0a5538 1/2 - merge with candidata may15 - NOAA-GFDL/MOM6@bfa2613 move KPP_compute_BLD to streamline merging - NOAA-GFDL/MOM6@eadf2f2 Merge pull request #56 from alperaltuntas/introduce_cvmix_tidal - NOAA-GFDL/MOM6@bde57f3 rm trailing whitespaces - NOAA-GFDL/MOM6@8f73056 implement smoothing on OBL depth - NOAA-GFDL/MOM6@29a458a remove unnecessary vars in KPP_calculate - NOAA-GFDL/MOM6@34e4cf4 use 2d CS arrays for OBLdepth and kOBL - NOAA-GFDL/MOM6@c2a6ed8 add smoothBLD var - NOAA-GFDL/MOM6@82d9228 rename KPP_compute_OBL as KPP_compute_BLD - NOAA-GFDL/MOM6@85810d2 remove unnecessary KPP_compute_OBL arguments - NOAA-GFDL/MOM6@80d9323 restore KPP_calculate for now - NOAA-GFDL/MOM6@72774d7 split OBL depth computation and KPP_calculate - NOAA-GFDL/MOM6@9ce97ef use unmodified CVMix_compute_Schmittner_invariant interface - NOAA-GFDL/MOM6@bab2e43 merge with dev/ncar - NOAA-GFDL/MOM6@05a2e59 debug 3d tidal energy remapping - NOAA-GFDL/MOM6@c04f455 add diagnostics for schmittner - NOAA-GFDL/MOM6@93f242f call cvmix_coeffs_tidal_schmittner - NOAA-GFDL/MOM6@9703e7c remap tidal energy from input coord to model coord - NOAA-GFDL/MOM6@9590f3b Merge remote-tracking branch 'altuntas/initialize_tidal_ctrl_vars' into introduce_cvmix_tidal - NOAA-GFDL/MOM6@b280bfd resolve conflict - NOAA-GFDL/MOM6@0e4dce5 add cvmix_compute_SchmittnerCoeff - NOAA-GFDL/MOM6@f132940 add call to compute_Schmittner_invariant - NOAA-GFDL/MOM6@20cc62b add capability to read ER03 energy file - NOAA-GFDL/MOM6@8a4a5ed distinguish profiles and cvmix schemes
- Loading branch information
Showing
62 changed files
with
205 additions
and
1 deletion.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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.