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

Fix inconsistent pressure units in HEMCO standalone #284

Merged
merged 2 commits into from
Aug 1, 2024

Conversation

yantosca
Copy link
Contributor

@yantosca yantosca commented Jul 31, 2024

Name and Institution (Required)

Name: Bob Yantosca
Institution: Harvard + GCST

Describe the update

This is the companion PR to #277 by @yuanjianz. It fixes the inconsistent pressure unit handling in the HEMCO standalone as described in that issue.

Expected changes

The HEMCO standalone will use 'Pa' for pressure units regardless of input meteorology.

Related Github Issue

CHANGELOG.md
- Added a note about fixing the pressure issue in HEMCO standalone

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca added topic: HEMCO Standalone Model Pertaining to the HEMCO standalone category: Bug Fix Fixes a bug that was previously reported labels Jul 31, 2024
@yantosca yantosca added this to the 3.10.0 milestone Jul 31, 2024
@yantosca yantosca self-assigned this Jul 31, 2024
@yantosca yantosca linked an issue Jul 31, 2024 that may be closed by this pull request
src/Core/hco_geotools_mod.F90
- Check if PSFC (surface pressure) is in hPa on the first call
  to HCO_CalcVertGrid.  Use a SAVEd logical flag (DO_SCALE_PSFC)
  to denote if we need to convert from hPa to Pa.
- Add code to convert PSFC from hPa to Pa on each timestep,
  depending on the value of DO_SCALE_PSFC
- Updated comments

Signed-off-by: Bob Yantosca <[email protected]>
IF ( .NOT. FoundPEDGE ) THEN
!$OMP PARALLEL DO &
!$OMP DEFAULT( SHARED ) &
!$OMP PRIVATE( I, J, L )
!$OMP PRIVATE( I, J, L ) &
!$OMP COLLAPSE( 3 )
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Collapsing the loop will result in a speedup.

@yantosca
Copy link
Contributor Author

yantosca commented Aug 1, 2024

Integration tests are running.

@yantosca
Copy link
Contributor Author

yantosca commented Aug 1, 2024

All GEOS-Chem Classic integration tests passed:

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

GCClassic #6f22240 GEOS-Chem submod update: Merge PR #2398 (Uncomment cations for HETP)
GEOS-Chem #e29a4c928 Merge PR #2398 (Pass non-zero Ca2, Mg, and K cations to HETP)
HEMCO     #8be6b60 Convert PSFC from hPa -> Pa in HCO_CalcVertGrid

Using 24 OpenMP threads
Number of execution tests: 28

Submitted as SLURM job: 42183358
==============================================================================

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

Also, all tests were zero-diff w/r/t the prior PR #2398 except for

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

@yantosca
Copy link
Contributor Author

yantosca commented Aug 1, 2024

All GCHP integration tests passed:

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

GCHP      #136fa70 GEOS-Chem submod update: Merge PR #2398 (Uncomment cations for HETP)
GEOS-Chem #e29a4c928 Merge PR #2398 (Pass non-zero Ca2, Mg, and K cations to HETP)
HEMCO     #

Number of execution tests: 11

Submitted as SLURM job: 42183723
==============================================================================
 
Execution tests:
------------------------------------------------------------------------------
gchp_merra2_carbon..................................Execute Simulation....PASS
gchp_merra2_carbon_CH4..............................Execute Simulation....PASS
gchp_merra2_carbon_CO...............................Execute Simulation....PASS
gchp_merra2_carbon_CO2..............................Execute Simulation....PASS
gchp_merra2_carbon_OCS..............................Execute Simulation....PASS
gchp_merra2_fullchem................................Execute Simulation....PASS
gchp_merra2_fullchem_benchmark......................Execute Simulation....PASS
gchp_merra2_fullchem_RRTMG..........................Execute Simulation....PASS
gchp_merra2_fullchem_TOMAS15........................Execute Simulation....PASS
gchp_merra2_tagO3...................................Execute Simulation....PASS
gchp_merra2_TransportTracers........................Execute Simulation....PASS
 
Summary of test results:
------------------------------------------------------------------------------
Execution tests passed: 11
Execution tests failed: 0
Execution tests not yet completed: 0

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

Also, all tests were zero-diff w/r/t PR #2398.

@yantosca yantosca requested a review from msulprizio August 1, 2024 17:25
@yantosca yantosca marked this pull request as ready for review August 1, 2024 17:25
@yantosca yantosca merged commit f2b6ae4 into dev/3.10.0 Aug 1, 2024
1 check passed
@yantosca yantosca deleted the bugfix/hcosa-pressure branch August 1, 2024 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Bug Fix Fixes a bug that was previously reported topic: HEMCO Standalone Model Pertaining to the HEMCO standalone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect handling of pressure unit in HEMCO standalone
2 participants