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

Cloud-J in GEOS-Chem Classic #27

Merged
merged 7 commits into from
Dec 12, 2023
Merged

Cloud-J in GEOS-Chem Classic #27

merged 7 commits into from
Dec 12, 2023

Conversation

lizziel
Copy link
Contributor

@lizziel lizziel commented Nov 18, 2022

Name and Institution (Required)

Name: Lizzie Lundgren
Institution: Harvard University

Describe the update

This update adds the Cloud-J photolysis library as a submodule with GC-Classic. It is stored alongside GEOS-Chem and HEMCO in the src folder. This PR should be merged with geoschem/geos-chem#1522.

Expected changes

See geoschem/geos-chem#1522 for changes expected in GEOS-Chem when using Cloud-J to compute J-values.

Reference(s)

Prather, M. J.: Photolysis rates in correlated overlapping cloud fields: Cloud-J 7.3c, Geosci. Model Dev., 8, 2587–2595, https://doi.org/10.5194/gmd-8-2587-2015, 2015.

Related Github Issue(s)

geoschem/geos-chem#1522

@lizziel lizziel added the never stale Never label this issue as stale label Nov 18, 2022
@lizziel lizziel self-assigned this Nov 18, 2022
@msulprizio msulprizio changed the base branch from dev/14.1.0 to main January 18, 2023 13:37
@lizziel lizziel changed the base branch from main to dev/14.2.0 April 13, 2023 20:21
@lizziel lizziel changed the base branch from dev/14.2.0 to main April 13, 2023 20:22
@lizziel lizziel added the category: Feature Request New feature or request label Apr 13, 2023
@lizziel lizziel changed the base branch from main to dev/14.3.0 November 13, 2023 15:11
@lizziel lizziel changed the title [WIP] Cloud-J in GEOS-Chem Classic Cloud-J in GEOS-Chem Classic Nov 29, 2023
@lizziel lizziel changed the base branch from dev/14.3.0 to main November 29, 2023 15:14
@lizziel lizziel marked this pull request as ready for review November 29, 2023 15:16
Copy link
Contributor

@yantosca yantosca left a comment

Choose a reason for hiding this comment

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

Thanks @lizziel. Looks good to merge but we just need a CHANGELOG.md update.

@yantosca yantosca added topic: Build Related to CMake and/or the build sequence external modules Relateld to external modules interfaced with GCClassic labels Nov 29, 2023
@yantosca yantosca added this to the 14.3.0 milestone Nov 29, 2023
@lizziel
Copy link
Contributor Author

lizziel commented Nov 29, 2023

Thanks @yantosca! I just merged in dev/14.3.0 and updated the changelog.

Copy link
Contributor

@yantosca yantosca left a comment

Choose a reason for hiding this comment

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

Thanks @lizziel! Good to merge.

CLOUDJ is now a compile-time option in GEOS-Chem Classic. Note that Cloud-J
itself is not yet used in GEOS-Chem with this update.

Signed-off-by: Lizzie Lundgren <[email protected]>
Submodule src/Cloud-J 766472c..4d612ea:
  > Update comments in cld_sub_mod for clarity
  > Remove unused inputs to ICA_* subroutines called in Cloud_JX
  > Fix bug in Cloud-J standalone for computing ice water path input
    to Cloud-J
  > Minor updates, including fixing write statement format to fit
    # GC jvalues

Signed-off-by: Lizzie Lundgren <[email protected]>
Signed-off-by: Lizzie Lundgren <[email protected]>
  > Merge pull request #4 from jimmielin/hplin/fix_decl_ifort
  > Updates for using MAPL in Cloud-J
  > Include compile definition for MODEL_GEOSCHEM when building in GCHP

Signed-off-by: Lizzie Lundgren <[email protected]>
  > Remove unused common variables JXL_, JXL1_, and JXL2_
  > Make number of CTM levels set by the calling program during initialization

Signed-off-by: Lizzie Lundgren <[email protected]>
Signed-off-by: Lizzie Lundgren <[email protected]>

# Conflicts:
#	CHANGELOG.md
@msulprizio msulprizio changed the base branch from main to dev/14.3.0 December 12, 2023 16:56
@msulprizio msulprizio merged commit 65fe34e into dev/14.3.0 Dec 12, 2023
1 check passed
@msulprizio msulprizio deleted the feature/cloud-j branch December 12, 2023 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Feature Request New feature or request external modules Relateld to external modules interfaced with GCClassic never stale Never label this issue as stale topic: Build Related to CMake and/or the build sequence
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants