Skip to content

CWC update to version v4.6.1.1 #9

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.

Sign up for GitHub

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

Open
jesusff wants to merge 7 commits into
base: v4.6.1-cwc
Choose a base branch
from
Open

CWC update to version v4.6.1.1 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a05814d
Remove inaccurate error message regarding ghg_input (#2199)
kkeene44 Apr 21, 2025
9c1d4b4
bugfix for LCZ index in Noah-MP (#2202)
tslin2 Apr 22, 2025
984797e
Point Noah-MP to the WRF v4.7.1 version (commit e5c0859)
jesusff Jan 13, 2026
299ddbe
Update version_decl to v4.6.1.1-devel
jesusff Jan 13, 2026
b494034
Update Noah-MP to point to latest CWC Noah-MP code
jesusff Jan 13, 2026
be4a093
Update TS_SCHEME to value 2
jesusff Jan 13, 2026
db9e634
Fix noahmp submodule url
jesusff Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "phys/noahmp"]
path = phys/noahmp
url = https://github.com/NCAR/noahmp
url = https://github.com/CORDEX-WRF-community/noahmp
[submodule ".ci/hpc-workflows"]
path = .ci/hpc-workflows
url = https://github.com/islas/hpc-workflows
2 changes: 1 addition & 1 deletion inc/version_decl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CHARACTER (LEN=*), PARAMETER :: release_version = 'V4.6.1'
CHARACTER (LEN=*), PARAMETER :: release_version = 'V4.6.1.1-devel'
25 changes: 13 additions & 12 deletions phys/module_surface_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ SUBROUTINE surface_driver( &
USE module_sf_gfs
USE module_sf_noahdrv ! danli mosaic, the " ,only : lsm " needs to be deleted
USE module_sf_noahlsm, only : LCZ_1,LCZ_2,LCZ_3,LCZ_4,LCZ_5,LCZ_6,LCZ_7,LCZ_8,LCZ_9,LCZ_10,LCZ_11
USE noahmp_tables, only : LCZ_1_TABLE,LCZ_2_TABLE,LCZ_3_TABLE,LCZ_4_TABLE,LCZ_5_TABLE,LCZ_6_TABLE,LCZ_7_TABLE,LCZ_8_TABLE,LCZ_9_TABLE,LCZ_10_TABLE,LCZ_11_TABLE
USE module_sf_noahmpdrv, only : noahmplsm, noahmp_urban
USE module_sf_noahmp_groundwater
USE module_sf_noah_seaice_drv
Expand Down Expand Up @@ -3354,10 +3355,10 @@ SUBROUTINE surface_driver( &
ENDIF
TH2(I,J) = T2(I,J)*(1.E5/PSFC(I,J))**RCP
! ELSEIF (IVGTYP(I,J) == ISURBAN .OR. IVGTYP(I,J) == ISICE .OR. FVEGXY(I,J) == 0.0 ) THEN
ELSEIF( IVGTYP(I,J) == ISURBAN .or. IVGTYP(I,J) == LCZ_1 .or. IVGTYP(I,J) == LCZ_2 .or. &
IVGTYP(I,J) == LCZ_3 .or. IVGTYP(I,J) == LCZ_4 .or. IVGTYP(I,J) == LCZ_5 .or. &
IVGTYP(I,J) == LCZ_6 .or. IVGTYP(I,J) == LCZ_7 .or. IVGTYP(I,J) == LCZ_8 .or. &
IVGTYP(I,J) == LCZ_9 .or. IVGTYP(I,J) == LCZ_10 .or. IVGTYP(I,J) == LCZ_11 .or. &
ELSEIF( IVGTYP(I,J) == ISURBAN .or. IVGTYP(I,J) == LCZ_1_TABLE .or. IVGTYP(I,J) == LCZ_2_TABLE .or. &
IVGTYP(I,J) == LCZ_3_TABLE .or. IVGTYP(I,J) == LCZ_4_TABLE .or. IVGTYP(I,J) == LCZ_5_TABLE .or. &
IVGTYP(I,J) == LCZ_6_TABLE .or. IVGTYP(I,J) == LCZ_7_TABLE .or. IVGTYP(I,J) == LCZ_8_TABLE .or. &
IVGTYP(I,J) == LCZ_9_TABLE .or. IVGTYP(I,J) == LCZ_10_TABLE .or. IVGTYP(I,J) == LCZ_11_TABLE .or. &
(IVGTYP(I,J) == ISICE .AND. XICE(I,J) .LT. XICE_THRESHOLD)) THEN

Q2(I,J) = Q2MBXY(I,J)
Expand All @@ -3382,10 +3383,10 @@ SUBROUTINE surface_driver( &
IF(SF_URBAN_PHYSICS.eq.1) THEN
DO j=j_start(ij),j_end(ij) !urban
DO i=i_start(ij),i_end(ij) !urban
IF( IVGTYP(I,J) == ISURBAN .or. IVGTYP(I,J) == LCZ_1 .or. IVGTYP(I,J) == LCZ_2 .or. &
IVGTYP(I,J) == LCZ_3 .or. IVGTYP(I,J) == LCZ_4 .or. IVGTYP(I,J) == LCZ_5 .or. &
IVGTYP(I,J) == LCZ_6 .or. IVGTYP(I,J) == LCZ_7 .or. IVGTYP(I,J) == LCZ_8 .or. &
IVGTYP(I,J) == LCZ_9 .or. IVGTYP(I,J) == LCZ_10 .or. IVGTYP(I,J) == LCZ_11 )THEN
IF( IVGTYP(I,J) == ISURBAN .or. IVGTYP(I,J) == LCZ_1_TABLE .or. IVGTYP(I,J) == LCZ_2_TABLE .or. &
IVGTYP(I,J) == LCZ_3_TABLE .or. IVGTYP(I,J) == LCZ_4_TABLE .or. IVGTYP(I,J) == LCZ_5_TABLE .or. &
IVGTYP(I,J) == LCZ_6_TABLE .or. IVGTYP(I,J) == LCZ_7_TABLE .or. IVGTYP(I,J) == LCZ_8_TABLE .or. &
IVGTYP(I,J) == LCZ_9_TABLE .or. IVGTYP(I,J) == LCZ_10_TABLE .or. IVGTYP(I,J) == LCZ_11_TABLE )THEN
Q2(I,J) = (FVEGXY(I,J)*Q2MVXY(I,J) + (1.-FVEGXY(I,J))*Q2MBXY(I,J))*(1.-FRC_URB2D(I,J)) + &
Q2_URB2D(I,J)*FRC_URB2D(I,J)
T2(I,J) = (FVEGXY(I,J)*T2MVXY(I,J) + (1.-FVEGXY(I,J))*T2MBXY(I,J))*(1.-FRC_URB2D(I,J)) + &
Expand All @@ -3406,10 +3407,10 @@ SUBROUTINE surface_driver( &
IF((SF_URBAN_PHYSICS.eq.2).OR.(SF_URBAN_PHYSICS.eq.3)) THEN
DO j=j_start(ij),j_end(ij) !urban
DO i=i_start(ij),i_end(ij) !urban
IF( IVGTYP(I,J) == ISURBAN .or. IVGTYP(I,J) == LCZ_1 .or. IVGTYP(I,J) == LCZ_2 .or. &
IVGTYP(I,J) == LCZ_3 .or. IVGTYP(I,J) == LCZ_4 .or. IVGTYP(I,J) == LCZ_5 .or. &
IVGTYP(I,J) == LCZ_6 .or. IVGTYP(I,J) == LCZ_7 .or. IVGTYP(I,J) == LCZ_8 .or. &
IVGTYP(I,J) == LCZ_9 .or. IVGTYP(I,J) == LCZ_10 .or. IVGTYP(I,J) == LCZ_11 )THEN
IF( IVGTYP(I,J) == ISURBAN .or. IVGTYP(I,J) == LCZ_1_TABLE .or. IVGTYP(I,J) == LCZ_2_TABLE .or. &
IVGTYP(I,J) == LCZ_3_TABLE .or. IVGTYP(I,J) == LCZ_4_TABLE .or. IVGTYP(I,J) == LCZ_5_TABLE .or. &
IVGTYP(I,J) == LCZ_6_TABLE .or. IVGTYP(I,J) == LCZ_7_TABLE .or. IVGTYP(I,J) == LCZ_8_TABLE .or. &
IVGTYP(I,J) == LCZ_9_TABLE .or. IVGTYP(I,J) == LCZ_10_TABLE .or. IVGTYP(I,J) == LCZ_11_TABLE )THEN
T2(I,J) = TH_PHY(i,1,j)/((1.E5/PSFC(I,J))**RCP) !urban
TH2(I,J) = TH_PHY(i,1,j) !urban
Q2(I,J) = qv_curr(i,1,j) !urban
Expand Down
2 changes: 1 addition & 1 deletion phys/noahmp
Open in desktop
Submodule noahmp updated 5 files
+2 −2 README.md
+3 −4 drivers/wrf/module_sf_noahmpdrv.F
+2 −2 parameters/MPTABLE.TBL
+13 −12 src/module_sf_noahmp_glacier.F
+23 −15 src/module_sf_noahmplsm.F
2 changes: 1 addition & 1 deletion run/URBPARM.TBL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ CH_SCHEME: 2
# (sf_urban_physics=1)
#

TS_SCHEME: 1
TS_SCHEME: 2

#
# AHOPTION [ 0: No anthropogenic heating, 1: Anthropogenic heating will be added to sensible heat flux term ]
Expand Down
2 changes: 1 addition & 1 deletion run/URBPARM_LCZ.TBL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ CH_SCHEME: 2
# (sf_urban_physics=1)
#

TS_SCHEME: 1
TS_SCHEME: 2

#
# AHOPTION [ 0: No anthropogenic heating, 1: Anthropogenic heating will be added to sensible heat flux term ]
Expand Down
2 changes: 2 additions & 0 deletions share/module_check_a_mundo.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,8 @@ END FUNCTION bep_bem_ngr_u
( model_config_rec % ra_sw_physics(i) .EQ. RRTMG_SWSCHEME ) .OR. &
( model_config_rec % ra_sw_physics(i) .EQ. RRTMG_SWSCHEME_FAST ) ) ) ) THEN
! This is OK, no way would a negation have been understandable!
ELSE IF ( model_config_rec % ra_sw_physics(i) == 0 ) THEN
model_config_rec%ghg_input=0
ELSE
oops = oops + 1
END IF
Expand Down