search

geoschem / geos-chem

GEOS-Chem "Science Codebase" repository. Contains GEOS-Chem science routines, run directory generation scripts, and interface code. This repository is used as a submodule within the GCClassic and GCHP wrappers, as well as in other modeling contexts (external ESMs).
http://geos-chem.org
Other
170 stars 166 forks source link

Add counter for SatDiagnPedge collection; Prevent satellite diagnostic counters from being inadvertently reset #2544

Closed yantosca closed 1 day ago

yantosca commented 3 weeks ago

Name and Institution (Required)

Name: Bob Yantosca Institution: Harvard + GCST

Describe the update

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.

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

yantosca commented 2 weeks ago

Could you please update CHANGELOG.md? Otherwise looks good.

Thanks @msulprizio for catching this! I had the update ready but forgot to push. Now fixed in d096b7d.

yantosca commented 1 day ago

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: 0

The 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.

yantosca commented 1 day ago

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!  %%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%