Adding sediment submodule to MOSART #3218
Conversation
|
Please edit the title so its not just the branch name. It should describe what the PR is doing. |
|
Gautam, is it possible that these conflicts could be avoided by rebasing my branch differently as you did for MOSART-heat? |
…ationDataType.F90 and VegetationType.F90
Turning on ROF on tri-grid northamericax4v1_r0125_oRRS15to5 causes the LND_DOMAIN_FILE not picked up. Turn ROF off for now. When we confirm that ROF worked with tri-grid, we will turn ROF on.
…atm/fix-physgrid-aqua-restart
modified: components/homme/src/share/control_mod.F90
This reverts commit 7cd8eae. I want to merge master to get the IMEX changes, and master has this commit's changes in it already.
…n-with-vr-linextrap Bring in IMEX changes.
modified: components/homme/src/share/namelist_mod.F90
Corrects the array to be used for determing if the value is NaN for output file. Fixes #3276 [BFB]
This reverts commit 4dda516.
The F2010SC5-CMIP6 needs input files to be able to run on the North America (NA) RRM tri-grid * Add the atm initial condition (ncdata) file for the northamericax4v1 grids * Add the land surface data in year 2010 for r0125 grids [NML] - Namelist Changing
* Add unit tests. * Split time step control_mod routine into two, one for EAM and one for HOMME. * Add a missing factor in the eta_dot_dpdn calculation. * Fix a threading bug in the 3D SL prescribed wind test initialization. * Simply advance_hypervis_scalar in sl_advection.
minor bugfixes for the standlone HOMME supercell test case thread safe initialization bug fix for restart turn on lustre hints on Cori-KNL [BFB]
Hoping to diagnose why archiving is taking so long on compy. [BFB]
…3381) jenkins_generic_job: Add timers for archiving Hoping to diagnose why archiving is taking so long on compy. [BFB] * jgfouca/cime/add_test_archive_timers: jenkins_generic_job: Add timers for archiving
|
@bishtgautam: What is this PR waiting on? |
|
Thanks! |
@bishtgautam I think it needs to be rebased to next then be tested for BFB. @hydrotian, do you agree? |
…3368) Add XML defaults for theta-l dycore Remove unused/obsolete dycore variables from XML defaults Add code to allow namelist defaults to be set based on value of cam_target Removed se_ftype=2 from all use cases (and made this a default) Support new timestep interface (se_tstep, dt_tracer_factor, dt_remap_factor) for theta-l dycore Update all theta "testmods" test cases to preserve original settings [BFB] with nlfails.
|
@liho745, Okay. Please go ahead and rebase it. |
|
@liho745 never rebase to next. Only to master. |
|
@rljacob I meant next on the master. Sorry for the confusion. |
Ignore buildlib_cmakec files [BFB] * jgfouca/gitignore_buildlib_cmakec: Ignore buildlib_cmakec files
get_cime_env: new tool for conveniently loading CIME env [BFB] * jgfouca/cime/get_cime_env: Rename to get_case_env get_cime_env: new tool for conveniently loading CIME env
It was referring to a CIME file with an incorrect path. [BFB]
Fix Depends.ibm.cmake It was referring to a CIME file with an incorrect path. [BFB] * origin/jgfouca/cime/Depends_ibm_fix: Fix Depends.ibm.cmake
Update mpas source framework for inc files This PR brings in a new mpas-source submodule with a minor MPAS framework update. It does not alter E3SM execution. It creates two new autogenerated config files on compile so that, in the future, each core may create a core_config module and include all the config flags at once, rather than declare each variable individually. [BFB]
fixing a small bug in sediflag usage fix smallville bug; a few minor changes fix parentheses add missing deallocate, remove tabs fixing the non b4b issue
|
Rebased off 11eca88. E3SM_land_developer tests passed. |
|
@hydrotian , something went wrong in Git. It shows me having made commits for this PR. |
|
@jgfouca Is it because your commits were brought in after I rebased this branch to a recent master? |
|
@hydrotian , I think you probably rebased a lot of stuff you didn't intend to. You should probably just start over and cherry pick the commits you want. It looks like there's only two |
|
@jgfouca I guess I messed it up when I try to squash the commits. I will start over and fix this. |
|
Make a new branch off master and redo your changes. Then make a new PR. |
Added a new submodule to MOSART, MOSART-sediment, which simulates suspended sediment transport in the rivers. MOSART-sediment is coupled to ELM. MOSART-sediment can be turned on/off
with a sediflag option in user_nl_mosart.