Merge Bridge into develop (no two-dot differences) #301
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
…beta.2) (#133) --------------- science functionality changes --------------------------- * Added assimilation for cubed-sphere grid. * Added reading forcing from matching cubed-sphere grid when running on cubed-sphere tiles. * Added functionality for output of Catchment prognostics increments via HISTORY. Removed legacy code from LDASsa for output of increments. * Added FP-5.25 transition (30 Jan 2020) to "cross-stream" dates. * Functionality to create regional (non-global) nc4 vegdyn restart file. * Additional functionality for CATCHMENT_OFFLINE to add extra variables into catch restart files (as needed by GCM). * Permitted processing of (assimilation) observations for innovations output *without* perturbations turned on. ------------- infrastructure changes --------------------------------- * Added functionality for SLES 12 support in addition to SLES11 (ESMA_env v2.0.2). * Updated to MAPL v2.0. * Removed dycore and FMS * Conforms to GNU compiler (gcc-9.1). * Initial clean up of GEOSldas_HIST.rc. * Added post-processing to compress (gzip) landpert restart files (except final time). * Added LDAS_app/mk_GEOSldasRestarts.F90. Adapted from GCM GridComp's mk_LDASsaRestarts.F90 in preparation for re-tiling changes. * Fixed output log file name and location. ---------------- bug fixes and other minor changes ------------------------------------- * Bug fix in select-update_type 9 (abs(deltaT)>0.) * Bug fix for local mwRTM and time dimension restart. * Replaced copy ("cp") with link ("ln") for catparam and mwrtm diagnostic output files. ---------------------------------------------------------------------------------------------------
Pointing to tags of GCM_GridComp and GMAO_Shared
bug fix: wrong indent in python script (ldas_setup)
Updated README.md
New GEOS_SurfaceGridComp.rc file Cross-stream support for FP f525_p5 forcing Updated README.md Parallel post-processing Zero-diff for Catchment Non-zero diff for CatchCN (via v1.8.3 of GEOS_GCMGridComp) Bug fixes: - obspertrseed restart file name when restarting from existing run - subdaily2daily nc4 concatenation (indent error)
* fix gnu debug (#178) * checkpoint files are geneareted by GEOSldas (#182) * checkpoint files are generated by GEOSldas ( not MAPL) when on cubed-sphere tile space * create year/month directories for ldas_ObsFcstAna from within GEOSldas executable * change system() calls to Fortran2008 standard Execute_command_line() * subdaily2daily concatenation; SLES12 sbatch fix - Added sbatch submission for pre-processing of restarts to comply with SLES12 requirements. - Subdaily-to-daily nc4 file concatenation now processes before the month is complete. * pass in optional account through ldas_setup (#184) * updating to MAPL 2.1.1 (updated ESMA_env and cmake) * Resurrecting SMAP L1C Tb fore-minus-aft check
so we can merge develop into this feature branch
added during resolving of conflict
Science: * Resurrected SMAP L1C Tb fore-minus-aft check. Infrastructure: * Updated utilities to MAPL v2.1.1, ESMA_env v2.1.1., ESMA_cmake v3.0.1 * Parallel post-processing * “sbatch” submission for pre-processing of restarts to comply with SLES12 requirements. * Subdaily-to-daily concatenation processes before month is complete. * Temporary solution to create directories for ObsFcstAna files to enable extending an existing GEOSldas run without going through setup. Documentation: * Updated README.md Bug fixes: * “obspertrseed” restart file name when restarting from existing run * Subdaily-to-daily nc4 concatenation (indent error) * Fixes for GNU compiler in debug mode * Fixed “landpert” checkpoint output when on cube-sphere tiles
no changes to merge, just syncing
- works on SLES11 with Intel-18 and on SLES12 with Intel-19 - NOT zero-diff across operating systems
… GEOSgcm_GridComp releases
weiyuan-jiang
approved these changes
Aug 27, 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.