Skip to content

Scientific documentation updates from CCPP v6.0.0 release and code cleanup#944

Merged
grantfirl merged 83 commits into
NCAR:mainfrom
mzhangw:v6_to_main
Aug 16, 2022
Merged

Scientific documentation updates from CCPP v6.0.0 release and code cleanup#944
grantfirl merged 83 commits into
NCAR:mainfrom
mzhangw:v6_to_main

Conversation

@mzhangw
Copy link
Copy Markdown
Contributor

@mzhangw mzhangw commented Jul 1, 2022

This PR is aimed at:

All RTs passed on Hera.

dustinswales and others added 30 commits March 18, 2022 18:18
…v6_scidoc

* 'main' of https://github.com/NCAR/ccpp-physics:
  fix the missing value of fv in vege_flux
  Revert "Lsm upgrades mynn for p8c"
  put a upper/lower limit on cwpc
  Driver update, opt_trs=4 over vegetation, and z0hover bare soil etc.
  modify a table of cwp parameter
  modify a table of cwp parameter
  modify a table of cwp parameter
  modify a table of cwp parameter
  revert back to shdfac in gvfun calculation due to occasional model crash
  tuning cd/lm parameter
  tuning cd/lm parameter
  Noah MP non-glacier changes for MYNN
  Noah MP glacier changes for MYNN
  Noah MP driver and meta changes for MYNN
  modify the eddy diffusivity for heat at the top of the canopy
  replace shdfac by fveg for zvfun
  Properly set the total number of species to be diffused in the PBL for Thompson microphysics scheme when coupling with prognostic aerosols (NCAR#880).
  further refinement of the impact of vegetation on zvfun
  correct the condition to avoid a divide by zero exception
  add Chunxi Zhang to CODEOWNERS
  revert the df1 change due to some negative impact on surface temperature
  to avoid exception floating point
  simplify the code with internal function maxval
  replace fveg by lai/laimax to be used for dependent
  to read new hig-res ice climatology data
  correct the reference height
  gvf impact on thermal conductivity limited to the first soil layer
  add some groundwater mods from ncar code
  add some clean up to energy
  fix missing czil1 in vege_flux
  move trs options to sfcdif3
  change fveg to shdfac in sfcdif3 vege call
  add sfcdif3 as a separate subroutine
  add canopy heat storage and gvf impact on thermal conductivity
  minor formatting
  update scm_sfc_flux_spec scheme to set some variables needed by non-surface physics
  canopy height dependant czil
  change czil
  set up option for thermal roughness
@grantfirl
Copy link
Copy Markdown
Collaborator

@mzhangw Please amend the description of this PR to indicate that several empty subroutines were removed since that is definitely not documentation as the title suggests. Should I interpret these changes as being "complete"; i.e. did you remove all empty subroutines?

Comment thread physics/GFS_cloud_diagnostics.F90 Outdated
Comment thread physics/radlw_main.F90 Outdated
Comment thread physics/radlw_main.F90
Comment thread physics/radsw_main.F90 Outdated
Comment thread physics/radsw_main.F90
@mzhangw
Copy link
Copy Markdown
Contributor Author

mzhangw commented Jul 15, 2022

@grantfirl I was told to leave those empty subroutines at some point since it is not the primary purpose of this activity, and I cleaned up some of them, but not all of them. So do you want me to double-check if there is anything left?

@grantfirl
Copy link
Copy Markdown
Collaborator

My preference would be to either leave all of the empty subroutines intact (to be removed in a separate PR) or to remove all of them in this one. Since you've already done a bunch of them, it doesn't make sense to undo them, so I would say that it would be good to double-check the rest of the code. @ligiabernardet any opinion?

@ligiabernardet
Copy link
Copy Markdown
Collaborator

@mzhangw Pls remove the empty subroutines and make sure RTs pass. Tks

@mzhangw mzhangw changed the title Scientific documentation updates from CCPP v6.0.0 release Scientific documentation updates from CCPP v6.0.0 release and code cleanup Jul 19, 2022
@mzhangw
Copy link
Copy Markdown
Contributor Author

mzhangw commented Jul 20, 2022

@mzhangw Pls remove the empty subroutines and make sure RTs pass. Tks

@ligiabernardet @grantfirl All empty subroutines are removed as requested. This PR passed all RTs on Hera.

Copy link
Copy Markdown
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.

Thanks, @mzhangw. This looks good to go from my end now.

!! computational expense. This subroutine computes the length scales up and down
!! and then computes the min, average of the up/down length scales, and also
!! considers the distance to the surface.
!
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The subroutine "mym_initialize" was not taken from the BouLac scheme. It is original to the MYNN. This comment should be taken out

Copy link
Copy Markdown
Collaborator

@joeolson42 joeolson42 left a comment

Choose a reason for hiding this comment

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

All good except for one comment about the subroutine "mym_initialize" in the module_bl_mynn.F90, which seems to not fit the description.

@grantfirl
Copy link
Copy Markdown
Collaborator

@mzhangw Please address the comment from @joeolson42. I ended up putting upstream PRs for this PR by itself due to the delay in approval for the ccpp-framework one. I'm going to ask for this to be put into the UFS merge queue next week.

update v6_to_main from main and fix typo
@grantfirl grantfirl merged commit cf353f6 into NCAR:main Aug 16, 2022
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.