Open
Conversation
…'all_time' integral fluxes), by default. Otherwise, it may cause budget checking err and model crash, for example, when ELM runs from a pre-stage restart file.
… EcosystemBalanceCheckMod.
…AT' as well. Otherwise, it fails to setup for '-res CLM_USRDAT', which must be '- res ELM_USRDAT'.
…e configuration, namely 'mymac', for using on Mac OSX.
…putdata directory for ORNL machine 'cades'.
…mpi3, for CADES. It's software packages of AMANZI-TPLS for ATS, which are based on gcc/6.3.0 and openmpi-3.0.0. It's required to have ENVs for AMANZI/ATS.
…ot in the input met data nc file, assign the former 1 and the latter 0 (i.e. no scaling of original dataset).
…ing year be 2010.
…bug will crash model when restarting a run if the starting simulation year is beyond range of cycling forcing data period.
… some missing in 'atm2lnd_vars'.
… in CPL_BYPASS when calculating shortest distance between land grids.
…de, with GSWP3 v2 (1901-2014) downscaled by 1 km daymet v4 for Northern America dataset.
… a globe, which NOT correct for partial globe (or region or point domains). So add an optional setting of mapping of grid unit - default as 'degrees'. If not default, it will check based on a globe-grid system.
…g ELM in wsl/ubuntu environments.
…ag: ' -fallow-argument-mismatch'
…se_ats, ats_inputdir, ats_inputfile.
… by ATS with 1 per grid cell
…r balance variables are assigned values.
fmyuan
pushed a commit
that referenced
this pull request
Jan 8, 2024
allocate rsnow for use in icepack
fmyuan
pushed a commit
that referenced
this pull request
Feb 5, 2024
* Initial test for water balance error corrections * Tentatively working fix attempt from Ben * Cleanup write statements etc * Speed up surface water transfer and fix mistake with tide timing * Move surface flow rate scale to settable parameter Co-authored-by: omearata@ornl.gov <omearata@ornl.gov>
fmyuan
pushed a commit
that referenced
this pull request
Jul 30, 2024
* Initial test for water balance error corrections * Tentatively working fix attempt from Ben * Cleanup write statements etc * Speed up surface water transfer and fix mistake with tide timing * Move surface flow rate scale to settable parameter Co-authored-by: omearata@ornl.gov <omearata@ornl.gov>
fmyuan
pushed a commit
that referenced
this pull request
Apr 25, 2025
* Initial test for water balance error corrections * Tentatively working fix attempt from Ben * Cleanup write statements etc * Speed up surface water transfer and fix mistake with tide timing * Move surface flow rate scale to settable parameter Co-authored-by: omearata@ornl.gov <omearata@ornl.gov> Bsulman/lnd/vert soilwater flow (E3SM-Project#5) * Add vertical soil water movement to column water variables and output * Set deeper layers to 0 instead of nan and include infiltration in layer 0 Turn off SPRUCE transpiration changes to fix water balance error. Also change nlevsoi to nlevbed in hydrology
fmyuan
pushed a commit
that referenced
this pull request
Apr 25, 2025
…g 2 columns equal to each other) TAO 2/7/2018 Includes inundation stress for hum/hol in marsh updated sine function for tidal influence Updated equations for tides Updates to isolate HUM_HOL ice formation for saltwater Isolate freezing point in HUM_HOL, full test suite pass with PFLOTRAN commits CO2 and temperature updates Updates for marsh flag updates for slurm Update Cades machine file for switch to Slurm scheduling system Testing vegetation/salinity interactions Conflicts: cime/config/e3sm/machines/config_batch.xml cime/config/e3sm/machines/config_machines.xml changed petsc_dir to petsc_path in machine files Update MARSH to use humhol_ht and related params Turn deep_seep stuff on for MARSH and add an error if there are not 2 columns in MARSH/HUM_HOL mode Undo temperature offset that was left in from warming sims Small cleanup from code review Set up tidal cycle with flexibly defined sinusoidal constituents to replace hard coded cycle (#2) Bsulman/water balance fix (#4) * Initial test for water balance error corrections * Tentatively working fix attempt from Ben * Cleanup write statements etc * Speed up surface water transfer and fix mistake with tide timing * Move surface flow rate scale to settable parameter Co-authored-by: omearata@ornl.gov <omearata@ornl.gov> Bsulman/lnd/vert soilwater flow (E3SM-Project#5) * Add vertical soil water movement to column water variables and output * Set deeper layers to 0 instead of nan and include infiltration in layer 0 Turn off SPRUCE transpiration changes to fix water balance error. Also change nlevsoi to nlevbed in hydrology
fmyuan
pushed a commit
that referenced
this pull request
Apr 25, 2025
…g 2 columns equal to each other) TAO 2/7/2018 Includes inundation stress for hum/hol in marsh updated sine function for tidal influence Updated equations for tides Updates to isolate HUM_HOL ice formation for saltwater Isolate freezing point in HUM_HOL, full test suite pass with PFLOTRAN commits CO2 and temperature updates Updates for marsh flag updates for slurm Update Cades machine file for switch to Slurm scheduling system Testing vegetation/salinity interactions Conflicts: cime/config/e3sm/machines/config_batch.xml cime/config/e3sm/machines/config_machines.xml changed petsc_dir to petsc_path in machine files Update MARSH to use humhol_ht and related params Turn deep_seep stuff on for MARSH and add an error if there are not 2 columns in MARSH/HUM_HOL mode Undo temperature offset that was left in from warming sims Small cleanup from code review Set up tidal cycle with flexibly defined sinusoidal constituents to replace hard coded cycle (#2) Bsulman/water balance fix (#4) * Initial test for water balance error corrections * Tentatively working fix attempt from Ben * Cleanup write statements etc * Speed up surface water transfer and fix mistake with tide timing * Move surface flow rate scale to settable parameter Co-authored-by: omearata@ornl.gov <omearata@ornl.gov> Bsulman/lnd/vert soilwater flow (E3SM-Project#5) * Add vertical soil water movement to column water variables and output * Set deeper layers to 0 instead of nan and include infiltration in layer 0 Turn off SPRUCE transpiration changes to fix water balance error. Also change nlevsoi to nlevbed in hydrology
fmyuan
added a commit
that referenced
this pull request
Feb 17, 2026
…g 2 columns equal to each other) TAO 2/7/2018 Includes inundation stress for hum/hol in marsh updated sine function for tidal influence Updated equations for tides Updates to isolate HUM_HOL ice formation for saltwater Isolate freezing point in HUM_HOL, full test suite pass with PFLOTRAN commits CO2 and temperature updates Updates for marsh flag updates for slurm Update Cades machine file for switch to Slurm scheduling system Testing vegetation/salinity interactions Conflicts: cime/config/e3sm/machines/config_batch.xml cime/config/e3sm/machines/config_machines.xml changed petsc_dir to petsc_path in machine files Update MARSH to use humhol_ht and related params Turn deep_seep stuff on for MARSH and add an error if there are not 2 columns in MARSH/HUM_HOL mode Undo temperature offset that was left in from warming sims Small cleanup from code review Set up tidal cycle with flexibly defined sinusoidal constituents to replace hard coded cycle (#2) Bsulman/water balance fix (#4) * Initial test for water balance error corrections * Tentatively working fix attempt from Ben * Cleanup write statements etc * Speed up surface water transfer and fix mistake with tide timing * Move surface flow rate scale to settable parameter Co-authored-by: omearata@ornl.gov <omearata@ornl.gov> Bsulman/lnd/vert soilwater flow (E3SM-Project#5) * Add vertical soil water movement to column water variables and output * Set deeper layers to 0 instead of nan and include infiltration in layer 0 Turn off SPRUCE transpiration changes to fix water balance error. Also change nlevsoi to nlevbed in hydrology
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 PR contains the ELM/E3SM portion of the ELM->ATS coupling. It should be built against the ATS branch linked here amanzi/ats#216.