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

Physics separation merge: Step6 #28

Merged
merged 27 commits into from
Dec 21, 2017
Merged

Physics separation merge: Step6 #28

merged 27 commits into from
Dec 21, 2017

Conversation

llpcarson
Copy link
Contributor

From Lulin Xue,
https://github.com/lulinxue/gmtb-gfsphysics (push)

branch: GFS_separate_Noah_LSM_master_gfsphysics

merged with master, bit-for-bit match with baseline (theia)

Lulin Xue and others added 26 commits September 21, 2017 11:55
resolve conflict of long name
resolve longname conflict
resolve longname conflict
fix longname conflict
@climbfuji
Copy link
Collaborator

@llpcarson @grantfirl

Is the treatment of the soil variables consistent? I just skimmed through the files, there are still assignments of the type

  Sfcprop%smc(:,:) = smsoil(:,:)
  Sfcprop%stc(:,:) = stsoil(:,:)
  Sfcprop%slc(:,:) = slsoil(:,:)

in the GFS physics driver. In the top, the original assigments are partially commented out:

  •  smsoil(:,:) = Sfcprop%smc(:,:)
    

+! smsoil(:,:) = Sfcprop%smc(:,:)
stsoil(:,:) = Sfcprop%stc(:,:)

  •  slsoil(:,:) = Sfcprop%slc(:,:)          !! clu: slc -> slsoil
    

+! slsoil(:,:) = Sfcprop%slc(:,:)

and the code that is commented out is now taken care of in lsm_noah_pre_run. I assume that the above lines Sfcprop%smc(:,:) = smsoil(:,:) should be in lsm_noah_post_run, or? And stsoil should be treated in the same way as smsoil and slsoil?

@grantfirl
Copy link
Collaborator

@llpcarson @climbfuji

Good catch, Dom. The lines
Sfcprop%smc(:,:) = smsoil(:,:) Sfcprop%slc(:,:) = slsoil(:,:)
do belong in lsm_noah_post_run.

I'm putting the lines
stsoil(:,:) = Sfcprop%stc(:,:)
and
Sfcprop%stc(:,:) = stsoil(:,:)
in GFS_surface_generic_pre and GFS_surface_generic_post due to their use in two surface schemes.

Of course, all of these lines are good candidates for code cleanup. As far as I can tell, there is no need to set smsoil, slsoil, stsoil and then assign them to Sfcprop%X since GFS_physics_driver is going away.

For the purpose of v1, though, could Laurie add the two lines setting Sfcprop%smc and slc into lsm_noah_post_run? If you don't have time to do that, I could go into your fork and do it.

@llpcarson
Copy link
Contributor Author

llpcarson commented Dec 20, 2017 via email

@llpcarson
Copy link
Contributor Author

I made the suggested changes, re-ran the test (theia). Please review - I'm not as fluent in this part of the physics variables as others (Grant, Dom!)

Copy link
Collaborator

@grantfirl grantfirl left a comment

Choose a reason for hiding this comment

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

Looks good to me, Laurie.

@llpcarson llpcarson merged commit aa69bf4 into NCAR:master Dec 21, 2017
climbfuji pushed a commit to climbfuji/ccpp-physics that referenced this pull request May 27, 2020
grantfirl pushed a commit to grantfirl/ccpp-physics that referenced this pull request Jan 9, 2023
Uniformly apply REAL(kind=kind_phys) from CCPP-Physics machine.F definitions to MYNN Surface scheme and wrapper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants