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

Fixes for HEMCO diagnostic config file HEMCO_Diagn.rc #2402

Merged

Conversation

lizziel
Copy link
Contributor

@lizziel lizziel commented Jul 30, 2024

Name and Institution (Required)

Name: Lizzie Lundgren
Institution: Harvard University

Describe the update

This PR contains two bug fixes:

  1. Update GC-Classic and GCHP HEMCO_Diagn.rc fullchem templates to use offline MOH biogenic emissions rather than online unless using the benchmark simulation. This corrects a problem where EmisMOH_Biogenic was filled with all zeros for non-benchmark fullchem simulations in 14.4.2 since MEGAN is no longer on starting in that version.
  2. Auto-set GCHP emissions sources in HEMCO_Diagn.rc based on HEMCO_Config.rc. This update impacts only GCHP emissions for which we have both online and offline sources, namely seasalt, soil NOx, biogenic, and dust emissions. Previously HEMCO_Diagn.rc always specified offline emissions for use in emissions diagnostics unless using the benchmark simulation. This resulted in empty emissions diagnostics if the user changed from offline to online.

Expected changes

This is a no-diff update for benchmark simulations. There are expected changes in the emissions diagnostic collection for non-benchmark full chemistry simulations and they are as follows:

  • EmisMOH_Biogenic will no longer be all zeros if using GC-Classic and GCHP
  • GCHP emission diagnostics will no longer be zero if offline emissions are changed to online

Reference(s)

None

Related Github Issue

closes #2382
Also related to #2319

@lizziel lizziel added topic: Diagnostics Related to output diagnostic data category: Bug Fix Fixes a previously-reported bug topic: Emissions Related to emissions inventories used in GEOS-Chem labels Jul 30, 2024
@lizziel lizziel added this to the 14.4.3 milestone Jul 30, 2024
@lizziel lizziel requested a review from yantosca July 30, 2024 20:07
@lizziel lizziel changed the base branch from main to dev/no-diff-to-benchmark July 30, 2024 20:08
@lizziel lizziel changed the base branch from dev/no-diff-to-benchmark to dev/14.5.0 July 30, 2024 20:08
@lizziel lizziel modified the milestones: 14.4.3, 14.5.0 Jul 30, 2024
@lizziel
Copy link
Contributor Author

lizziel commented Jul 30, 2024

I added these changes on top of dev/14.5.0. I can rebase to be on top of dev/no-diff-to-benchmark instead.

@yantosca yantosca self-assigned this Jul 30, 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. Could you revert the integrationTestCreate.sh and commonFunctionsForTests.sh files? The GCAP2 int tests are now in dev/no-diff-to-benchmark... I had to make some updates to that code so this could will cause conflicts.

CHANGELOG.md Outdated Show resolved Hide resolved
test/integration/GCClassic/integrationTestCreate.sh Outdated Show resolved Hide resolved
test/shared/commonFunctionsForTests.sh Outdated Show resolved Hide resolved
@lizziel
Copy link
Contributor Author

lizziel commented Jul 31, 2024

Yes, I am going to rebase on dev/no-diff-to-benchmark so don't merge yet!

@yantosca
Copy link
Contributor

No problem Lizzie! I'll approve so you can rebase.

@yantosca yantosca self-requested a review July 31, 2024 14:12
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. I approve these updates, since you will rebase later.

test/integration/GCClassic/integrationTestCreate.sh Outdated Show resolved Hide resolved
test/shared/commonFunctionsForTests.sh Outdated Show resolved Hide resolved
test/shared/commonFunctionsForTests.sh Outdated Show resolved Hide resolved
lizziel added 3 commits August 9, 2024 17:04
Previously the run directory was configured to always use online biogenic
MOH values for the EmisMOH_Biogenic variable in HEMCO emissions.

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

This update impacts only GCHP emissions for which we have both online and
offline sources, namely seasalt, soil NOx, biogenic, and dust emissions.
Previously HEMCO_Diagn.rc always specified offline emissions for use
in emissions diagnostic unless using the benchmark simulation. Now the
file is automatically updated at run-time to use online values instead
if the extension is turned on within HEMCO_Config.rc.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
@lizziel lizziel force-pushed the bugfix/emission_diagnostic_fixes_in_rundir branch from e852ad5 to ee4b30d Compare August 9, 2024 21:06
@lizziel lizziel modified the milestones: 14.5.0, 14.4.3 Aug 9, 2024
@lizziel lizziel changed the base branch from dev/14.5.0 to dev/no-diff-to-benchmark August 9, 2024 21:07
@lizziel
Copy link
Contributor Author

lizziel commented Aug 9, 2024

@yantosca, this is now rebased on dev/no-diff-to-benchmark. I updated the milestone to be 14.4.3.

@yantosca
Copy link
Contributor

Thanks @lizziel! I merged this into dev/no-diff-to-benchmark (locally) and am running integration tests.

@yantosca
Copy link
Contributor

All GEOS-Chem Classic integration tests passed:

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

CodeDir   : 60dd1a6 GEOS-Chem submod update: Merge PR #2413 (Fix unit conv in aerosol sim)
GEOS-Chem : 034507531 Merge PR #2402 (Fixes for HEMCO_Diagn.rc)
HEMCO     : e68ebae HEMCO 3.9.2 release
Cloud-J   : 37a4ece Update release version number and date
HETP      : 2a99b24 Merge pull request #2 from geoschem/bugfix/initialize_local_variables

Using 24 OpenMP threads
Number of execution tests: 30

Submitted as SLURM job: 43548446
==============================================================================

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

All tests were zero-diff w/r/t the previous PR #2413, except:

  • TOMAS (parallelization error?)
  • APM (parallelization error?)

The following fullchem tests were zero-diff w/r/t PR #2413 (as evidenced by identical Restart files), but the EmisMOH_biogenic field in HEMCO_diagnostics is no longer all zeros:

  • fullchem
  • fullchem_aciduptake
  • fullchem_APM
  • fullchem_complexSOA
  • fullchem_complexSOA_SVPOA
  • fullchem_LuoWd
  • fullchem_RRTMG

@yantosca
Copy link
Contributor

All GCHP integration tests passed:

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

CodeDir       : 4cadc0d GEOS-Chem submod update: Merge PR #2413 (Fix unit conv in aerosol sim)
MAPL          : 231d53c Merge pull request #36 from geoschem/feature/improve_hflux_regridding
GMAO_Shared   : 4ddb3ec Merge pull request #2 from geoschem/feature/mapl-upgrade
ESMA_cmake    : ad5deba Added ecbuild as a submodule of ESMA_cmake
gFTL-shared   : 4b82492 Merge branch 'upstream_v1.5.0' into feature/v1.5.0
FMS           : 259759d Merge pull request #3 from geoschem/feature/update_gmao_libs
FVdycoreCubed : af42462 Merge PR #8 (Add PLEadv diagnostic for offline advection in GCHP)
geos-chem     : 034507531 Merge PR #2402 (Fixes for HEMCO_Diagn.rc)
HEMCO         : e68ebae HEMCO 3.9.2 release
yaFyaml       : 19afe50 Merge branch 'upstream_v1.0.4' into feature/v1.0.4
pFlogger      : 2c4b724 Merge branch 'upstream_v1.9.1' into feature/v1.9.1
Cloud-J       : 37a4ece Update release version number and date
HETP          : 2a99b24 Merge pull request #2 from geoschem/bugfix/initialize_local_variables

Number of execution tests: 12

Submitted as SLURM job: 43561008
==============================================================================

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

All tests were zero-diff w/r/t the prior PR #2413.

The fullchem_benchmark and fullchem_alldiags tests showed differences in the Emissions collection, that were caused by the updates to setCommonRunSettings.sh added in this PR.

@yantosca yantosca merged commit 0345075 into dev/no-diff-to-benchmark Aug 12, 2024
@yantosca yantosca deleted the bugfix/emission_diagnostic_fixes_in_rundir branch August 12, 2024 18:38
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: Diagnostics Related to output diagnostic data topic: Emissions Related to emissions inventories used in GEOS-Chem
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EmisDST[N]_Natural not populated when changing from offline dust emissions to online
2 participants