Update MAPL from 2.18.3 to 2.26.0 #23
Merged
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
…ninit-lperp Hotfix 1530: Initialize lperp
…ge-main-into-develop-MAPL-2022May31 GitFlow: Handmerge main into develop (2022-May-31)
…e-cmake-to-3160-mapl Update to ESMA_cmake v3.16.0
…extdata2g-missing-file Fixes GEOS-ESM#1544. Adds _ASSERT for missing ExtData file
…ge-main-into-develop-MAPL-2022Jun07 Handmerge main into develop - 2022-Jun-07
…dleio_tests Fix bundleio tests
…e-bundleio-ci Enable bundleio tests in CI
…history-mode-protect Fixes GEOS-ESM#1668. Only allow certain History modes
…dso_extension_assert remove unnecessary DSO lib name assertion
…addchildfromdso-clean Fixes GEOS-ESM#1598. Have AddChildFromDSO call Meta
…inja-build Add Ninja build of MAPL
…re-for-mapl-2260 Prepare for MAPL 2.26.0 Release
Merge Develop into Main (2.26 Release)
Fix errant changelog entry
# Conflicts: # .github/workflows/changelog-enforcer.yml # .github/workflows/workflow.yml # CMakeLists.txt # base/FileMetadataUtilities.F90 # gridcomps/Cap/MAPL_CapGridComp.F90 # gridcomps/ExtData/ExtDataGridCompMod.F90 # griddedio/GriddedIO.F90 # pfio/CMakeLists.txt Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
Signed-off-by: Lizzie Lundgren <elundgren@seas.harvard.edu>
This was referenced Nov 7, 2022
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.
This pull request is part of a group of pull requests to update MAPL from 2.18.3 to 2.26.0 in GCHP. See instructions here: geoschem/GCHP#265
This pull request merges in MAPL 2.26.0. A few post-merge fixes had to be applied for compatibility with GCHP:
yaFyamlandpFlogger. The required versions are still required (and are new - see below) but the checks do not catch that our forks contain them. We already had the version check forgFTL-sharedcommented out.ExtDatacomponentExtData2GfromSHAREDto${MAPL_LIBRARY_TYPE}. GCHP does not used libraries with typeSHARED. We made this change for several other libraries in the past.pfioand remove thepfionetCDF-C dependency. This dependency was added since 2.18.3 and it breaks the GCHP build. To fix the issue I simply removed the requirement by turning off the demos.This version update requires a new field in GCHP config file
CAP.rc. New entryUSE_EXTDATA2Gindicates whether to use input fileExtData.rcor a new file in yaml format. Using a yaml file has not yet been tested with GCHP but will be possible after this pull request is merged. The update to the GCHP run directory to include the new entry (set to false) is in geoschem/geos-chem#1489.Also note that several Goddard-Fortran-Ecosystem libraries need version updates to go with this PR.
gFTL-shared: 1.5.0
yaFyaml: 1.0.4
pFlogger: 1.9.1
This update is a zero diff update for GCHP other than a new attribute in
Historyoutput files. All output diagnostic fields now contain attributeregrid_method. This is true even if the output field is not regridded. The default value isbilinear. This field can be ignored, but it means you cannot do a straight diff of ref versus dev when testing this update except for the restart file. However, I verified that output values are the same for both diagnostic files and the restart.This PR is going to have conflict with #21. I will update one or the other depending on the order in which they are merged.