Merging BRIDGE... into master #225
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
Hotfix/reame typo
PARdffs bug fix
- Update and rename GEOSldas.HISTORY.md to HISTORY.md - Update and rename README.GEOSldas_metforcing_and_bcs to README.metforcing_and_bcs.md - Updates refs to README files
revamp docs - rewrite README.GEOSldas_history, change name to md - Update and rename GEOSldas.HISTORY.md to HISTORY.md - Update and rename README.GEOSldas_metforcing_and_bcs to README.metforcing_and_bcs.md - Updates refs to README files
Use Icarus-NLv3 boundary conditions (not actually a code change), and change Z0_FORM to 4 (back to veg height lookup values, with simple tree SAI)
* implemented bug fix for get_GEOS() at stream boundaries (per jkolassa+reichle LDASsa fix, 17 Dec 2019)
…0191220 doc update in prep for v17.9.0-beta.0
Comment out call to check_cat_progns (wrapper for check_catch_progn) in prep for SMAP L4_SM Version 5. Call was inserted for compatibility of GEOSldas with LDASsa tag used for SMAP L4_SM Version 4 product (Tv4034). Earlier testing without the call (Tv4033) did not result in crashes of catchment() and yielded slightly drier soil moisture in deserts. Co-authored-by: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
MAPL master now points to MAPL v2.0, so we need to repoint `develop` to a v1 tag until all is ready.
Fixes #105. Use a MAPL v1.1 tag for develop
…5-forcing Added FP-5.25 transition (30 Jan 2020) to "cross-stream" dates
* bring MAPL-2.0 and related Components to GEOSldas
* MAPL-2.0 changes also impacts HISTORY.rc
* MAPL-2.0 facilitates speed-up in reading tile data
* remove dycore and FMS
* add assimilation for cubed-sphere grid
* add reading forcing from matching cubed-sphere grid when running on cubed-sphere tiles
* update LDAS_Forcing.F90 for f525_fp stream boundary
* add export for incr in Assim GridComp
* conform gcc-9.1 (avoid non-logicals in "if" statements)
* bug fix in select-update_type 9 (abs(deltaT)>0.)
* functionality to create regional (non-global) nc4 vegdyn restart
* bug fix for local mwRTM and time dimension restart
* remove compression of landpert restart files
* replace copy ("cp") with link ("ln") for catparam and mwrtm diagnostic output files
* additional functionality for CATCHMENT_OFFLINE to add extra variables into catch restart files (as needed by GCM)
* added perl lib in preparation for SLES12
Co-authored-by: Weiyuan Jiang and Rolf Reichle
…ncr_names
avoid conlict
Feature/incr names
comply with MAPL2-0
added during resolving of conflict
no changes to merge, just syncing
nothing to merge except removing a comment line in Externals.cfg
Pointing GEOSldas "develop" to ESMA_env v2.1.1+intel19.1.0 will make it run under SLES11 (using Intel-18) and SLES12 (using Intel-19), but the results won't be zero-diff across operating systems.
Cleanup, removed obsolete LDASsa code, incl. for binary output, spin-up, zenith angle, and time interpolation.
* also cleanup of a few lines from the previous version
* Update Externals.cfg to a fixed MAPL and ESMA_env
* added forecast error covariance inflation functionality * scalar (globally constant) inflation factor * some cleanup of obsolete LDASsa code (mostly related to LDASsa binary output)
* resource parameter changes: - renamed NUM_ENSEMBLE to NUM_LDAS_ENSEMBLE in "exeinp" file to be consistent with LDAS.rc - renamed MONTHLY_OUTPUT to POSTPROC_HIST * post-processing changes: - added check for number of sub-daily nc4 files before concatenation into daily nc4 file - rudimentary protections for subdaily-to-daily concatenation and monthly-mean file - write ObsFcstAna and smapL4SMaup files into ./scratch, then move to ana/ens_avg/year/month dir in postprocessing * some cleanup
…put file (#213) * Some comments in .rc files do not apply in *.exec input file. Avoid copying them. * Cleanup
…214) * added functionality to use "seamless" (uniform/published) file names for GEOS FP met forcing * minor cleanup
* add components.yaml
* Output of ensemble-average L-band Tb via HISTORY * cleanup and bug fixes: - renamed DATAATM to METFORCE to be consistent with Grid Comp name - FIRST_ENS_ID fixes
- removed default SLURM constraint for haswell - minor cleanup
weiyuan-jiang
approved these changes
May 20, 2020
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.
No description provided.