Fix AHE option 2 and a problem with mosaic

epn09 commented 5 months ago

Related to PR#1881.

TYPE: bug fix

KEYWORDS: anthropogenic heat, mosaic

SOURCE: Do Ngoc Khanh (Tokyo Institute of Technology)

DESCRIPTION OF CHANGES: Problem 1:

In https://github.com/wrf-model/WRF/pull/1881#discussion_r1446523703, @cenlinhe said that FRC_URB2D should be IN (not INOUT) and removed a portion of code. See https://github.com/wrf-model/WRF/pull/1986/files#diff-4cf900c383221426961400b9c706d4a7f551833ccff64af20fef15ef6bdc0f1bL3721.
However, that change causes UTYPE_URB passed to urban module to become 0 when mosaic is turn on, and array index out of bound error occurs.

Solution 1:

As I said before, I don't know why FRC_URB2D and UTYPE should be set there. But apparently the model does not work if they are not set there (even when the new options are turned off and only standard SLUCM is used).
In this PR, I revert that portion of change. Converting FRC_URB2D back to INOUT.

Problem 2:

@weiwangncar said that adding AH to HFX after PBL driver has no effect. https://github.com/wrf-model/WRF/pull/1986#discussion_r1480479849

Solution 2:

I moved the addition part to surface driver, right after the computation of HFX.

This PR also removes a few unused variables in their declaration.

LIST OF MODIFIED FILES: M dyn_em/module_first_rk_step_part1.F M phys/module_pbl_driver.F M phys/module_sf_noahdrv.F M phys/module_surface_driver.F

TESTS CONDUCTED: The Jenkins tests are all passing.

RELEASE NOTE: Fix AHE option 2 and a problem with mosaic

dudhia commented 5 months ago

Yes, it is needed in the surface driver.

epn09 commented 5 months ago

@cenlinhe @tslin2 I have converted INOUT back to IN for FRC_URB2D and made a slight modification to initialize_real. For the new options, the output was identical.

epn09 commented 4 months ago

@cenlinhe @tslin2 Happy Chinese new year. Any updates on this?

cenlinhe commented 4 months ago

The modifications look good to me. @dudhia Are we going to include this PR to the v4.6 release or do you prefer to merge this PR for v4.6.1 minor release? Have we frozen the v4.6 release branch?

dudhia commented 4 months ago

There is still time to get this in the release. We have the test phase to consider any remaining questions.

epn09 commented 4 months ago

@weiwangncar @dudhia @cenlinhe Do you have any further concerns about this PR? I'll be on leave from Thursday.

wrf-model / WRF

Fix AHE option 2 and a problem with mosaic #2005