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

Add budget diagnostic option for fixed level vertical region #2127

Merged
merged 12 commits into from
Feb 13, 2024

Conversation

lizziel
Copy link
Contributor

@lizziel lizziel commented Jan 17, 2024

Name and Institution (Required)

Name: Lizzie Lundgren
Institution: Harvard University

Describe the update

This PR brings a new budget diagnostic category. More details coming soon. This update is built off of dev/14.3.0 and so can go into 14.3.1 if we have one.

Expected changes

This is a no diff update.

Reference(s)

None

Related Github Issue(s)

This PR is somewhat related to updates going into the model for the trop and PBL budget diagnostics. Those diagnostics
have been fixed levels but will not longer be fixed level after an update in the pipeline to incorporate dynamic top layer.
#2002

This PR also goes with a GCPy update to include the fixed level diagnostic in the budget table:
geoschem/gcpy#304

@lizziel lizziel added topic: Diagnostics Related to output diagnostic data no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations labels Jan 17, 2024
@lizziel lizziel changed the base branch from main to dev/14.3.0 January 17, 2024 22:19
@lizziel lizziel changed the base branch from dev/14.3.0 to dev/no-diff-to-benchmark January 17, 2024 22:20
@lizziel lizziel force-pushed the feature/budget_diag_fixed_levels branch from ec75e0e to f3d8181 Compare February 5, 2024 20:14
@lizziel lizziel changed the base branch from dev/no-diff-to-benchmark to dev/14.3.0 February 6, 2024 15:30
@lizziel lizziel changed the base branch from dev/14.3.0 to main February 6, 2024 17:12
@lizziel lizziel added this to the 14.3.1 milestone Feb 6, 2024
@lizziel lizziel force-pushed the feature/budget_diag_fixed_levels branch from f3d8181 to 4857cea Compare February 6, 2024 19:38
@lizziel
Copy link
Contributor Author

lizziel commented Feb 6, 2024

All integration tests pass. I am updating the GCPy operations budget table to inspect results of a test run.

@lizziel
Copy link
Contributor Author

lizziel commented Feb 12, 2024

I did a test of setting Trop budget diagnostic top-level 35 and then creating the budget table for both Trop and Levs1to35 diagnostics. The results are identical:

Trop [Gg] : O3
+--------------+------------+------------+---------+------------+
| Operation    |        Ref |        Dev |    Diff |   Pct_diff |
|--------------+------------+------------+---------+------------|
| Chemistry    |  -26.38109 |  -26.38109 | 0.00000 |   -0.00000 |
| Convection   |    0.00007 |    0.00007 | 0.00000 |    0.00000 |
| EmisDryDep   |   -0.00000 |   -0.00000 | 0.00000 |   -0.00000 |
| Mixing       | -105.73124 | -105.73124 | 0.00000 |   -0.00000 |
| Transport    |   17.13633 |   17.13633 | 0.00000 |    0.00000 |
| WetDep       |    0.00000 |    0.00000 | 0.00000 |  nan       |
| ACCUMULATION | -114.97593 | -114.97593 | 0.00000 |   -0.00000 |
+--------------+------------+------------+---------+------------+
Levs1to35 [Gg] : O3
+--------------+------------+------------+---------+------------+
| Operation    |        Ref |        Dev |    Diff |   Pct_diff |
|--------------+------------+------------+---------+------------|
| Chemistry    |  -26.38109 |  -26.38109 | 0.00000 |   -0.00000 |
| Convection   |    0.00007 |    0.00007 | 0.00000 |    0.00000 |
| EmisDryDep   |   -0.00000 |   -0.00000 | 0.00000 |   -0.00000 |
| Mixing       | -105.73124 | -105.73124 | 0.00000 |   -0.00000 |
| Transport    |   17.13633 |   17.13633 | 0.00000 |    0.00000 |
| WetDep       |    0.00000 |    0.00000 | 0.00000 |  nan       |
| ACCUMULATION | -114.97593 | -114.97593 | 0.00000 |   -0.00000 |
+--------------+------------+------------+---------+------------+

I also did a 1-month run and checked that the Levs1to35 diagnostic is near but not quite equal to the Trop diagnostic. This is expected because the top level of the Trop diagnostic is dynamic.

@lizziel lizziel marked this pull request as ready for review February 12, 2024 19:03
@lizziel lizziel requested a review from yantosca February 12, 2024 19:03
@yantosca yantosca changed the base branch from main to dev/no-diff-to-benchmark February 12, 2024 19:46
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! We just need a changelog update and then I can merge this into the no-diff-to-benchmark branch.

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>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
…nostic

Default setting in all templates is levels 1 to 35. Users can change
the name to change the levels.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
The top and bottom levels strings are read from the diagnostic names
in HISTORY.rc and use to loop over levels in the vertical region when
computing budget diagnostics.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Error traps are now set to catch the following problems in HISTORY.rc:
- Missing bottom or top level
- Mismatch between either bottom or top across all diagnostics
  (Level range must be the same for all of the budget level range diags)
- Bottom level less than or equal to 0
- Bottom level greater than top level
- Top level greater than number of model levels
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Users can add additional species as needed

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
@lizziel lizziel force-pushed the feature/budget_diag_fixed_levels branch from 4857cea to 11c441e Compare February 13, 2024 19:37
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.

Good to merge!

Copy link
Contributor

Integration tests are running

@yantosca
Copy link
Contributor

yantosca commented Feb 13, 2024

All GEOS-Chem Classic integration tests passed:

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

GCClassic #8c0eab8 Merge PR #2138 and PR #2100 (Update operational run scripts)
GEOS-Chem #6e7c0de64 Merge PR #2127 (Add budget diag option for fixed level vertical region)
HEMCO     #f807e1a Update HEMCO version number to 3.8.0 in preparation for release

Using 24 OpenMP threads
Number of execution tests: 26

Submitted as SLURM job: 19589087
==============================================================================

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

Furthermore, all integration tests were zero-diff w/r/t 14.3.0, except for:

  • APM (Known parallelization issue)
  • RRTMG (numerical noise in RRTMG collection)

@yantosca
Copy link
Contributor

yantosca commented Feb 13, 2024

All GCHP integration tests also passed:

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

GCHP      #eafac30 Merge PR #2138 and PR #2100 (Update operational run scripts)
GEOS-Chem #6e7c0de64 Merge PR #2127 (Add budget diag option for fixed level vertical region)
HEMCO     #f807e1a Update HEMCO version number to 3.8.0 in preparation for release

Number of execution tests: 6

Submitted as SLURM job: 19591288
==============================================================================

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

Furthermore, all GCHP integration tests were zero-diff w/r/t 14.3.0.

@yantosca yantosca merged commit 6e7c0de into dev/no-diff-to-benchmark Feb 13, 2024
@yantosca yantosca deleted the feature/budget_diag_fixed_levels branch February 13, 2024 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations topic: Diagnostics Related to output diagnostic data
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants