Adds MOSART-heat #3133

liho745 · 2019-08-15T18:50:50Z

Added a new submodule to MOSART, MOSART-heat, which simulates water
temperature in the rivers. MOSART-heat is coupled to both ELM and EAM.
More specifically, MOSART-heat needs the runoff and soil temperature
simulated by ELM, and solar radiation, wind speed etc. from EAM.
To couple MOSART-heat with EAM, we newly added the ATM2ROF
mapping (including code changes and several new ATM2ROF mapping files)
which did not exist previously in E3SM. MOSART-heat can be turned on/off
with a heatflag option in user_nl_mosart.

[BFB]
[NML]

rljacob

Remove the config_machines change.
Edit the top level description to better describe what is being added.
What is all the atm2rof mapping stuff for?
The rrtmpg submodule should not be changed.

liho745 · 2019-08-16T18:41:58Z

I've reverted the config_machines change.
I edited the top-level description with more details, including why adding ATM2ROF mapping.
I did not, however, change rrtmpg submodule though. Perhaps I did not update all the sub-modules before committing my changes? In any case, I agree it should not be changed.

thurber · 2019-08-20T14:45:23Z

i pushed a new commit that reverts the rrtmpg submodule back it's status in master

rljacob

Github is still showing a config_machines change but its to constance so not a blocker.

Also edit the title of the PR to describe the change.

bishtgautam

Please make the relevant changes.

Also, make the changes as suggested by @rljacob in the above comment.

components/mosart/src/riverroute/MOSART_heat_mod.F90

components/mosart/src/riverroute/RtmMod.F90

cime/src/drivers/mct/main/prep_rof_mod.F90

thurber · 2019-09-23T20:07:32Z

@liho745, @bishtgautam, any remaining next steps to get this merged?

bishtgautam · 2019-09-23T20:24:42Z

@thurber, The MPAS submodule has been incorrectly updated in this PR and there are a bunch of conflicts. Once #3074 is merged to master, this PR will be rebased off the latest master.

bishtgautam · 2019-10-03T15:19:53Z

Thanks, @jonbob

rljacob · 2019-10-04T21:58:26Z

@golaz do you want this for v2 watercycle?

golaz · 2019-10-09T17:55:31Z

If it's BFB, it could be merged in the code. But turning it on in v2 will depend on someone volunteering to make a simulation with it and explaining the benefits of the feature (and demonstrating no degradation).

… (PR #3133)"" This reverts commit e586f2f. Conflicts: components/clm/src/cpl/lnd_import_export.F90

dqwu · 2019-10-23T15:34:46Z

@bishtgautam
This PR has caused 21 tests failed with latest next branch:
https://my.cdash.org/viewTest.php?onlyfailed&buildid=1719105

I have manually run ERS.f19_f19.ICLM45 on anlworkstation, and the stack trace is:

[0] Program received signal SIGSEGV: Segmentation fault - invalid memory reference.
[0] 
[0] Backtrace for this error:
[0] #0  0x7f2c5b2becaf in ???
[0] #1  0x11e7da9 in __mosart_physics_mod_MOD_euler
[0] 	at components/mosart/src/riverroute/MOSART_physics_mod.F90:133
[0] #2  0x1174c64 in __rtmmod_MOD_rtmrun
[0] 	at components/mosart/src/riverroute/RtmMod.F90:2246
[0] #3  0x114c50b in __rof_comp_mct_MOD_rof_run_mct
[0] 	at components/mosart/src/cpl/rof_comp_mct.F90:361
[0] #4  0x427451 in __component_mod_MOD_component_run
[0] 	at cime/src/drivers/mct/main/component_mod.F90:714
[0] #5  0x4115b4 in __cime_comp_mod_MOD_cime_run
[0] 	at cime/src/drivers/mct/main/cime_comp_mod.F90:2640
[0] #6  0x42611f in cime_driver
[0] 	at cime/src/drivers/mct/main/cime_driver.F90:133
[0] #7  0x42623d in main
[0] 	at cime/src/drivers/mct/main/cime_driver.F90:23

bishtgautam · 2019-10-23T18:41:12Z

I'm reverting this PR again and will ask the developers to dig into these errors.

…nto next (PR #3133)""" This reverts commit 85c252b.

jonbob · 2019-11-25T17:22:44Z

With the recent commit, a test merge now passes:

SMS_D.ne4_oQU240.A_WCYCL1850.anvil_gnu
ERS.f19_f19.ICLM45.anvil_gnu

It may make sense to rebase to master since the merge has conflicts. I can work on that next.

jonbob · 2019-11-26T18:32:19Z

@bishtgautam - it may be easier to simply merge this PR instead of rebasing it. Do you want me to take it on? I think it does now pass some of the tests that had been failing

bishtgautam · 2019-11-26T18:37:06Z

I agree with you regarding rebasing this PR. I will (re-re-)merge this PR to next later today and double check my work before pushing it to next.

jonbob · 2019-11-26T18:39:29Z

@bishtgautam - sounds good, and thanks

…heat2' into next (PR #3133)"""" This reverts commit e6e554f.

Added a new submodule to MOSART, MOSART-heat, which simulates water temperature in the rivers. MOSART-heat is coupled to both ELM and EAM. More specifically, MOSART-heat needs the runoff and soil temperature simulated by ELM, and solar radiation, wind speed etc. from EAM. To couple MOSART-heat with EAM, we newly added the ATM2ROF mapping (including code changes and several new ATM2ROF mapping files) which did not exist previously in E3SM. MOSART-heat can be turned on/off with a heatflag option in user_nl_mosart. [BFB] [NML]

Added a new submodule to MOSART, MOSART-heat, which simulates water temperature in the rivers. MOSART-heat is coupled to both ELM and EAM. More specifically, MOSART-heat needs the runoff and soil temperature simulated by ELM, and solar radiation, wind speed etc. from EAM. To couple MOSART-heat with EAM, we newly added the ATM2ROF mapping (including code changes and several new ATM2ROF mapping files) which did not exist previously in E3SM. MOSART-heat can be turned on/off with a heatflag option in user_nl_mosart. [BFB] [NML] Conflicts: cime/config/e3sm/machines/config_machines.xml cime/src/drivers/mct/main/prep_rof_mod.F90 cime/src/drivers/mct/shr/seq_flds_mod.F90 components/clm/src/cpl/clm_cpl_indices.F90 components/clm/src/cpl/lnd_import_export.F90 components/mosart/bld/build-namelist components/mosart/src/cpl/rof_comp_esmf.F90 components/mosart/src/cpl/rof_comp_mct.F90 components/mosart/src/cpl/rof_cpl_indices.F90 components/mosart/src/riverroute/MOSART_physics_mod.F90 components/mosart/src/riverroute/RtmHistFlds.F90 components/mosart/src/riverroute/RtmMod.F90

bishtgautam · 2019-11-27T17:46:41Z

Thanks to @jonbob for fixing the bug found by gnu, this PR has been merged to master.

hydrotian · 2019-11-27T17:51:46Z

Bravo! Thanks to @jonbob and @bishtgautam !

liho745 · 2019-11-27T18:05:04Z

Big Thanks to all of you!

…

On Wed, Nov 27, 2019 at 11:51 AM Tian Zhou ***@***.***> wrote: Bravo! Thanks to @jonbob <https://github.com/jonbob> and @bishtgautam <https://github.com/bishtgautam> ! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3133?email_source=notifications&email_token=AC5QWBWGZIAZNDFKSIQT353QV2XTHA5CNFSM4IMA3LUKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEFKJGSY#issuecomment-559190859>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AC5QWBSYLCCUZI2SBRLW3QLQV2XTHANCNFSM4IMA3LUA> .

Fixes difference in conflict resolution from #3133

Added a new submodule to MOSART, MOSART-heat, which simulates water temperature in the rivers. MOSART-heat is coupled to both ELM and EAM. More specifically, MOSART-heat needs the runoff and soil temperature simulated by ELM, and solar radiation, wind speed etc. from EAM. To couple MOSART-heat with EAM, we newly added the ATM2ROF mapping (including code changes and several new ATM2ROF mapping files) which did not exist previously in E3SM. MOSART-heat can be turned on/off with a heatflag option in user_nl_mosart. [BFB] [NML] Conflicts: cime/config/e3sm/machines/config_machines.xml cime/src/drivers/mct/main/prep_rof_mod.F90 cime/src/drivers/mct/shr/seq_flds_mod.F90 components/clm/src/cpl/clm_cpl_indices.F90 components/clm/src/cpl/lnd_import_export.F90 components/mosart/bld/build-namelist components/mosart/src/cpl/rof_comp_esmf.F90 components/mosart/src/cpl/rof_comp_mct.F90 components/mosart/src/cpl/rof_cpl_indices.F90 components/mosart/src/riverroute/MOSART_physics_mod.F90 components/mosart/src/riverroute/RtmHistFlds.F90 components/mosart/src/riverroute/RtmMod.F90

liho745 and others added 12 commits June 25, 2019 19:14

adding MOSART-heat, the stream temperature module

67a8ec5

including MOSART_heat_mod.F90

34957d2

fixing a bug

5a93207

fix a bug

73c82a1

fix a bug

41aed1b

fix a bug with atm_c2_rof

8720a0a

add atm2rof maps

c53bd1a

Completing atm2rof mapping

8ee408c

fixing a bug in using heatflag

c2eb1fb

Add ATM2ROF maps for more atm grids

663debc

fix a small bug when heatflag=.false.

19cf364

fix smallville bug

7ab32da

liho745 requested review from hydrotian and bishtgautam August 15, 2019 18:50

rljacob assigned bishtgautam Aug 15, 2019

rljacob requested changes Aug 15, 2019

View reviewed changes

rljacob added River enhancement labels Aug 15, 2019

revert change to this file, not necessary

75240a0

revert submodule

0789d46

rljacob approved these changes Aug 22, 2019

View reviewed changes

rljacob added this to the v2.0BGC milestone Aug 22, 2019

bishtgautam requested changes Aug 25, 2019

View reviewed changes

liho745 changed the title ~~Hongyili/mosart/mosart heat2~~ Adding the stream temperature module, MOSART-heat, into E3SM v2 Aug 26, 2019

Removing commented-out lines and adding indentation

7afaf71

bishtgautam changed the title ~~Adding the stream temperature module, MOSART-heat, into E3SM v2~~ Adds MOSART-heat Aug 28, 2019

revert submodule

3b75200

hydrotian approved these changes Oct 15, 2019

View reviewed changes

bishtgautam added a commit that referenced this pull request Oct 22, 2019

Revert "Revert "Merge branch 'hongyili/mosart/mosart-heat2' into next…

85c252b

… (PR #3133)"" This reverts commit e586f2f. Conflicts: components/clm/src/cpl/lnd_import_export.F90

bishtgautam added a commit that referenced this pull request Oct 23, 2019

Revert "Revert "Revert "Merge branch 'hongyili/mosart/mosart-heat2' i…

e6e554f

…nto next (PR #3133)""" This reverts commit 85c252b.

Check for heatflag around some variable initialization

51c291b

bishtgautam added a commit that referenced this pull request Nov 26, 2019

Revert "Revert "Revert "Revert "Merge branch 'hongyili/mosart/mosart-…

3866b05

…heat2' into next (PR #3133)"""" This reverts commit e6e554f.

bishtgautam merged commit 51c291b into master Nov 27, 2019

rljacob mentioned this pull request Nov 28, 2019

Add compset support for northamericax4v1 atmos RRM grid #3067

Merged

wlin7 mentioned this pull request Dec 2, 2019

Turn off O3 dry deposition in F2010SC5-CMIP6 compset #3332

Merged

bishtgautam added a commit that referenced this pull request Dec 2, 2019

Merge branch 'master' into next

2e1f41b

Fixes difference in conflict resolution from #3133

wlin7 mentioned this pull request Dec 4, 2019

Duplicated calls in components/mosart/src/cpl/rof_comp_mct.F90 #3335

Closed

bishtgautam mentioned this pull request Dec 17, 2019

case ne30_oECv3_ICG.A_WCYCL1850S_CMIP6 with allactive-v1cmip6 mods failing #3340

Closed

bishtgautam mentioned this pull request Jan 9, 2020

Adding sediment submodule to MOSART #3218

Closed

jgfouca mentioned this pull request Mar 17, 2020

Jgfouca/branch for acme split 2020 03 16 ESMCI/cime#3457

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds MOSART-heat #3133

Adds MOSART-heat #3133

liho745 commented Aug 15, 2019 •

edited by bishtgautam

Loading

rljacob left a comment

liho745 commented Aug 16, 2019

thurber commented Aug 20, 2019

rljacob left a comment

bishtgautam left a comment •

edited

Loading

thurber commented Sep 23, 2019

bishtgautam commented Sep 23, 2019

bishtgautam commented Oct 3, 2019

rljacob commented Oct 4, 2019

golaz commented Oct 9, 2019

dqwu commented Oct 23, 2019

bishtgautam commented Oct 23, 2019

jonbob commented Nov 25, 2019

jonbob commented Nov 26, 2019

bishtgautam commented Nov 26, 2019

jonbob commented Nov 26, 2019

bishtgautam commented Nov 27, 2019

hydrotian commented Nov 27, 2019

liho745 commented Nov 27, 2019 via email

Adds MOSART-heat #3133

Adds MOSART-heat #3133

Conversation

liho745 commented Aug 15, 2019 • edited by bishtgautam Loading

rljacob left a comment

Choose a reason for hiding this comment

liho745 commented Aug 16, 2019

thurber commented Aug 20, 2019

rljacob left a comment

Choose a reason for hiding this comment

bishtgautam left a comment • edited Loading

Choose a reason for hiding this comment

thurber commented Sep 23, 2019

bishtgautam commented Sep 23, 2019

bishtgautam commented Oct 3, 2019

rljacob commented Oct 4, 2019

golaz commented Oct 9, 2019

dqwu commented Oct 23, 2019

bishtgautam commented Oct 23, 2019

jonbob commented Nov 25, 2019

jonbob commented Nov 26, 2019

bishtgautam commented Nov 26, 2019

jonbob commented Nov 26, 2019

bishtgautam commented Nov 27, 2019

hydrotian commented Nov 27, 2019

liho745 commented Nov 27, 2019 via email

liho745 commented Aug 15, 2019 •

edited by bishtgautam

Loading

bishtgautam left a comment •

edited

Loading