Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove duplicate WD_RetFactor tag for HgClHO2 entry in species-database.yml #2580

Merged
merged 4 commits into from
Nov 21, 2024

Conversation

yantosca
Copy link
Contributor

Name and Institution (Required)

Name: Bob Yantosca
Institution: Harvard + GCST

Describe the update

This PR removes a duplicate WD_RetFactor YAML tag for species HgClHO2 from the species_database.yml file.

Expected changes

This is a zero-diff update w/r/t the full-chemistry benchmark. It only affects the Hg simulation.

Reference(s)

N/A

Related Github Issue

Headers/state_diag_mod.F90
- Added State_Diag%SatDiagnEdgeCount counter for SatDiagnEdge collection
- Added State_Diag%Archive_SatDiagnEdgeCount logical
- Added State_Diag%Archive_SatDiagnEdge logical
- Allocated State_Diag%SatDiagnPEDGE with vertical dimension
  State_Grid%NZ+1 instead of State_Grid%NZ

GeosCore/diagnostics_mod.F90
- Initialize the State_Diag%SatDiagnEdgeCount counter in the DO loop
  where local time is updated for satellite diagnostics
- Now use State_Grid%NZ+1 vertical levels when saving into the
  State_Diag%SatDiagnPedge field

History/history_util_mod.F90
- Added routine "SatDiagn_or_SatDiagnEdge" to set logical flags to
  determine if the current container is either SatDiagn or SatDiagnEdge

History/history_netcdf_mod.F90
- Call routine SatDiagn_or_SatDiagnEdge to set logical flags indicating
  if the current collection is SatDiagn or SatDiagnEdge
- Added an IF block to compute the average of fields belonging to
  the SatDiagnEdge collection

History/history_mod.F90
- Call routine SatDiagn_or_SatDiagnEdge to set logical flags indicating
  if the current collection is SatDiagn or SatDiagnEdge
- Only reset State_Diag%SatDiagnCount to zero if the current collection
  is "SatDiagn"
- Only reset the "State_Diag%SatDiagnEdgeCount" counter if the current
  collection is "SatDiagnEdge"

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
CHANGELOG.md
- Updated with info about the satellite diagnostic fixes

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
This merge brings PR #2544 (Add counter for SatDiagnPedge
collection; Prevent satelli-te diagnostic counters from being
inadvertently reset, by @) into the GEOS-Chem
"no-diff-to-benchmark" development stream.

This PR does the following:

1. Adds a separate local time counter
   (State_Diag%SatDiagnEdgeCount) for the SatDiagnEdge
   collection

2. Allocates the State_Diag%SatDiagnPEDGE field with
   State_Diag%NZ+1 vertical levels. (This formerly was
   allocated with State_Diag%NZ levels, which cut off the
   top-of-the atmosphere (L=73) level).

3. Adds a new function SatDiagn_or_SatDiagnEdge in
   History/history_netcdf_mod.F90 to set logical flags to
   denote if the current container name is either
   "SatDiagn" or "SatDiagnEdge"

4. Added code in History/history_netcdf_mod.F90 to compute
   time-averages of fields belonging to the SatDiagnEdge
    collection.

5. Updated code in History/history_mod.F90 to:

   - Reset the State_Diag%SatDiagnCount counter array
     ONLY IF the current container name is SatDiagn.
   - Reset the State_Diag%SatDiagnEdgeCount counter array
     ONLY IF the current container name is SatDiagnEdge.

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
run/shared/species_database.yml
- Removed the duplicate WD_RetFactor YAML tag for HgClHO2

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
@yantosca yantosca added topic: Configuration Files Related to GEOS-Chem configuration files no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations category: Bug Fix Fixes a previously-reported bug topic: Hg or POPs simulations Related to the GEOS-Chem Mercury Simulation labels Nov 20, 2024
@yantosca yantosca self-assigned this Nov 20, 2024
@yantosca yantosca added this to the 14.5.1 milestone Nov 20, 2024
@yantosca yantosca linked an issue Nov 20, 2024 that may be closed by this pull request
@yantosca yantosca merged commit 135bdaa into dev/no-diff-to-benchmark Nov 21, 2024
@yantosca yantosca deleted the bugfix/duplicate-wd-retfactor branch November 21, 2024 18:47
@yantosca
Copy link
Contributor Author

All GEOS-Chem Classic integration tests passed, except for tagCO (known restart file issue)

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

CodeDir   : a8aeb02 GEOS-Chem update: Merge PR #2578 (Fixes for GCHP adjoint )
GEOS-Chem : 62f3db08b Merge PR #2578 (Fixes to compile GCHP adjoint)
HEMCO     : deaa192 HEMCO 3.10.0 release
Cloud-J   : f8a2b7f Update version number for 8.0.1 release
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: 59103476
==============================================================================

...
gc_4x5_merra2_tagCO.................................Execute Simulation....FAIL
...
 
Summary of test results:
------------------------------------------------------------------------------
Execution tests passed: 29
Execution tests failed: 1
Execution tests not yet completed: 0

Also all tests were zero-diff w/r/t the previous integration test except for:

  • TOMAS (parallelization issue?)
  • APM (parallelization issue?)

@yantosca
Copy link
Contributor Author

All GCHP integration tests passed:

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

CodeDir       : 7c2d8e2 GEOS-Chem update: Merge PR #2578 (Fixes for GCHP adjoint )
MAPL          : 9ad63ae Merge PR #37 containing update to vertically flip imports with dimensionless pressure proxy lev coordinates
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     : 62f3db08b Merge PR #2578 (Fixes to compile GCHP adjoint)
HEMCO         : deaa192 HEMCO 3.10.0 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       : f8a2b7f Update version number for 8.0.1 release
HETP          : 2a99b24 Merge pull request #2 from geoschem/bugfix/initialize_local_variables

Number of execution tests: 12

Submitted as SLURM job: 59103750
==============================================================================

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

Also, all tests were zero-diff w/r/t the previous set of integration tests.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
category: Bug Fix Fixes a previously-reported bug no-diff-to-benchmark This update will not change the results of fullchem benchmark simulations topic: Configuration Files Related to GEOS-Chem configuration files topic: Hg or POPs simulations Related to the GEOS-Chem Mercury Simulation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

HgClHO2 entry in species-database.yml has duplicate key WD_RetFactor
1 participant