Skip to content
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

Merged
merged 10 commits into from
Aug 12, 2019

Conversation

hydrotian
Copy link
Contributor

@hydrotian hydrotian commented Jun 25, 2019

Add water management and inundation models to MOSART.

[BFB]

@hydrotian hydrotian added BFB PR leaves answers BFB NML River labels Jun 25, 2019
@hydrotian hydrotian added this to the v2.0alpha milestone Jun 25, 2019
@rljacob
Copy link
Member

rljacob commented Jun 25, 2019

Copy link
Contributor

@bishtgautam bishtgautam left a 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/src/cpl/rof_comp_esmf.F90 Outdated Show resolved Hide resolved
components/mosart/src/cpl/rof_comp_esmf.F90 Outdated Show resolved Hide resolved
components/mosart/src/cpl/rof_comp_esmf.F90 Outdated Show resolved Hide resolved
components/mosart/src/wrm/WRM_modules.F90 Outdated Show resolved Hide resolved
components/mosart/src/wrm/WRM_subw_IO_mod.F90 Outdated Show resolved Hide resolved
components/mosart/src/wrm/WRM_subw_IO_mod.F90 Outdated Show resolved Hide resolved
components/mosart/src/wrm/WRM_subw_IO_mod.F90 Outdated Show resolved Hide resolved
components/mosart/src/wrm/WRM_subw_IO_mod.F90 Outdated Show resolved Hide resolved
jgfouca pushed a commit that referenced this pull request Jun 25, 2019
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
Copy link
Contributor

@bishtgautam bishtgautam left a 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

@rljacob
Copy link
Member

rljacob commented Aug 7, 2019

@hydrotian you need to make the change requested by @bishtgautam above.

@bishtgautam
Copy link
Contributor

SBeTR module has been reverted and this PR is ready now.

bishtgautam added a commit that referenced this pull request Aug 8, 2019
Add water management and inundation models to MOSART.

[BFB]
The namelist inund_inparm needs to be defined irrespective of
inundflag = .true./.false.
bishtgautam added a commit that referenced this pull request Aug 9, 2019
Fixes the incorrect conflict resolution while merging PR #3012
bishtgautam added a commit that referenced this pull request Aug 9, 2019
Add water management and inundation models to MOSART.

[BFB]
@jqyin jqyin merged commit f31a4c2 into master Aug 12, 2019
jqyin added a commit that referenced this pull request Aug 12, 2019
Add water management and inundation models to MOSART

[BFB]

Conflicts:
	components/mosart/cime_config/buildlib
@jqyin
Copy link
Contributor

jqyin commented Aug 12, 2019

Merged #3012

else
call t_startf('mosartr_euler')
! debug
write(iulog,*) 'clm-mosart subT: (call Euler) ns=', ns
Copy link
Member

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.

Copy link
Member

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
Copy link
Member

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.

dqwu added a commit that referenced this pull request Sep 9, 2019
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.
bishtgautam added a commit that referenced this pull request Sep 11, 2019
This PR includes some fixes in Mosart required for scorpio (PIO2).

These fixes (reverted by PR #3012) are re-picked from PR #2772.
They are not specific to scorpio, but the bugs showed up during
testing with scorpio. They should be tested with scorpio_classic
as well.

Fixes #3176
[BFB]
bishtgautam added a commit that referenced this pull request Sep 12, 2019
This PR includes some fixes in Mosart required for scorpio (PIO2).

These fixes (reverted by PR #3012) are re-picked from PR #2772.
They are not specific to scorpio, but the bugs showed up during
testing with scorpio. They should be tested with scorpio_classic
as well.

Fixes #3176
[BFB]
@bishtgautam bishtgautam deleted the tizhou/mosart/add-wm-inundation branch September 25, 2019 22:50
@hydrotian hydrotian restored the tizhou/mosart/add-wm-inundation branch October 15, 2019 07:22
@bishtgautam bishtgautam deleted the tizhou/mosart/add-wm-inundation branch October 2, 2020 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB NML River
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants