Implements remaining changes for gustiness feature for EAMv2 #2789

singhbalwinder · 2019-03-08T22:08:46Z

This PR completes the gustiness feature in EAM by implementing all the right namelist settings for gustiness. A new use case file 2000_cam5_av1c-04p2_gust.xml has all the namelist values for invoking this feature using FC5AV1C-L compset. Several new namelist variables required for this feature will now appear in the namelist (atm_in).

A test mod directory is also created to add a test for this feature in the nightly testing.

[BFB]
[NML]

[BFB] - Bit-For-Bit

Adds clubb_c1b=clubb_c1 in all files which had clubb_c1 [BFB] - Bit-For-Bit

clubb_c1b was in usecases but not in the namelist_definitions.xml file. It has to be defined in namelist_definitions.xml for it to appear in atm_in file. [BFB] - Bit-For-Bit

[BFB] - Bit-For-Bit

[BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags.

[BFB] - Bit-For-Bit

[BFB] - Bit-For-Bit [FCC] - Flag Climate Changing [Non-BFB] - Non Bit-For-Bit [CC] - Climate Changing [NML] - Namelist Changing See confluence for a more detailed description about these tags.

[BFB] - Bit-For-Bit

singhbalwinder · 2019-03-08T22:09:27Z

I will add a test shortly to go with this PR.

polunma

There should be changes to cam_export.
vmag_gust should be initialized to 0 in physpkg

rljacob · 2019-03-12T21:26:37Z

@wlin7 you can start merging this.

Implements remaining changes for gustiness feature for EAMv2 This PR completes the gustiness feature in EAM by implementing all the right namelist settings for gustiness. A new use case file 2000_cam5_av1c-04p2_gust.xml has all the namelist values for invoking this feature using FC5AV1C-L compset. Several new namelist variables required for this feature will now appear in the namelist (atm_in). A test mod directory is also created to add a test for this feature in the nightly testing. [BFB] [NML]

wlin7 · 2019-03-12T22:08:25Z

Merged to next. Conflict in tests.py was on the structure of listing the tests. Added the new test "ERS_Ld5.ne4_ne4.FC5AV1C-L.cam-gust_param" following the current format.

rljacob · 2019-03-13T17:26:43Z

This PR is not bfb.

singhbalwinder · 2019-03-13T17:34:07Z

It should be BFB. I will ask @wlin7 to merge it to next again once we isolate the NBFB change. If I can't find it today, I will revert it back.

singhbalwinder · 2019-03-13T20:39:52Z

components/cam/src/physics/cam/clubb_intr.F90

@@ -2500,36 +2500,37 @@ real(r8) :: ugust  ! function: gustiness as a function of convective rainfall

 !PMA adds gustiness and tpert

-    vmag_gust(:)    = 1._r8
+    vmag_gust(:)    = 0._r8


@polunma :This is one of the changes causing NBFB behavior. Reverting it back to 1._r8 fixes it.

singhbalwinder · 2019-03-13T21:04:57Z

components/cam/src/control/camsrfexch.F90

-      cam_out%ubot(i)  = state%u(i,pver) * vmag_gust(i)
-      cam_out%vbot(i)  = state%v(i,pver) * vmag_gust(i)
+      cam_out%ubot(i)  = state%u(i,pver) * (vmag_gust(i)+vmag(i))/vmag(i)
+      cam_out%vbot(i)  = state%v(i,pver) * (vmag_gust(i)+vmag(i))/vmag(i)


@polunma : These two new lines using vmag(i) are also causing NBFB answers.

No this won't work. I will provide a fix.

[BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags.

singhbalwinder · 2019-03-13T21:45:04Z

Thanks @polunma ! I have pushed your new fix which fixes the NBFB issue!

@wlin7 : Please merge this branch again to next.

wlin7 · 2019-03-13T22:07:56Z

FYI: The non-BFB is due to a roundoff. If it is changed to
cam_out%ubot(i) = state%u(i,pver) * ((vmag_gust(i)+vmag(i))/vmag(i))
cam_out%vbot(i) = state%v(i,pver) * ((vmag_gust(i)+vmag(i))/vmag(i))
To always compute the multiplier first before applying to the wind, it gives BFB. This is based on SCM tests.

The if-conditional control works just as well. Any preference?

[BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags.

Implements remaining changes for gustiness feature for EAMv2 Remerged following an update to fix NFBF due to changes in camsrfexch.F90 [BFB]

wlin7 · 2019-03-14T00:05:36Z

Merged to next (only the updated camsrfexch.F90 involved as the previous merge was not reverted).

wlin7 · 2019-03-14T13:50:53Z

Submit request to bless sandiatoss3 next tests:

ERS_Ld5.ne4_ne4.FC5AV1C-L.sandiatoss3_intel.cam-gust_param (new, and a baseline probably created following previous merge)

SMS_D_Ln5.ne4_ne4.FC5AV1C-L.sandiatoss3_intel.cam-cosplite_nhtfrq5 (re-bless, DIFF due to PR # 2770; it was blessed after the 1st merging of PR #2789 that contains NBFB change. This request is to reverse the DIFF due to #2789 )

For record because there were too many DIFFs yesterday due to #2789: there are two other DIFFS but very likely not due to PR #2770.

SMS_Ln9.ne4_ne4.FC5AV1C-L.sandiatoss3_intel.cam-outfrq9s (DIFFs for melvin next and master as well)
SMS_D_Ld1.ne30_oECv3_ICG.A_WCYCL1850S_CMIP6.sandiatoss3_intel.allactive-v1cmip6

rljacob · 2019-03-14T21:06:11Z

Please merge this to master.

Implements remaining changes for gustiness feature for EAMv2 This PR completes the gustiness feature in EAM by implementing all the right namelist settings for gustiness. A new use case file 2000_cam5_av1c-04p2_gust.xml has all the namelist values for invoking this feature using FC5AV1C-L compset. Several new namelist variables required for this feature will now appear in the namelist (atm_in). A test mod directory is also created to add a test for this feature in the nightly testing. [BFB] [NML]

wlin7 · 2019-03-14T22:09:41Z

Merged to master. @singhbalwinder verified this PR does not cause the other two DIFF on sandiatoss3 (cam-outfrq9s and allactive-v1-cmip6). All NML DIFFs requested to be blessed (19 sandiatoss3, 4 melvin, 1 cori-knl).

Implements remaining changes for gustiness feature for EAMv2 This PR completes the gustiness feature in EAM by implementing all the right namelist settings for gustiness. A new use case file 2000_cam5_av1c-04p2_gust.xml has all the namelist values for invoking this feature using FC5AV1C-L compset. Several new namelist variables required for this feature will now appear in the namelist (atm_in). A test mod directory is also created to add a test for this feature in the nightly testing. [BFB] [NML]

…fixes Automatically Merged using E3SM Pull Request AutoTester PR Title: Fixes to get valgrind working on mappy PR Author: jgfouca PR LABELS: AT: AUTOMERGE, AT: Integrate Without Testing

singhbalwinder added 14 commits February 14, 2019 18:56

Adds clubb's c1b and c1c to be read from namelist

6e4b55e

[BFB] - Bit-For-Bit

Adds clubb_c1b in all files which had clubb_c1

185bace

Adds clubb_c1b=clubb_c1 in all files which had clubb_c1 [BFB] - Bit-For-Bit

Added clubb_c1b definition to namelist_definition.xml

2c41493

clubb_c1b was in usecases but not in the namelist_definitions.xml file. It has to be defined in namelist_definitions.xml for it to appear in atm_in file. [BFB] - Bit-For-Bit

Adds compset FC5AV2C so that it is BFB with FC5AV1C-L

6141747

[BFB] - Bit-For-Bit

Temp Commit- adds some vars to use case of new compset

0b9b338

[BFB] - Bit-For-Bit

Updates V2 compset with new coefficient, V1 is BFB

2ab4e74

[BFB] - Bit-For-Bit

Modifies use case for v2 compset to match po-lin's case

f5fc360

[BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags.

Adds clubb_use_sgv to use case for av2c

cd338b9

Adds vmag_gust to infld calls in physpkg.F90

3382111

[BFB] - Bit-For-Bit

defines missing variable for pbuf id for vmag_gust

4f7ef9f

[BFB] - Bit-For-Bit

Adds zmconv_tp_fac value for av2c use case

85789d6

[BFB] - Bit-For-Bit [FCC] - Flag Climate Changing [Non-BFB] - Non Bit-For-Bit [CC] - Climate Changing [NML] - Namelist Changing See confluence for a more detailed description about these tags.

Fixes bug where tp_fac was not broadcasted

f9a6059

[BFB] - Bit-For-Bit

Adds a testmod directory for gustiness

72ee6ae

Removes av2c compset and renames av2c use case file

f1a4ead

[BFB] - Bit-For-Bit

singhbalwinder added Atmosphere BFB PR leaves answers BFB NML labels Mar 8, 2019

singhbalwinder assigned wlin7 Mar 8, 2019

singhbalwinder requested a review from polunma March 8, 2019 22:08

Adds a test for gustiness feature in integration testing

2aa9cde

polunma requested changes Mar 10, 2019

View reviewed changes

singhbalwinder added 2 commits March 11, 2019 12:34

initializes vmag_gust to 0. in physpkg.F90

4ecc855

Adds missed changes to cam_export in camsrfexch.F90

4f0fb8a

polunma approved these changes Mar 11, 2019

View reviewed changes

wlin7 mentioned this pull request Mar 12, 2019

Bug fix for optical thickness calculation in COSP-MODIS #2770

Merged

singhbalwinder mentioned this pull request Mar 13, 2019

Manually reverts gustiness changes from PRs #1035 and #1624 #2720

Merged

singhbalwinder commented Mar 13, 2019

View reviewed changes

Fixes cam_export subroutine such that this PR stays BFB

dfedcd2

[BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags.

Applies a simpler solution using added parentheses to fix nbfb issue

751d2f5

[BFB] - Bit-For-Bit [NML] - Namelist Changing See confluence for a more detailed description about these tags.

wlin7 added a commit that referenced this pull request Mar 14, 2019

Merge singhbalwinder/atm/v2compset' (PR #2789)

78b1396

Implements remaining changes for gustiness feature for EAMv2 Remerged following an update to fix NFBF due to changes in camsrfexch.F90 [BFB]

wlin7 merged commit 751d2f5 into master Mar 14, 2019

wlin7 mentioned this pull request Jul 2, 2019

discontinue support for Eulerian dycore for the SCM (atm) #3035

Merged

quantheory mentioned this pull request Jul 25, 2023

Confusion between scalar and vector stress calculations #5834

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implements remaining changes for gustiness feature for EAMv2 #2789

Implements remaining changes for gustiness feature for EAMv2 #2789

singhbalwinder commented Mar 8, 2019

singhbalwinder commented Mar 8, 2019

polunma left a comment

rljacob commented Mar 12, 2019

wlin7 commented Mar 12, 2019

rljacob commented Mar 13, 2019

singhbalwinder commented Mar 13, 2019

singhbalwinder Mar 13, 2019

singhbalwinder Mar 13, 2019

polunma Mar 13, 2019

singhbalwinder commented Mar 13, 2019

wlin7 commented Mar 13, 2019

wlin7 commented Mar 14, 2019

wlin7 commented Mar 14, 2019

rljacob commented Mar 14, 2019

wlin7 commented Mar 14, 2019

Implements remaining changes for gustiness feature for EAMv2 #2789

Implements remaining changes for gustiness feature for EAMv2 #2789

Conversation

singhbalwinder commented Mar 8, 2019

singhbalwinder commented Mar 8, 2019

polunma left a comment

Choose a reason for hiding this comment

rljacob commented Mar 12, 2019

wlin7 commented Mar 12, 2019

rljacob commented Mar 13, 2019

singhbalwinder commented Mar 13, 2019

singhbalwinder Mar 13, 2019

Choose a reason for hiding this comment

singhbalwinder Mar 13, 2019

Choose a reason for hiding this comment

polunma Mar 13, 2019

Choose a reason for hiding this comment

singhbalwinder commented Mar 13, 2019

wlin7 commented Mar 13, 2019

wlin7 commented Mar 14, 2019

wlin7 commented Mar 14, 2019

rljacob commented Mar 14, 2019

wlin7 commented Mar 14, 2019