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

Use MAPL_UNDEF value for HEMCO missing values if using GCHP or GEOS #171

Merged

Conversation

lizziel
Copy link
Contributor

@lizziel lizziel commented Oct 17, 2022

This PR is 1 of 2 for GCHP super-project. See instructions here:
geoschem/GCHP#258

The update in this pull request includes the following:

  1. Change the definition of missing value parameter HCO_MISSVAL when using GCHP or GEOS to match the missing value definition used in MAPL (1e15 stored in MAPL parameter MAPL_UNDEF).
  2. Introduce pre-processor switch MAPL_ESMF for use in GCHP and GEOS.
  3. Remove "temporary" kludge from 2017 that identified missing mask values as >1e14 if using GCHP.

These updates are necessary following a MAPL update to flag missing values by comparing input values to the netCDF file _FillValue attribute. MAPL now assigns MAPL_UNDEF to missing values and skips the cells during regridding. With this PR the missing values will later be recognized and properly handled in HEMCO during masking and scaling.

This pull request must be merged as the same time as MAPL PR geoschem/MAPL#21

This PR, coupled with the MAPL PR, will cause minor differences in the GCHP benchmark simulation due to a change in EDGAR diurnal scale factors used for CEDS NO. Previously MAPL did not flag missing values in the file and used _FillValue 1.0 as valid data. Using 1.0 instead of missing values in the regridding effectively dilutes valid scale factor data. This will be seen as differences along the coast in the GCHP benchmark.

Signed-off-by: Lizzie Lundgren elundgren@seas.harvard.edu

This commit also removes a temporary masking kludge to compensate for
differing missing value definitions between MAPL and HEMCO, and
introduces new pre-processor switch MAPL_ESMF for use in models that
use MAPL.

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
@lizziel lizziel added topic: ESMF or MPI Related to issues in the ESMF and/or MPI environments category: Interface to External Model Related to HEMCO updates needed to interface with other models (GEOS, WRF, CESM, etc) labels Oct 17, 2022
@lizziel lizziel added this to the 3.5.1 milestone Oct 17, 2022
@lizziel lizziel self-assigned this Oct 17, 2022
Copy link
Contributor

@msulprizio msulprizio left a comment

Choose a reason for hiding this comment

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

These changes look good to merge.

@msulprizio msulprizio changed the base branch from dev to main October 18, 2022 17:29
@msulprizio msulprizio modified the milestones: 3.5.1, 3.6.0 Oct 18, 2022
@msulprizio msulprizio changed the base branch from main to dev/3.6.0 October 18, 2022 17:33
@yantosca
Copy link
Contributor

GCHP integration tests passed

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

Number of execution tests: 3
==============================================================================
 
Execution tests:
------------------------------------------------------------------------------
gchp_fullchem_benchmark_merra2_c48...............Execute Simulation.....PASS
gchp_fullchem_standard_merra2_c24................Execute Simulation.....PASS
gchp_TransportTracers_geosfp_c24.................Execute Simulation.....PASS
 
Summary of execution test results:
------------------------------------------------------------------------------
Execution tests passed:        3
Execution tests failed:        0
Execution tests not completed: 0

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

@yantosca
Copy link
Contributor

All GEOS-Chem Classic integration tests passed

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

Using 24 OpenMP threads
Number of execution tests: 48
==============================================================================
 
Execution tests:
------------------------------------------------------------------------------
gc_025x03125_CH4_geosfp_47L_na...................Execute Simulation.....PASS
gc_025x03125_fullchem_geosfp_47L_na..............Execute Simulation.....PASS
gc_05x0625_CH4_merra2_47L_na.....................Execute Simulation.....PASS
gc_05x0625_fullchem_merra2_47L_na................Execute Simulation.....PASS
gc_2x25_aerosol_merra2...........................Execute Simulation.....PASS
gc_2x25_CH4_merra2...............................Execute Simulation.....PASS
gc_2x25_CO2_merra2...............................Execute Simulation.....PASS
gc_2x25_fullchem_merra2..........................Execute Simulation.....PASS
gc_2x25_Hg_merra2................................Execute Simulation.....PASS
gc_2x25_metals_merra2............................Execute Simulation.....PASS
gc_2x25_POPs_BaP_merra2..........................Execute Simulation.....PASS
gc_2x25_tagCH4_merra2............................Execute Simulation.....PASS
gc_2x25_tagCO_merra2.............................Execute Simulation.....PASS
gc_2x25_tagO3_merra2.............................Execute Simulation.....PASS
gc_2x25_TransportTracers_merra2..................Execute Simulation.....PASS
gc_2x25_TransportTracers_merra2_LuoWd............Execute Simulation.....PASS
gc_4x5_aerosol_geosfp............................Execute Simulation.....PASS
gc_4x5_aerosol_merra2............................Execute Simulation.....PASS
gc_4x5_CH4_geosfp................................Execute Simulation.....PASS
gc_4x5_CH4_merra2................................Execute Simulation.....PASS
gc_4x5_fullchem_aciduptake_merra2................Execute Simulation.....PASS
gc_4x5_fullchem_APM_merra2.......................Execute Simulation.....PASS
gc_4x5_fullchem_benchmark_merra2.................Execute Simulation.....PASS
gc_4x5_fullchem_complexSOA_merra2................Execute Simulation.....PASS
gc_4x5_fullchem_complexSOA_SVPOA_merra2..........Execute Simulation.....PASS
gc_4x5_fullchem_geosfp...........................Execute Simulation.....PASS
gc_4x5_fullchem_marinePOA_merra2.................Execute Simulation.....PASS
gc_4x5_fullchem_merra2...........................Execute Simulation.....PASS
gc_4x5_fullchem_merra2_47L.......................Execute Simulation.....PASS
gc_4x5_fullchem_merra2_LuoWd.....................Execute Simulation.....PASS
gc_4x5_fullchem_RRTMG_merra2.....................Execute Simulation.....PASS
gc_4x5_fullchem_TOMAS15_merra2_47L...............Execute Simulation.....PASS
gc_4x5_fullchem_TOMAS40_merra2_47L...............Execute Simulation.....PASS
gc_4x5_Hg_geosfp.................................Execute Simulation.....PASS
gc_4x5_Hg_merra2.................................Execute Simulation.....PASS
gc_4x5_metals_merra2.............................Execute Simulation.....PASS
gc_4x5_POPs_BaP_geosfp...........................Execute Simulation.....PASS
gc_4x5_POPs_BaP_merra2...........................Execute Simulation.....PASS
gc_4x5_tagCH4_geosfp.............................Execute Simulation.....PASS
gc_4x5_tagCH4_merra2.............................Execute Simulation.....PASS
gc_4x5_tagCO_geosfp..............................Execute Simulation.....PASS
gc_4x5_tagCO_merra2..............................Execute Simulation.....PASS
gc_4x5_tagO3_geosfp..............................Execute Simulation.....PASS
gc_4x5_tagO3_merra2..............................Execute Simulation.....PASS
gc_4x5_TransportTracers_geosfp...................Execute Simulation.....PASS
gc_4x5_TransportTracers_geosfp_LuoWd.............Execute Simulation.....PASS
gc_4x5_TransportTracers_merra2...................Execute Simulation.....PASS
gc_4x5_TransportTracers_merra2_LuoWd.............Execute Simulation.....PASS
 
Summary of test results:
------------------------------------------------------------------------------
Execution tests passed: 48
Execution tests failed: 0
Execution tests not yet completed: 0

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

Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
@msulprizio msulprizio merged commit 1e8e648 into dev/3.6.0 Dec 14, 2022
@msulprizio msulprizio deleted the feature/use_mapl_undef_for_hco_missval_if_gchp_or_geos branch December 14, 2022 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Interface to External Model Related to HEMCO updates needed to interface with other models (GEOS, WRF, CESM, etc) topic: ESMF or MPI Related to issues in the ESMF and/or MPI environments
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants