RRTMGP w/ GFS SDFs + some houskeeping #181

dustinswales · 2020-04-30T21:51:22Z

This PR contains the necessary changes to work w/ ccpp-physics PR#446 (NCAR/ccpp-physics#446).

Similar to that PR, there were some changes to the names of the radiation heating rates variables, so there is some cleaning up in GFS_typedefs addressing this.

grantfirl · 2020-05-02T01:16:56Z

scm/src/GFS_typedefs.F90

@@ -1850,12 +1850,6 @@ real (kind=kind_phys), pointer :: prsik (:,:) => null()   !< Exner function at i
    real (kind=kind_phys), pointer      :: cld_resnow(:,:)        => null()  !< Cloud snow effective radius


@dustinswales I don't see these same changes in NCAR/fv3atm#46. Were they previously committed there? We try to keep the two GFS_typedefs as close to each other as possible.

@grantfirl
You are correct. I did some cleanup in here to the RRTMGP interstitial fields. I will do the same on the fv3atm side.

grantfirl · 2020-05-02T01:17:42Z

.gitmodules

@@ -4,5 +4,5 @@
 	branch = dtc/develop


After testing, we'd like to see this reverted.

dustinswales · 2020-05-11T21:19:02Z

SCM results, both SDFs, twpice configuration. RRTMGP (blue), RRTMG (red)
scm_GvGP_v15p2.pdf
scm_GvGP_v16beta.pdf

…ion time-steps.

…se_LW_jacobian Conflicts: ccpp/config/ccpp_prebuild_config.py ccpp/physics

…into use_LW_jacobian" This reverts commit c68d43f, reversing changes made to 3dc5469.

…updated correctly.

grantfirl · 2020-08-10T18:27:06Z

@grantfirl
I need to revisit it this. I will cleanup and update this afternoon.

OK, let me know if you need anything. I'm happy to help, since this is required to have the master SCM code work with ccpp-physics/master.

Conflicts: scm/src/default_namelists.py

…velop Conflicts: ccpp/config/ccpp_prebuild_config.py scm/src/GFS_typedefs.F90 scm/src/default_namelists.py scm/src/gmtb_scm_input.F90

dustinswales · 2020-08-10T20:02:20Z

@grantfirl
I updated to the NCAR master physics and added in some infrastructure to the SCM side, but I cannot get the prebuild to work.

grantfirl · 2020-08-10T20:15:12Z

@grantfirl
I updated to the NCAR master physics and added in some infrastructure to the SCM side, but I cannot get the prebuild to work.

OK, I'll pull in your changes and see what I can do. If I find something that I can fix, I'll submit a PR from my fork to yours. I'm also just about ready to merge in #191, so I'll update your branch for that too. It shouldn't affect anything from your PR since it's just adding new cases.

…rrent master

…ast commit)

…GP update from Dustin

…te code

… RRTMGP update

…to run successfully

…with ccpp_prebuild

grantfirl · 2020-08-11T00:00:33Z

@dustinswales A quick update: starting from this branch, I now have a branch that is working OK. I'm building/compiling one last time to double-check, and then I'll submit a PR from my branch to this one for you to review. Where necessary, I took my lead from the associated changes in FV3 (like SDFs and ccpp_prebuild_config.py). You may want to pay particular attention to changes in those to make sure that I updated them as you intended.

grantfirl · 2020-08-11T00:10:01Z

If you accept the PR from my fork to yours, I'd like to have you remove the Apollo setup script before I accept/merge. I think that the code managers want to keep only setup scripts for officially-supported machines.

Grant's changes to PR#181

dustinswales · 2020-08-11T16:35:13Z

@grantfirl
I accepted your PR. Builds/runs, everything works. I removed my local system configuration file.

grantfirl

Thanks @dustinswales, approved. I think that this is good to merge on my side. I'll ask @climbfuji if he wants to take a look before merging.

climbfuji

Two minor comments, but probably just my lack of understanding.

ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml

climbfuji · 2020-08-11T16:55:56Z

scm/src/GFS_typedefs.F90

+	!
+	if (Model%do_RRTMGP) then  
+	   if (Model%use_LW_jacobian) then 
+          !Interstitial%fluxlwUP_jac   = clear_val


Why commented out? Same for line 6994.

@dustinswales I am curious about this too.

grantfirl · 2020-08-11T17:08:20Z

I'll go ahead and merge. If @climbfuji would rather me remove the ACM SDF altogether, I can do that in a followup.

RRTMGP w/ GFS SDFs + some houskeeping

dustinswales added 4 commits April 20, 2020 09:47

Updated .submodules.

ee18201

Added RRTMGP to GFS_v16beta ccpp physics suite.

97e6065

Updated GP suite heating rates in ccpp-physics. Cleaned up.

b21888c

Updated ccpp-physics submodule.

36e2aa1

dustinswales requested review from climbfuji, grantfirl and llpcarson as code owners April 30, 2020 21:51

grantfirl reviewed May 2, 2020

View reviewed changes

.gitmodules Outdated

@@ -4,5 +4,5 @@

branch = dtc/develop

Copy link

Collaborator

grantfirl May 2, 2020

Choose a reason for hiding this comment

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

After testing, we'd like to see this reverted.

climbfuji mentioned this pull request May 4, 2020

RRTMGP w/ GFS SDFs + some housekeeping NCAR/ccpp-physics#446

Merged

grantfirl changed the base branch from dtc/develop to master May 4, 2020 23:21

dustinswales added 2 commits May 11, 2020 10:41

Added in new overlap assumtion used in GFS_FV3_v16beta physics suite.

7d4e4fe

Updated submodule.

23cfdd6

dustinswales added 16 commits May 14, 2020 13:41

Major reorganization of GFDLMP-2-RRTMGP interface.

d44574e

Omission from previous commit.

7880249

Cleaned up optional arguments for rte routines.

e08b726

Tidied up. Removed options not exercised. Replaced with errors.

358c844

Replaced integer control over cloud-optics scheme with logics.

6fdb2e0

Seperated cloud/precipitation optics.

6df7ffa

Housekeeeping. Working with both EMC SDFs in SCM and UFS.

d47076f

Renamed sampling routines.

3c20679

Added infrastructure to use LW jacobians in RRTMGP LW scheme.

19f5ba9

Added new scheme for RRTMGP LW surface flux adjustment between radiat…

3dc5469

…ion time-steps.

Merge branch 'dtc/develop' of https://github.com/NCAR/gmtb-scm into u…

c68d43f

…se_LW_jacobian Conflicts: ccpp/config/ccpp_prebuild_config.py ccpp/physics

Omission from previous commit

3ffa4ea

Some changes

c26b5d1

Revert "Merge branch 'dtc/develop' of https://github.com/NCAR/gmtb-scm …

e9c2a99

…into use_LW_jacobian" This reverts commit c68d43f, reversing changes made to 3dc5469.

Functionally working, but the surface temperature field is not being …

ed3c398

…updated correctly.

LW adjusted flux using GP Jacobians is working.

fb8f571

dustinswales added 6 commits August 10, 2020 12:46

Updated ccpp-physics to NCAR-master

96307b7

Merge branch 'master' of https://github.com/NCAR/gmtb-scm

2bfc95a

Conflicts: scm/src/default_namelists.py

Merge branch 'master' of https://github.com/NCAR/gmtb-scm into dtc/de…

fa9ebce

…velop Conflicts: ccpp/config/ccpp_prebuild_config.py scm/src/GFS_typedefs.F90 scm/src/default_namelists.py scm/src/gmtb_scm_input.F90

Updated prebuild script

2003405

Reverted GFS_typedef files, history got currpoted.

5943e70

Added con_epsqs to physical_constants.

9dc877d

grantfirl added 10 commits August 10, 2020 15:12

revert a bunch of SCM files that didn't have RRTMGP changes to the cu…

5b8b41c

…rrent master

revert some files again (had old local version of master branch for l…

6fe8b56

…ast commit)

manually merge ccpp_prebuild_config.py between latest master and RRTM…

8b43512

…GP update from Dustin

update .gitmodules

8a8988f

manually merge the RRTMGP SDFs between current master and RRTMGP upda…

eef88c9

…te code

manually merge gmtb_scm_physical_constants between current master and…

985202f

… RRTMGP update

revert a few small changes in GFS_typedefs.F90

e5d510c

match ccpp_prebuil_config.py changes with FV3 version

25f65a9

update RRTMGP SDFs and default namelists and tracer configs in order …

aa294ea

…to run successfully

comment out ACM scheme in ACM suite to that it doesn't cause trouble …

0473355

…with ccpp_prebuild

dustinswales added 2 commits August 11, 2020 09:53

Merge pull request #4 from grantfirl/rrtmgp_update_gjf_20200810

7280d37

Grant's changes to PR#181

Removed local setup script.

9e01f20

grantfirl approved these changes Aug 11, 2020

View reviewed changes

climbfuji approved these changes Aug 11, 2020

View reviewed changes

Removed deprecated code.

8207944

grantfirl merged commit 486fd92 into NCAR:master Aug 11, 2020

dustinswales pushed a commit to dustinswales/ccpp-scm that referenced this pull request May 16, 2022

Merge pull request NCAR#181 from dustinswales/dtc/develop

42e295b

RRTMGP w/ GFS SDFs + some houskeeping

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RRTMGP w/ GFS SDFs + some houskeeping #181

RRTMGP w/ GFS SDFs + some houskeeping #181

dustinswales commented Apr 30, 2020

grantfirl May 2, 2020

dustinswales May 4, 2020

grantfirl May 2, 2020

dustinswales commented May 11, 2020

grantfirl commented Aug 10, 2020

dustinswales commented Aug 10, 2020

grantfirl commented Aug 10, 2020

grantfirl commented Aug 11, 2020

grantfirl commented Aug 11, 2020

dustinswales commented Aug 11, 2020

grantfirl left a comment

climbfuji left a comment

climbfuji Aug 11, 2020

grantfirl Aug 11, 2020

grantfirl commented Aug 11, 2020

		@@ -1850,12 +1850,6 @@ real (kind=kind_phys), pointer :: prsik (:,:) => null() !< Exner function at i
		real (kind=kind_phys), pointer :: cld_resnow(:,:) => null() !< Cloud snow effective radius

RRTMGP w/ GFS SDFs + some houskeeping #181

RRTMGP w/ GFS SDFs + some houskeeping #181

Conversation

dustinswales commented Apr 30, 2020

grantfirl May 2, 2020

Choose a reason for hiding this comment

dustinswales May 4, 2020

Choose a reason for hiding this comment

grantfirl May 2, 2020

Choose a reason for hiding this comment

dustinswales commented May 11, 2020

grantfirl commented Aug 10, 2020

dustinswales commented Aug 10, 2020

grantfirl commented Aug 10, 2020

grantfirl commented Aug 11, 2020

grantfirl commented Aug 11, 2020

dustinswales commented Aug 11, 2020

grantfirl left a comment

Choose a reason for hiding this comment

climbfuji left a comment

Choose a reason for hiding this comment

climbfuji Aug 11, 2020

Choose a reason for hiding this comment

grantfirl Aug 11, 2020

Choose a reason for hiding this comment

grantfirl commented Aug 11, 2020