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

Incorporate upstream changes for RRTMGP #14

Merged
merged 280 commits into from
Mar 13, 2024
Merged

Conversation

gdicker1
Copy link

@gdicker1 gdicker1 commented Mar 5, 2024

Merge in changes from upstream ESCOMP/CAM tag 'cam6_3_148' (PR ESCOMP#909) to add RTE-RRTMGP radiation parameterization.

lizziel added 30 commits June 24, 2022 12:02
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Also deleted unused use case defined in geoschem_baro_moist.xml

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
-Move megan_specifier definition for GEOS-Chem in use_cases files to
 bld/build-namelist given chem=geoschem
-Move cam_physics_mesh definitions used by HEMCO from use_cases files to
 namelist_defaults_cam.xml
-Remove drydep_method, ext_frc_*, and srf_emis_* parameters from
 GEOS-Chem use case files
-Delete namelist file (geoschem_baro_moist.xml) for unused GEOS-Chem
 compset
-Set default RUN_STARTDATE for the GEOS-Chem climo compsets in
 config_compsets.xml
-Remove ext_frc_* and srf_emis_* variables from geoschem/chemistry.F90
 since not used
-Fix incorrect comment in mo_chem_utls.F90

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
This update also slims down the dry deposition lists to not include
aerosols or unused species (new lists submitted by Haipeng Lin).

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
…_merge

# Conflicts:
#	Externals.cfg
#	src/cpl/mct/cam_cpl_indices.F90
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Debug prints are now only done by the master processor. The debug logical
is still manually set in mo_neu_wetdep.F90. It is false by default.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Currently set to true by default.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Gas-phase dry deposition using GEOS-Chem is not yet validated.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Previously file only contained filenames. This update should be used with
CIME updates submitted in:
ESMCI/cime#4180
ESMCI/cime#4302

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Local debug option can be enabled in the source code to print messages
before and after chem_timestep_tend and aero_model_drydep are called.
Prints are off by default.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Dry deposition in GEOS-Chem now uses a combination of CLM dry deposition
velocities and GEOS-Chem computed velocities which is determined by
presence of ocean (100% CLM velocities if no ocean, 100% GEOS-Chem
velocities if all ocean, and a scaled value of the two if in between).
This update also uncomments several code that set State_Met fields, and
the logicals for CLM drydep vel and online land type is removed (the
former is effectively now always true and the latter is always false).

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
These will need to change again before merge because GEOS-Chem 14.0.0
and HEMCO 3.5.0 are not yet released, and I am now using my fork of
HEMCO_CESM with modifications needed to link to and build latest HEMCO
as is.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
…m case

This is until there is a better way to handle the wetdep and drydep
lists for GEOS-Chem cases

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Eventually this will go higher up in the cam bld directory since the
same file is used for all GEOS-Chem cases.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
lizziel and others added 16 commits January 31, 2024 14:51
I previously changed the test to zonal mean nudging when updating from
cheyenne to derecho. Apparently the compset is not set up to do this and
I therefore reverted to the previous test which is basic nuging.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
cam6_3_147: GEOS-Chem chemistry and four new compsets that use it
Provide RRTMGP as a radiation parameterization
ESCOMP/CAM PR ESCOMP#909 from brian-eaton/rrtmgp. Provide RRTMGP as a
radiation parameterization.
@gdicker1 gdicker1 added enhancement New feature or request upstream Related to the upstream repo (ESCOMP/CAM) labels Mar 5, 2024
@gdicker1 gdicker1 self-assigned this Mar 5, 2024
@gdicker1
Copy link
Author

gdicker1 commented Mar 5, 2024

Note: the plan is to fast-forward merge this branch onto ew-develop

@gdicker1
Copy link
Author

FYI: to run RRTMGP you can create a case and use the command ./xmlchange --append CAM_CONFIG_OPTS="-rad rrtmgp" before building (or use rrtmgp_gpu instead if the case is also being created with GPU flags).

@gdicker1 gdicker1 merged commit f09ed7c into ew-develop Mar 13, 2024
2 checks passed
@gdicker1
Copy link
Author

Since I was able to create a F2000climo case, add -rad rrtmgp to CAM_CONFIG_OPTS, and run it. I consider this able to merge.

@gdicker1 gdicker1 deleted the update/cam6_3_148 branch April 23, 2024 23:19
gdicker1 pushed a commit that referenced this pull request Aug 29, 2024
fix issue with sparse checkout dir path
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request upstream Related to the upstream repo (ESCOMP/CAM)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants