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

Merging recent master developments into the beyond-CMIP6 branch to keep it up-to-date #260

Merged
merged 29 commits into from
Jun 29, 2023
Merged

Merging recent master developments into the beyond-CMIP6 branch to keep it up-to-date #260

merged 29 commits into from
Jun 29, 2023

Conversation

jmaerz
Copy link
Collaborator

@jmaerz jmaerz commented Jun 28, 2023

Hi, to keep the beyond-CMIP6 branch with recent developments, I would like to merge master into the beyond-CMIP6 branch.

TimotheeBrgs and others added 29 commits March 6, 2023 07:41
@TimotheeBrgs
add ability to read input file for ocean alkalinization (#241)
5e4d3c3 
add ability to read an ocean alkalinization scenario from file and put ocean alkalinisation related variables in own namelist (BGCOAFX)
@JorgSchwinger
add output for N-deposition and ocean alkalinization fluxes (#247)
d3f2911
@matsbn
Added optional activation of CVMix Langmuir turbulence parameterization.
f806efa
@matsbn
Added diagnostics of wave fields received from CESM coupler.
e343fee
@TomasTorsvik
Update config_pes for OMIP-2 simulations on Betzy
39d5f90
@TomasTorsvik
Move specification for OMIP-2 "L", and restrict to DATM simulations.
cdd4593
@matsbn
Added mesoscale eddy diffusivity options by Aleksi Nummelin. The opti…
6f8c304 
…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.
@matsbn
Removed redundant halo updates.
b445763
@matsbn
Fixed a bug in the diagnostics for the case where MAXMLD is requested…
ce3e270 
… and MLD not.
@mvertens
fixed pnetcdf usage in CIME
7772131
@matsbn
Merge pull request #251 from mvertens/feature/fix_pnetcdf
81cd404 
fixed pnetcdf usage in CIME
@matsbn
With hybrid coordinate, avoid layers that are deeper than neighbourin…
f12bde8 
…g bathymetry in the estimation of column average quantities used for mesoscale eddy diffusivity.
@matsbn
Update namelist for fuk95 test.
e515be2
@matsbn
Merge pull request #253 from matsbn/feature-diffusivity_anisot3D
4b4c6f1 
New mesoscale eddy diffusivity options
@matsbn
Merge remote-tracking branch 'origin/feature-langmuir' into feature-h…
0725fff 
…ybrid_enhancements2

Conflicts:
	phy/mod_difest.F
	phy/mod_diffusion.F90
@matsbn
Specific for hybrid vertical coordinate, corrected reproducibility of…
df79309 
… diagnostic fields after restart.
@matsbn
Added possibility to apply lateral smoothing of CVMix estimated bound…
b94135b 
…ary layer depth.
@matsbn
Avoid stopping for a rare occurrence in the search for neutral interf…
ff7a997 
…aces.
@matsbn
Disable debug mode for mod_hor3map.F90.
20a73e0
@matsbn
Modify buoyancy flux computation and application for hybrid vertical …
b71f9de 
…coordinate.
@matsbn
Specific for hybrid vertical coordinate, corrected vertical velocity …
ad1451c 
…shear computation and added nonlocal distribution of momentum flux in the boundary layer.
@matsbn
For Meson buildtype "release", reduced optimization level for intel c…
ee1bade 
…ompilers to improve code reproducibility.
@TomasTorsvik
Merge pull request #248 from TomasTorsvik/update_config_pes
7be980d 
Update config_pes for OMIP-2 simulations on Betzy
@matsbn
Added option to specify source of wave fields.
dbd3629
@matsbn
Updated settings and added hybrid vertical coordinate support for tnx…
6a91b48 
…0.125v4 grid.
@matsbn
Update namelist for fuk95 test.
8e50282
@JorgSchwinger
work around compile-time error in iHAMOCC when debug mode is activated
6a9b3a7
@JorgSchwinger
fix wrong parametes in C-isotop code
e7f13a0
@matsbn
Merge pull request #255 from matsbn/feature-hybrid_enhancements2
0a389fe 
Hybrid coordinate enhancements 2
@jmaerz jmaerz added the iHAMOCC Issue mainly concerns the iHAMOCC code base label Jun 28, 2023
@jmaerz jmaerz self-assigned this Jun 28, 2023
JorgSchwinger
JorgSchwinger approved these changes Jun 28, 2023
View reviewed changes
Copy link
Contributor

@JorgSchwinger JorgSchwinger left a comment

Choose a reason for hiding this comment

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

Thanks for keeping the beyond-CMIP branch up to date. As always, it is impossible to really review the changes in detail, but I assume that this merge will do the correct thing.

TomasTorsvik
TomasTorsvik approved these changes Jun 29, 2023
View reviewed changes
Copy link
Contributor

@TomasTorsvik TomasTorsvik left a comment

Choose a reason for hiding this comment

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

Thanks @jmaerz ! I think the main change in iHAMOCC is expansion of the alkalinization routine with more scenarios, and that the default value for addalk has been changed. I don't see any major problems.

@jmaerz jmaerz merged commit cd9349f into feature-hamocc_beyond-CMIP6 Jun 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomasTorsvik TomasTorsvik TomasTorsvik approved these changes

@JorgSchwinger JorgSchwinger JorgSchwinger approved these changes

Assignees

@jmaerz jmaerz

Labels
iHAMOCC Issue mainly concerns the iHAMOCC code base
Projects
NorESM Development
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jmaerz @JorgSchwinger @TomasTorsvik @TimotheeBrgs @matsbn @mvertens