Add counter for SatDiagnPedge collection; Prevent satellite diagnostic counters from being inadvertently reset #2544
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <[email protected]>
yantosca
added
no-diff-to-benchmark
yantosca
added
topic: Diagnostics
msulprizio
requested changes
Nov 4, 2024
CHANGELOG.md - Updated with info about the satellite diagnostic fixes Signed-off-by: Bob Yantosca <[email protected]>
Thanks @msulprizio for catching this! I had the update ready but forgot to push. Now fixed in d096b7d. |
msulprizio
approved these changes
Nov 5, 2024
|
All GEOS-Chem Classic integration tests passed except tagCO: ==============================================================================
GEOS-Chem Classic: Execution Test Results
CodeDir : e99538a GEOS-Chem update: Merge PR #2532 (Add allocate guards)
GEOS-Chem : cad65f085 Merge PR #2544 (Fixes for SatDiagn diagnostic counters)
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: 58870261
==============================================================================
...
gc_4x5_merra2_tagCO.................................Execute Simulation....FAIL
...
Summary of test results:
------------------------------------------------------------------------------
Execution tests passed: 29
Execution tests failed: 1
Execution tests not yet completed: 0The failure is attributed to the date of the restart file for the tagCO simulation having been changed to be consistent with the carbon simulation in PR #2510. This simulation is slated for removal anyway. |
|
All GCHP integration tests passed: ==============================================================================
GCHP: Execution Test Results
CodeDir : 8aa7021 GEOS-Chem update: Merge PR #2532 (Add allocate guards)
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 : cad65f085 Merge PR #2544 (Fixes for SatDiagn diagnostic counters)
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: 58871910
==============================================================================
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% All execution tests passed! %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Name and Institution (Required)
Name: Bob Yantosca
Institution: Harvard + GCST
Describe the update
This PR does the following:
Adds a separate local time counter (
State_Diag%SatDiagnEdgeCount) for theSatDiagnEdgecollectionAllocates the
State_Diag%SatDiagnPEDGEfield withState_Diag%NZ+1vertical levels. (This formerly was allocated withState_Diag%NZlevels, which cut off the top-of-the atmosphere (L=73) level).Adds a new function
SatDiagn_or_SatDiagnEdgeinHistory/history_netcdf_mod.F90to set logical flags to denote if the current container name is eitherSatDiagnorSatDiagnEdgeAdded code in
History/history_netcdf_mod.F90to compute time-averages of fields belonging to theSatDiagnEdgecollection.Updated code in
History/history_mod.F90to:State_Diag%SatDiagnCountcounter array ONLY IF the current container name isSatDiagn.State_Diag%SatDiagnEdgeCountcounter array ONLY IF the current container name isSatDiagnEdge.Expected changes
This PR will prevent the satellite diagnostic output from decreasing with time as described in #2466.
Related Github Issue
Tagging @eamarais @zpleo @msulprizio @hazel008