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

Read number of levels with clouds used in photolysis from config file #2342

Conversation

lizziel
Copy link
Contributor

@lizziel lizziel commented Jun 20, 2024

Name and Institution (Required)

Name: Lizzie Lundgren
Institution: Harvard University

Describe the update

This PR addresses the issue of hard-coding number of levels with cloud within Cloud-J photolysis. It fixes a bug where you can only use Cloud-J in GEOS-Chem at 72 levels. It goes with Cloud-J PR geoschem/Cloud-J#17 which now accepts this parameter from parent models.

Updates include:

  • Add new Input_Opt setting Nlevs_Phot_Cloud
  • Set Input_Opt%Nlevs_Phot_Cloud from new setting in geoschem_config.yml photolysis menu
  • Move a few existing settings in input_opt_mod.F90 to photolysis menu since that is now where they are stored in geoschem_config.yml
  • Update all geoschem_config.yml templates to include the new parameter.

Expected changes

This is a zero diff update.

Reference(s)

None

Required companion PRs

geoschem/Cloud-J#17

Related Github issues

geoschem/Cloud-J#16

@lizziel lizziel added topic: Configuration Files Related to GEOS-Chem configuration files category: Interface to External Model Related to GEOS-Chem updates needed to interface with other models category: Bug Fix Fixes a previously-reported bug and removed category: Interface to External Model Related to GEOS-Chem updates needed to interface with other models labels Jun 20, 2024
@lizziel lizziel force-pushed the feature/input_photolysis_num_levs_with_clouds branch from 5cb776e to 76f368b Compare June 27, 2024 17:31
lizziel added 3 commits July 8, 2024 11:47
…loud-j

Updates include:
 - Add new Input_Opt setting Nlevs_Phot_Cloud
 - Set Input_Opt%Nlevs_Phot_Cloud from new setting in geoschem_config.yml
   photolysis menu
 - Move a few existing settings in input_opt_mod.F90 to photolysis menu
   since that is now where they are stored in geoschem_config.yml
 - Update all geoschem_config.yml templates. All use 34 as number of levels
   with clouds except CESM which uses 22.

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 lizziel force-pushed the feature/input_photolysis_num_levs_with_clouds branch from 76f368b to e91ce06 Compare July 8, 2024 15:49
@lizziel lizziel marked this pull request as ready for review July 8, 2024 19:28
@yantosca yantosca self-requested a review July 8, 2024 19:58
@yantosca yantosca self-assigned this Jul 8, 2024
@yantosca yantosca added this to the 14.4.2 milestone Jul 8, 2024
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. This looks OK to merge. One thing, we will need to add the num_levs_with_cloud YAML tag to the geoschem_config.rst documentation page. We could do this in the docs/dev branch though.

@yantosca
Copy link
Contributor

yantosca commented Jul 9, 2024

Integration tests are running

@yantosca
Copy link
Contributor

yantosca commented Jul 9, 2024

All GEOS-Chem Classic integration tests passed:

==============================================================================
GEOS-Chem Classic: Execution Test Results

GCClassic #14397c6 GEOS-Chem submod update: Merge PR #2363 (Update setCommonRunSettings.sh)
GEOS-Chem #f78052f59 Merge PR #2342 (Read number of levels with clouds into Cloud-J)
HEMCO     #2192e0e HEMCO 3.9.1 release

Using 24 OpenMP threads
Number of execution tests: 28

Submitted as SLURM job: 39073394
==============================================================================

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%  All execution tests passed!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

All tests were zero-diff w/r/t PR #2363 except:

  • TOMAS15 (parallelization error?)
  • APM (parallelization error?)

@yantosca
Copy link
Contributor

yantosca commented Jul 9, 2024

All GCHP integration tests passed:

==============================================================================
GCHP: Execution Test Results

GCHP      #9c77f30 GEOS-Chem submod update: Merge PR #2363 (Update setCommonRunSettings.sh)
GEOS-Chem #f78052f59 Merge PR #2342 (Read number of levels with clouds into Cloud-J)
HEMCO     #

Number of execution tests: 11

Submitted as SLURM job: 39073425
==============================================================================

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%  All execution tests passed!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

Also, all tests were zero-diff w/r/t PR #2363.

@yantosca yantosca merged commit f78052f into dev/no-diff-to-benchmark Jul 9, 2024
@yantosca yantosca deleted the feature/input_photolysis_num_levs_with_clouds branch July 9, 2024 19:28
@yantosca yantosca mentioned this pull request Jul 9, 2024
msulprizio added a commit that referenced this pull request Jul 19, 2024
We now run a 2x2.5 ModelE2.1 (aka GCAP 2.0) full-chemistry simulation in
the GCClassic integration tests. Only one scenario (SSP2-4.5) is evaluated
here simply to ensure these future scenario simulations compile and run
for 1 hour successfully. I will defer to @ltmurray for guidance on whether
additional simulations are needed.

The GCAP 2.0 integration test is passing off of 14.4.1, confirming that the
fixes in #2342 should have resolved
the issues of GCAP 2.0 not working in 14.0.0 (as reported by Lee Murray at
IGC11).

Sample integration test output:

```
==============================================================================
GEOS-Chem Classic: Execution Test Results

GCClassic #c49fcec Submod updates: Merge GEOS-Chem PR #2353 and Cloud-J PR #19
GEOS-Chem #7e4001658 Merge PR #2369 (Fix several issues with satellite diagnostics)
HEMCO     #2192e0e HEMCO 3.9.1 release

Using 24 OpenMP threads
Number of execution tests: 29

Submitted as SLURM job: 40462513
==============================================================================

Execution tests:
------------------------------------------------------------------------------
gc_05x0625_NA_47L_merra2_CH4........................Execute Simulation....PASS
gc_05x0625_NA_47L_merra2_fullchem...................Execute Simulation....PASS
gc_2x25_ModelE2.1_fullchem..........................Execute Simulation....PASS
```

Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
lizziel pushed a commit that referenced this pull request Jul 30, 2024
We now run a 2x2.5 ModelE2.1 (aka GCAP 2.0) full-chemistry simulation in
the GCClassic integration tests. Only one scenario (SSP2-4.5) is evaluated
here simply to ensure these future scenario simulations compile and run
for 1 hour successfully. I will defer to @ltmurray for guidance on whether
additional simulations are needed.

The GCAP 2.0 integration test is passing off of 14.4.1, confirming that the
fixes in #2342 should have resolved
the issues of GCAP 2.0 not working in 14.0.0 (as reported by Lee Murray at
IGC11).

Sample integration test output:

```
==============================================================================
GEOS-Chem Classic: Execution Test Results

GCClassic #c49fcec Submod updates: Merge GEOS-Chem PR #2353 and Cloud-J PR #19
GEOS-Chem #7e4001658 Merge PR #2369 (Fix several issues with satellite diagnostics)
HEMCO     #2192e0e HEMCO 3.9.1 release

Using 24 OpenMP threads
Number of execution tests: 29

Submitted as SLURM job: 40462513
==============================================================================

Execution tests:
------------------------------------------------------------------------------
gc_05x0625_NA_47L_merra2_CH4........................Execute Simulation....PASS
gc_05x0625_NA_47L_merra2_fullchem...................Execute Simulation....PASS
gc_2x25_ModelE2.1_fullchem..........................Execute Simulation....PASS
```

Signed-off-by: Melissa Sulprizio <mpayer@seas.harvard.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Bug Fix Fixes a previously-reported bug topic: Configuration Files Related to GEOS-Chem configuration files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants