pulling #2
Merged
pulling #2
Conversation
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
Add missing local parameters to private OMP
Merging latest master changes into the feature-hamocc_beyond-CMIP6 branch
add ability to read an ocean alkalinization scenario from file and put ocean alkalinisation related variables in own namelist (BGCOAFX)
…ons include 2D structure of diffusivity, anisotropy correction of diffusivity and to use the minimum of planetary and topographic beta to define the Rhines scale.
fixed pnetcdf usage in CIME
…g bathymetry in the estimation of column average quantities used for mesoscale eddy diffusivity.
New mesoscale eddy diffusivity options
…ybrid_enhancements2 Conflicts: phy/mod_difest.F phy/mod_diffusion.F90
… diagnostic fields after restart.
…shear computation and added nonlocal distribution of momentum flux in the boundary layer.
…ompilers to improve code reproducibility.
Update config_pes for OMIP-2 simulations on Betzy
…mediator OR send the fluxes back
BLOM/iHAMOCC compsets will no longer have science_support attributes in connection with the noresm2.1 release.
Remove science_support attribute for compsets
Remove science_support attribute for compsets
…inuous density reconstruction at interfaces.
…al reconstruction, regridding and remapping: - If the system of equations solved for 6th order accurate edge estimates and 5th order accurate slope estimates leads to tridiagonal matrices that are not diagonally dominant, reduce the order of accuracy locally. - Added flexibility in selecting the order of accuracy for the explicit scheme for edge and slope estimation at boundaries. The maximum order for the left and right boundaries can be specified and the order will be automatically reduced if the available grid cells cannot support the requested order. - Avoid division by zero in the PQM limiting when the range of source values is zero.
… for the explicit scheme for edge and slope estimation at the upper and lower boundaries.
…h the source data.
* Write parameter values as global attributes to nc-file * add entries for control switches
Co-authored-by: Tomas Torsvik <[email protected]>
… into feature-hybrid_enhancements4
Update meson and remove build with intel compiler
Hybrid coordinate enhancements 4
- Disable running test code with macos, throws a SIGFPE exception - Update "upload test log" to upload-artifact@v4, removes some deprecate warnings
Update CI test code section
* TESTING ONLY: adopt new SI units in mo_intfcblom.F90 * adjust mo_intfcblom.F90 to new SI units * correct unit for prho * correct unit for prho * extend description for sea water density * correct units for mks2cgs pressure-based layer thickness
New and updated topographic beta files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.