diff --git a/CMakeLists.txt b/CMakeLists.txt index d051fe24..e761ae37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ if (NOT Baselibs_FOUND) # Another issue with historical reasons, old/wrong zlib target used in GEOS add_library(ZLIB::zlib ALIAS ZLIB::ZLIB) - find_package(MAPL 2.63 QUIET) + find_package(MAPL 2.64 QUIET) if (MAPL_FOUND) message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"") endif () diff --git a/components.yaml b/components.yaml index 4fa50a73..3f4b0e18 100644 --- a/components.yaml +++ b/components.yaml @@ -51,18 +51,18 @@ GMAO_perllib: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.63.1 + tag: v2.64.0 develop: develop GEOSldas_GridComp: local: ./src/Components/@GEOSldas_GridComp remote: ../GEOSldas_GridComp.git - branch: develop + branch: feature/wjiang/route develop: develop GEOSgcm_GridComp: local: ./src/Components/@GEOSgcm_GridComp remote: ../GEOSgcm_GridComp.git - branch: develop + branch: feature/wjiang/Routing_GEOSroute_on_yujin sparse: ./config/GEOSgcm_GridComp_ldas.sparse develop: develop diff --git a/doc/README.OutputSpecs.md b/doc/README.OutputSpecs.md index 51efe664..3e772310 100644 --- a/doc/README.OutputSpecs.md +++ b/doc/README.OutputSpecs.md @@ -19,18 +19,18 @@ Output of the latter two sets of files can be turned on/off in the `[NML_INPUT_P As part of `ldas_setup`, a sample `HISTORY.rc` configuration file is created in the experiment's `./run` directory. Users specify the desired output by editing `HISTORY.rc`. -`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables. Output can be in the native tile space ("1d") or gridded ("2d"), _**except**_ when the simulation is in the EASE grid tile space (see below). +`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables. Output can be in the native tile space ("1d") or gridded ("2d"). All variables contained in a given Collection are written: * on the same ("2d") grid (if gridded), * at the same frequency, and * with either time-average ("tavg") or instantaneous ("inst") sampling mode. -In the following example, two Collections are written. The `tavg3_2d_lnd_Nx` Collection contains time-average ("tavg"), 3-hourly ("3"), gridded ("2d") data, and the `inst1_1d_lfs_Nt` Collection contains snapshot/instantaneous ("inst"), 1-hourly, tile-space ("1d") data. +In the following example, two Collections are written. The `tavg3_2d_lnd_Nx` Collection contains time-average ("tavg"), 3-hourly ("3"), gridded ("2d") land ("lnd") data, and the `inst1_1d_glc_Nt` Collection contains snapshot/instantaneous ("inst"), 1-hourly, tile-space ("1d") glacier ("glc") data. ``` COLLECTIONS: 'tavg3_2d_lnd_Nx' - 'inst1_1d_lfs_Nt' + 'inst1_1d_glc_Nt' :: ``` @@ -69,7 +69,7 @@ In addition, the line "VERSION: 1" must be present in the header of `HISTORY.rc` **Special considerations for GEOSldas** -1. Since the introduction of mixed land+landice simulations, the tile space can differ across gridded components. For example, METFORCE fields are in the full land+landice tile space, whereas CATCH fields are in the land tilespace. Therefore, in mixed land+landice simulations, METFORCE fields and CATCH fields can no longer appear in the same "1d" HISTORY collection (which was previously the case in the "1d_lfs" collection). +1. Since the introduction of mixed land+landice simulations, the tile space can differ across gridded components. For example, METFORCE fields are in the full land+landice tile space, whereas CATCH fields are in the land tilespace. Therefore, in mixed land+landice simulations, METFORCE fields and CATCH fields can no longer appear in the same HISTORY Collection (which was previously the case in the "lfs" Collection, for both "1d" and "2d" output). 2. Beginning with MAPL v2.63.1, simulations on the EASE grid tile space can write "2d" gridded output on the native EASE grid as well as interpolated to lat/lon and cube-sphere grids.