Skip to content

Fix WRFPlus compilation issue#1090

Merged
liujake merged 2 commits intowrf-model:developfrom
liujake:wrfplus_fix
Feb 12, 2020
Merged

Fix WRFPlus compilation issue#1090
liujake merged 2 commits intowrf-model:developfrom
liujake:wrfplus_fix

Conversation

@liujake
Copy link
Contributor

@liujake liujake commented Feb 12, 2020

TYPE: bug fix

KEYWORDS: wrfplus, TL/AD code

SOURCE: internal

DESCRIPTION OF CHANGES:
Two recent WRF model code changes break the wrfplus compilation:

  1. ESMF name change
    This modification allowed the CTSM development to use standard ESMF without conflicting
    with WRF old ESMF library namespace.
    Commit 8af5385, PR Enabling WRF build with ESMF library #1066 "Enabling WRF build with ESMF library"
  2. module_diffusion_em_ad.F, 3d scale aware TKE (one of these, take your pick)
    Commit d059afe, PR Add a scale-adaptive 3DTKE parameterization scheme as a subgrid mixing option  #972 "Add a scale-adaptive 3DTKE parameterization scheme as a subgrid mixing option
    Commit 6d95883, PR SMS3dTKE: Remove broken packaging for km_opt=5 #1012 "SMS3dTKE: Remove broken packaging for km_opt=5"
    Commit 94e5ed9, PR Add missing "IF km_opt==5" tests for diag computations #1013 "Add missing "IF km_opt==5" tests for diag computations"
    Commit dd0c209, PR Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes #1026 "Fixing the problem that km_opt=5 breaks km_opt=2 and cleaning codes"

LIST OF MODIFIED FILES:
M share/mediation_integrate.F
M wrftladj/module_diffusion_em_ad.F

TESTS CONDUCTED: wrfplus code compiles now.

	modified:   main/depend.common
	modified:   share/mediation_integrate.F
	modified:   wrftladj/module_diffusion_em_ad.F
module_ra_rrtmg_lwk.o \
module_ra_rrtmg_swk.o \
module_ra_cam.o \
module_ra_farms.o \
Copy link
Contributor

Choose a reason for hiding this comment

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

@liujake
Jake,
There is a separate PR for this mod, which is a more general fix than just for DA.
Please remove it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thought this should disappear after you merge your PR. Apparently not.

Copy link
Contributor

Choose a reason for hiding this comment

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

No such luck.
I can easily remove this line via github, if you like.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed it online.

@davegill
Copy link
Contributor

@jjguerrette
Likely will be approving this. I wanted to chime in that I am OK with this PR.

  1. I asked Jake to remove a redundant mod that would have caused a conflict - it is gone.
  2. The modification inside of share/mediation_integrate.F is inside of a wrfplus ifdef, so no impact on anything other than DA.
  3. The mod does what Jake wanted - make DA build.

@liujake liujake merged commit bfdd631 into wrf-model:develop Feb 12, 2020
@liujake liujake deleted the wrfplus_fix branch February 12, 2020 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants