-
Notifications
You must be signed in to change notification settings - Fork 368
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add water management and inundation models to MOSART #3012
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The PR contains a lot of new lines that are commented out. These lines were probably used during testing/debugging of the new code, but they don't need to be part of this PR. Please delete commented out lines.
components/mosart/bld/namelist_files/namelist_defaults_mosart.xml
Outdated
Show resolved
Hide resolved
Fischer/ect doc This is just a copy of the Ensemble Consistency Test README file being used for the cime documentation. Test suite: Test baseline: Test namelist changes: Test status: [bit for bit, roundoff, climate changing] Fixes [CIME Github issue #] #1294 User interface changes?: Update gh-pages html (Y/N)?: Y Code review: bertinia
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hydrotian, Please revert the change to SBeTR submodule
@hydrotian you need to make the change requested by @bishtgautam above. |
SBeTR module has been reverted and this PR is ready now. |
Add water management and inundation models to MOSART. [BFB]
The namelist inund_inparm needs to be defined irrespective of inundflag = .true./.false.
Fixes the incorrect conflict resolution while merging PR #3012
Add water management and inundation models to MOSART. [BFB]
Add water management and inundation models to MOSART [BFB] Conflicts: components/mosart/cime_config/buildlib
Merged #3012 |
else | ||
call t_startf('mosartr_euler') | ||
! debug | ||
write(iulog,*) 'clm-mosart subT: (call Euler) ns=', ns |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please comment out or surround this line with #ifndef NDEBUG ... #endif
to activate it for debug runs. A 5-day run produced 122721 writes to e3sm.log.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@amametjanov open an issue about this. Assign it to @hydrotian
if (dd1 /= dd0) new_day = .true. | ||
endif | ||
endif | ||
write(iulog,'(2a,4i6,3l4)') sub," yy,mm,dd = ",yy1,mm1,dd1,tod1,new_year,new_month,new_day |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please comment out or surround this write
with #ifndef NDEBUG ... #endif
.
The starts/counts for puts where the vars (1d/2d/3d) had no time dimensions were wrong, i.e., always had an extra start/count corresponding to the time dimension. Now we have the starts/counts for time dimension only when the var is supposed to have multiple timesteps. This fix (part of PR #2772) was accidentally reverted by PR #3012.
…appy-env-setup Automatically Merged using E3SM Pull Request AutoTester PR Title: Explicitly source the sems modules init script on mappy PR Author: bartgol PR LABELS: testing, AT: AUTOMERGE, AT: Skip weaver, AT: Skip v1 Testing
Add water management and inundation models to MOSART.
[BFB]