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

Parameterizations of sub-grid topographic effects on solar radiation in ELM #4590

Merged
merged 6 commits into from
Mar 16, 2022

Conversation

daleihao
Copy link
Collaborator

@daleihao daleihao commented Oct 8, 2021

A well-validated sub-grid topographic (TOP) parameterization is added in ELM
that quantifies the effects of sub-grid topography on solar radiation flux
including the shadow effects and multi-scattering between adjacent terrain.
The new parameterization can be turned on by use_top_solar_rad = .true.
A test for the new parameterization is added.

[BFB]

@rljacob rljacob added the Land label Oct 8, 2021
@rljacob rljacob added this to the v2.1alpha milestone Oct 11, 2021
@rljacob rljacob added the BFB PR leaves answers BFB label Oct 11, 2021
@rljacob
Copy link
Member

rljacob commented Oct 11, 2021

@daleihao how long does this new test take to run?
SMS_Lm1.f09_f09.IELM.elm-solar_rad

Does it need to run for 1 month? If so, we might have to move it to extra_coverage.

@daleihao
Copy link
Collaborator Author

daleihao commented Oct 11, 2021 via email

@bishtgautam
Copy link
Contributor

@rljacob After additional analysis, I believe the test can be changed to a regular ERS test. Does that sound okay?

@rljacob
Copy link
Member

rljacob commented Oct 18, 2021

You mean a 7 day ERS test? That's fine unless theres a reason it need to run for a month.

@bishtgautam
Copy link
Contributor

@rljacob The test has been modified to be an ERS test.

bishtgautam added a commit that referenced this pull request Nov 10, 2021
…to next (PR #4590)

A well-validated sub-grid topographic (TOP) parameterization is added in ELM
that quantifies the effects of sub-grid topography on solar radiation flux
including the shadow effects and multi-scattering between adjacent terrain.
The new parameterization can be turned on by `use_top_solar_rad = .true.`
A test for the new parameterization is added.

[BFB]
bishtgautam pushed a commit that referenced this pull request Nov 11, 2021
Re-merging the PR that now includes a fix for the build error
for debug tests.
@rljacob
Copy link
Member

rljacob commented Nov 11, 2021

The ERS test for this feature is failing on gnu and on pgi:
ERS.f09_f09.IELM.mappy_gnu.elm-solar_rad
ERS.f09_f09.IELM.compy_pgi.elm-solar_rad

SUMMARY of cprnc (from compy)
A total number of 193 fields were compared
of which 37 had non-zero differences
and 0 had differences in fill patterns
A total number of 0 fields could not be analyzed
A total number of 0 fields on file 1 were not found on file2.
diff_test: the two files seem to be DIFFERENT

oddly, its passing on Chrysalis with intel.

@bishtgautam I force-pushed next to remove your fix from this morning since we may have to revert the whole PR. This way, you'll only have to revert one thing from next.

@bishtgautam
Copy link
Contributor

Thanks @rljacob for the force-pushed

bishtgautam added a commit that referenced this pull request Nov 12, 2021
…_top' into next (PR #4590)"

This reverts commit 4a23da5, reversing
changes made to 57c9480.
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.

@daleihao The PR needs code cleanup related to comments and indentation.

components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/main/surfrdMod.F90 Outdated Show resolved Hide resolved
components/elm/src/utils/domainMod.F90 Outdated Show resolved Hide resolved
components/elm/src/utils/domainMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
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.

@daleihao The changes look great. I have have few additional minor changes that I forgot to ask you to fix in my first review.

components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
components/elm/src/biogeophys/SurfaceAlbedoMod.F90 Outdated Show resolved Hide resolved
@bishtgautam bishtgautam self-requested a review December 15, 2021 22:54
bishtgautam added a commit that referenced this pull request Dec 15, 2021
…olar_rad_top' into next (PR #4590)""

This reverts commit c19957a.
bishtgautam added a commit that referenced this pull request Dec 15, 2021
…olar_rad_top' into next (PR #4590)""

This reverts commit c19957a.
bishtgautam added a commit that referenced this pull request Dec 15, 2021
…ith-pr-4590 (PR #4590)

The branch is re-merged to next
bishtgautam added a commit that referenced this pull request Dec 15, 2021
…olar_rad_top' into next (PR #4590)""

This reverts commit c19957a.
bishtgautam added a commit that referenced this pull request Dec 15, 2021
@rljacob
Copy link
Member

rljacob commented Dec 23, 2021

This was reverted from next because it had unexpected diffs. Please fix.

@rljacob
Copy link
Member

rljacob commented Jan 27, 2022

@daleihao have you fixed the unexpected diffs?

@daleihao daleihao force-pushed the daleihao/lnd/solar_rad_top branch 3 times, most recently from 1acc227 to 93bda58 Compare January 30, 2022 02:54
@daleihao
Copy link
Collaborator Author

@daleihao have you fixed the unexpected diffs?

I have checked the code. All the tests passed the regression test. Hope it works now.

@rljacob
Copy link
Member

rljacob commented Feb 24, 2022

@bishtgautam ready to try merging this again?

@bishtgautam
Copy link
Contributor

@rljacob If next is open today, I will merge this PR today.

@rljacob
Copy link
Member

rljacob commented Feb 25, 2022

@bishtgautam next is open today.

bishtgautam added a commit that referenced this pull request Feb 25, 2022
A well-validated sub-grid topographic (TOP) parameterization is added in ELM
that quantifies the effects of sub-grid topography on solar radiation flux
including the shadow effects and multi-scattering between adjacent terrain.
The new parameterization can be turned on by use_top_solar_rad = .true.
A test for the new parameterization is added.

[BFB]
@bishtgautam
Copy link
Contributor

Merged to next

bishtgautam added a commit that referenced this pull request Feb 28, 2022
Dalei Hao and others added 3 commits March 13, 2022 12:18
bishtgautam added a commit that referenced this pull request Mar 14, 2022
bishtgautam added a commit that referenced this pull request Mar 14, 2022
The PR is re-merged after the developer has fixed bugs for PGI.
bishtgautam added a commit that referenced this pull request Mar 15, 2022
Re-merging the PR with a new commit that removes the two new
fields that were added to ELM history file.
@bishtgautam bishtgautam merged commit d0663d4 into E3SM-Project:master Mar 16, 2022
@bishtgautam bishtgautam deleted the daleihao/lnd/solar_rad_top branch March 17, 2022 16:58
@@ -0,0 +1 @@
./xmlchange NTASKS=48
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@daleihao is there a reason to set NTASKS=48 ? With this, ERS.f09_f09.IELM.ascent_pgi.elm-solar_rad is erroring out in 2nd/restart run with memory corruption

2: 14: 0: ALLOCATE: 2356269769344 bytes requested; not enough memory
2: 42: 0: ALLOCATE: 5442822862464 bytes requested; not enough memory

Changing NTASKS to default 1-node with 84 NTASKS lets both initial and restart runs complete BFB. Okay to remove this mod?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't matter what NTASKs is. It is OK to remove it.

@rljacob rljacob added the Stealth PR has feature which, if turned on, could change climate. fka FCC label Dec 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB Land Stealth PR has feature which, if turned on, could change climate. fka FCC
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants