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.

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

noresm3_0_001_cam6_4_070: Update noresm branch from ESCOMP #197

Merged
merged 35 commits into from
Mar 20, 2025

Conversation

gold2718
Copy link

@gold2718 gold2718 commented Mar 10, 2025

Summary: Updates from ESCOMP from cam6_4_041 to cam6_4_070

Contributors: gold2718

Reviewers: oyvindseland, DirkOlivie

Purpose of changes: #196

Github PR URL: #197

Changes made to build system: None

Changes made to the namelist: Changed some tuning defaults for CAM7

Changes to the defaults for the boundary datasets: None

Substantial timing or memory changes: None

  • Add a timestamp in the rpointer filename

  • Fix some bugs in history output

  • Change where age of air tracers mixing ratios are sampled

  • Improvements to nitrogen deposition to surface

  • Fix Exner bug in CLUBB interface and change CLUBB namelist

  • Fix cloud frac bug in nucleate_ice_cam.F90

  • Preserve constant dry mixing ratios in gw and vertical diffusion code

  • Fix heating depth bug for gravity wave parameterization

  • CMIP 7 tuning updates

  • Add AeroTab as submodule

  • Update .gitmodules and submodule pointers

  • Updated configuration files to cam6_4_070 tag

  • Update OSLO_AERO tag to oslo_aero_3_0a001

  • Make RRTMG the default for OSLO_AERO (temporarily?)

  • Push dms_from_ocn down into CAM control for OSLO_AERO

Test list aux_cam_noresm all pass (without baseline checks which were expected to change)

fixes #196

nusbaume and others added 30 commits February 22, 2025 21:53
Merge pull request ESCOMP#1169 from PeterHjortLauritzen/std_atm_fix_for_mpas

cam6_4_042: Fix reference pressures for MPAS

ESCOMP commit: ddacf0f
Merge pull request ESCOMP#1178 from brian-eaton/cam7def

cam6_4_043: Make RRTMGP default radiation in CAM7

ESCOMP commit: db75458
Merge pull request ESCOMP#1184 from brian-eaton/tsfc

cam6_4_044: limit t_sfc to valid temperature range

ESCOMP commit: 016ffe2
Merge pull request ESCOMP#1176 from mwaxmonsky/vertical-diffusion-refactor

cam6_4_045: Vertical diffusion refactor

ESCOMP commit: 7502085
Merge pull request ESCOMP#1186 from sjsprecious/update_gpu_tests

cam6_4_046: Update GPU tests with new XML options

ESCOMP commit: 3511875
Merge pull request ESCOMP#1078 from jedwards4b/update_config_component0705

cam6_4_047: update config component to handle new compset names

ESCOMP commit: 47dd341
Merge pull request ESCOMP#1147 from jedwards4b/timestamp_in_rpointer_name

cam6_4_048: Timestamp in rpointer name

ESCOMP commit: f429ebf
Merge pull request ESCOMP#1163 from peverwhee/history-bugfixes

cam6_4_049: History bugfixes

ESCOMP commit: 95cbd6d
Merge pull request ESCOMP#1180 from jimmielin/hplin/check_energy

cam6_4_050:  Implement CCPPized check_energy_chng and check_energy_fix

ESCOMP commit: b4c6463
Merge pull request ESCOMP#1198 from fvitt/aoa_output

cam6_4_051: Age of air diagnostics

ESCOMP commit: 42e1896
Merge pull request ESCOMP#1175 from huebleruwm/clubb_intr_gpuization

cam6_4_052: clubb_intr GPUization

ESCOMP commit: ab1e8c7
Merge pull request ESCOMP#1201 from fvitt/carma_base_tag

cam6_4_053: Update CARMA external base

ESCOMP commit: adaccfd
Merge pull request ESCOMP#1211 from nusbaume/t_sfc_revert

cam6_4_054: Revert t_sfc limiter in RRTMGP

ESCOMP commit: 7a90325
Merge pull request ESCOMP#1203 from brian-eaton/misc06

cam6_4_055: Add QPLT and QPMT compsets, plus misc.

ESCOMP commit: 7de26a3
Merge pull request ESCOMP#1216 from fvitt/nitro_dep_fluxes

cam6_4_056: Nitrogen deposition fluxes

ESCOMP commit: ea101b3
Merge pull request ESCOMP#1194 from brian-eaton/ssi-scale

cam6_4_057: Restore spectral scaling to RRTMGP

ESCOMP commit: 9ee01d5
Merge pull request ESCOMP#1231 from PeterHjortLauritzen/issue1222_1208_clubb_bugfix_and_namelist_chg

cam6_4_058: Fix Exner bug in CLUBB interface and change CLUBB namelist

ESCOMP commit: 014626a
Merge pull request ESCOMP#1230 from PeterHjortLauritzen/issue1212_nucleate_ice_cam_bugfix

cam6_4_059: issue 1212 bug fix (cloud frac ice+liquid)

ESCOMP commit: b3ef374
Merge pull request ESCOMP#1234 from PeterHjortLauritzen/issue1233_preserve_constant_dry_mixingratios_in_gwdrag_bugfix

cam6_4_060: Preserve constant dry mixing ratios in gw_drag and vertical diffusion code

ESCOMP commit: 4c27612
Merge pull request ESCOMP#1232 from PeterHjortLauritzen/issue1229_heating_depth_bugfix

cam6_4_061: Fix heating depth for gravity wave scheme

ESCOMP commit: 5a1fbc8
Merge pull request ESCOMP#1117 from JulioTBacmeister/gw_devel_b00

cam6_4_062: Phase 2 of GW development

ESCOMP commit: 834379d
Merge pull request ESCOMP#1252 from cacraigucar/cam_beta06_namelist

cam6_4_063: Update namelist settings

ESCOMP commit: b90429e
Merge pull request ESCOMP#1226 from sjsprecious/fix_broken_gpu_tests

cam6_4_064: Fix broken GPU tests for CLUBB code

ESCOMP commit: 6eb3046
Merge pull request ESCOMP#1218 from cacraigucar/cam_zm_cleanup4

cam6_4_065: ZM CCPP'ization round 4 (completes CCPP conversion of ZM)

ESCOMP commit: 3eb2112
Merge pull request ESCOMP#1228 from fvitt/negwetdep

cam6_4_066: Negative wet dep messages

ESCOMP commit: 1ba445b
Merge pull request ESCOMP#1217 from brian-eaton/rm-spcam

cam6_4_067: Remove SPCAM

ESCOMP commit: a01a051
Merge pull request ESCOMP#1215 from brian-eaton/rm-eul

cam6_4_068:  remove Eulerian dycore

ESCOMP commit: ce3beab
Merge pull request ESCOMP#1219 from peverwhee/update-externals

cam6_4_069: Update externals to match beta05

ESCOMP commit: 25ede0a
Merge pull request ESCOMP#1114 from patcal/maps_pertlim_fix

cam6_4_070: Pertlim fix for MPAS

ESCOMP commit: e8de158
- Add a timestamp in the rpointer filename
- Fix some bugs in history output
- Change where age of air tracers mixing ratios are sampled
- Improvements to nitrogen deposition to surface
- Fix Exner bug in CLUBB interface and change CLUBB namelist
- Fix cloud frac bug in nucleate_ice_cam.F90
- Preserve constant dry mixing ratios in gw and vertical diffusion code
- Fix heating depth bug for gravity wave parameterization
- CMIP 7 tuning updates

Add AeroTab as submodule
Update .gitmodules and submodule pointers
Updated configuration files to cam6_4_070 tag
Use update branch of OSLO_AERO for testing
Make RRTMG the default for OSLO_AERO (temporarily?)
Push dms_from_ocn down into CAM control for OSLO_AERO
@gold2718 gold2718 added the enhancement New feature or request label Mar 10, 2025
@gold2718 gold2718 added this to the noresm3_0_alpha01 milestone Mar 10, 2025
@gold2718 gold2718 self-assigned this Mar 10, 2025
@gold2718
Copy link
Author

This PR requires merging and tagging of NorESMhub/OSLO_AERO#50 first.

Checkout optional components for fleximod test
@gold2718 gold2718 force-pushed the UpdateNoresmBranch branch from fe8e99e to 759d723 Compare March 11, 2025 08:57
@mvdebolskiy mvdebolskiy mentioned this pull request Mar 12, 2025
12 tasks
Copy link

@oyvindseland oyvindseland left a comment

Choose a reason for hiding this comment

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

I started working my way through the files but so many were syntax changes that it become hopeless to go through everything.

Looked some of the configure files and physics/cam files and did not see anything obvious

@mvdebolskiy
Copy link

ERI_D.ne30pg3_ne30pg3_mtn14.NF2000.betzy_gnu and ERR_D.ne30pg3_ne30pg3_mtn14.NF2000.betzy_gnu passes. As well as aux_cam_noresm. Are all the submodules except share,cdeps,cmeps,cism,clm have correct tags and point to correct commits?
If so, I'll start merging PR's for the submodules above and will bring the tags here.

@gold2718 gold2718 removed the request for review from DirkOlivie March 20, 2025 18:56
@mvdebolskiy
Copy link

mvdebolskiy commented Mar 20, 2025

All system tests pass.
Baselines: /cluster/shared/noresm/noresm_baselines/cam_develop/noresm3_0_alpha01

@gold2718 gold2718 merged commit bd4eb3d into NorESMhub:noresm_develop Mar 20, 2025
2 checks passed
@gold2718 gold2718 deleted the UpdateNoresmBranch branch March 20, 2025 21:05
@gold2718 gold2718 mentioned this pull request Mar 20, 2025
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

10 participants