Sync with base repository #2
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
…update Persistence mass balance update
* Added CMakeLists.txt for IO and Orchestrator modules * Updated Routing cmakelist to use Orchestrator * Fix issue in FindNetCDF.cmake to cache list of multiple NetCDF libraries vs. single file
…into hydro_stop_fix
…odule_hydro_stop.F.
…into read-reservoir-type-change pulled upstream master
…op' and no explicit use declaration. Fix to CMake build which was some how broken by the new use directives.
…o read reservoir_type from that file
…_seconds in module_namelist.F based upon io settings
Change reading reservoir_type from lake parameter file to reservoir parameter file
Create PULL_REQUEST_TEMPLATE.md
…ence tests for new reservoir parameter files
Introduce module_hydro_stop
…into army-corps-persistence Pull upstream master
…uild dependencies
* updates to arc/macros.mpp.linux for precompiler flags * change netcdf_layer since PGI doesn't seem to like static assignment of procedure pointers to NF90 routines * mark some variables in readBucket_nhd() to volitile to avoid optimizer crash
Add checks to prevent divide-by-zero
* duplicate WRF's MPI communicator to HYDRO_COMM_WORLD * call MPP_LAND_INIT with global grid size from WRF `domain` object
* Move fields utilities to WRFHydro_NUOPC_Fields.F90 * Add 3 dimensional soil fields smc, slc, stc * Remove fields that aren't connected * Update LSM forcings check * Update NUOPC cap fill values * Add options for memory copy or pointer * Add options to initialize with prescribed values * Add options to check for missing values * Add options to fill missing values with prescribed values * Cleanup field creation and fill * Cleanup ESMF extension utilities * Update error flags * Set field timestamp to invalid for coldstarts * Add WRFHYDRO model state debugging * Fix WRFHYDRO NUOPC cap installation dependencies
…ng rounded to 0, so number/number=NA instead of 1. Switched to an if statement.
…p for subsurface option 1.
…roduce inflows (for t-route coupling) (#609) Add channel_option=5 to run NWM musk-cunge channel routing option without running actual channel routing solver. Only channel inputs are calculated.
* Remove hard-coding of urban soil properties for imperv options != 0 * Add impervious fraction variable. * Add in impervious adjustment to surface runoff and infiltration partitioning. * Add in adjustment for effective imperviousness. * Add imperv parameter to template MPTABLE. * Add high-res impervious fraction ingest. * Replace hard-coded FCR with variable impervious. * Adjust top layer FCR to match impervious configuration options. * Overland roughness adjustment by impervious fraction. Need to move this whole parameter regridding outside of disagg routine - only needs to be done once. * Add in retdep impervious adjustment. * Add namelist option for impervious parameter adjustments. * Make impervious param read optional and remove Sutherland option (works fine, just not enough data to parameterize). * Setup new option to more clearly separate old model behavior from no imperv adjustment. Fix overwriting of frozen soil impermeable variable. * Update default urban impervious fraction to match code assumption. * Set IMPERVFRAC to be required if imperv_adj=1
* Add Crocus to Noah-MP * Move lat lon in snowcro since they are not used * Move max SWE limit to a parameter in MPTABLE. * Fix energy NAs over large snowpacks due to very small numbers being rounded to 0, so number/number=NA instead of 1. Switched to an if statement. * Add swe_limit into crocus specific calls * Add outputs (flow from glacier snow or glacier ice) * Add crocus outputs to retro config. * Move a series of files that module_snowcro.F needs to the surfex directory for a cleaner build, and modify Makefile as necessary * Move a series of files from Land_models/NoahMP/phys directory into a subdirectory and update the Makefile paths to those files and include the new surfex subdirectory * Increase max SWE in glacier module to 5m to match standard snow model max value. * Remove swe max limit. * Add Aubreys changes for energy balance * Add option to add visible albedo map * Add possibility to read visible ice albedo from netcdf file * Add Crocus namelist to end of namelist.hrldas * Crocus: Set the ldasOutDict numLev to the act_lev input from the namelist file * Crocus: crocus can be turned off and on with crocus_opt * Crocus: code cleanup and formatting * Crocus: if vis_icealb is not present, set it to NaN * Crocus: removed dev comments and reformatted code * Crocus: Trude fix of SNOW being updated, rather than SNEQVOXY * Crocus: bug fix, certain values needed to be reset while iterating over array * Crocus: Trude fix for when snowthickness becomes zero in the top layer * Crocus: bugfix to albedo output. Code from Trude Eidhammer * Bugfix: ALBSND and ALBSNI should be undefined when NOAHMP_SFLX isn't called. Fixes some output file differences Co-authored-by: Trude Eidhammer <[email protected]> Co-authored-by: Aubrey Dugger <[email protected]> Co-authored-by: Ryan Cabell <[email protected]>
* Alaska RFC GDL reservoir implementation and unit tests * Add water elevation test to AK RFC reservoir test * Add RFC forecast Alaska glacier sum inflow with assimilated forecast value Co-authored-by: Ryan Cabell <[email protected]> Co-authored-by: David Mattern <[email protected]>
…ency, but these have not been tested.
… routine (#553) * Add RT disaggregation to read2dlsm() * Added rt=.logical. to read2dlsm to call Aubrey's regrid_lowres_to_highres while LSM data are all on rank 0. Useful for OV_ROUGH2D and possibly others in the future. Co-authored-by: Ryan Cabell <[email protected]> Co-authored-by: Soren Rasmussen <[email protected]>
…inanjiang module. For consistency using 0.01mm minimum threshold to match current SOILWATER routine check - worth rethinking this value in the future.
…g zero in mod function.
… and set to zero. This avoids unallocated memory being accessed and causing a SEGFAULT when optimization is turned off. (#649)
Using modules is better than including files and leads to better function variable types and debugging. (#643)
Bumps [numpy](https://github.com/numpy/numpy) from 1.17.1 to 1.22.0. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst) - [Commits](numpy/numpy@v1.17.1...v1.22.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Ryan Cabell <[email protected]>
…odern build directory structures, allow for a CMakelist in the top directory and better testing integration. trunk/NDHMS is currently a symlink to allow time for users to switch over. CMakeLists and Makefiles have been modified.
…fter write statement and changes A*-B*C statements to A*(-B)*C.
…est targets in makefiles. Per NCO's Implementation Standard, five critical targets should be defined in the makefile: all, debug, install, clean and test. See https://www.nco.ncep.noaa.gov/idsb/implementation_standards/Implementation%20Standards%20v10.2.pdf?.
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.