Skip to content

Sync with develop branch for bug fix #109

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

Merged
cenlinhe merged 2 commits into from
Jan 5, 2024
Merged

Sync with develop branch for bug fix #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad2826b
bug fix for undefined albedo value
cenlinhe Jan 5, 2024
843a742
bug fix for leaf mass initialization for urban pixel
cenlinhe Jan 5, 2024
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
4 changes: 1 addition & 3 deletions drivers/hrldas/EnergyVarOutTransferMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,11 @@ subroutine EnergyVarOutTransfer(noahmp, NoahmpIO)
NoahmpIO%CHB2XY (I,J) = noahmp%energy%state%ExchCoeffSh2mBare
NoahmpIO%Q2MVXY (I,J) = noahmp%energy%state%SpecHumidity2mVeg /(1.0-noahmp%energy%state%SpecHumidity2mVeg) ! spec humidity to mixing ratio
NoahmpIO%Q2MBXY (I,J) = noahmp%energy%state%SpecHumidity2mBare/(1.0-noahmp%energy%state%SpecHumidity2mBare)
NoahmpIO%ALBEDO (I,J) = noahmp%energy%state%AlbedoSfc
NoahmpIO%IRRSPLH (I,J) = NoahmpIO%IRRSPLH(I,J) + &
(noahmp%energy%flux%HeatLatentIrriEvap * noahmp%config%domain%MainTimeStep)
NoahmpIO%TSLB (I,1:NumSoilLayer,J) = noahmp%energy%state%TemperatureSoilSnow(1:NumSoilLayer)
NoahmpIO%TSNOXY (I,-NumSnowLayerMax+1:0,J) = noahmp%energy%state%TemperatureSoilSnow(-NumSnowLayerMax+1:0)
if ( noahmp%energy%state%AlbedoSfc > -999 ) then
NoahmpIO%ALBEDO(I,J) = noahmp%energy%state%AlbedoSfc
endif

! New Calculation of total Canopy/Stomatal Conductance Based on Bonan et al. (2011), Inverse of Canopy Resistance (below)
LeafAreaIndSunlit = max(noahmp%energy%state%LeafAreaIndSunlit, 0.0)
Expand Down
6 changes: 3 additions & 3 deletions drivers/hrldas/NoahmpInitMainMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,12 @@ subroutine NoahmpInitMain(NoahmpIO)
NoahmpIO%LAI(I,J) = 0.0
NoahmpIO%LAI(I,J) = max(NoahmpIO%LAI(I,J), 0.05) ! at least start with 0.05 for arbitrary initialization (v3.7)
NoahmpIO%XSAIXY(I,J) = max(0.1*NoahmpIO%LAI(I,J), 0.05) ! MB: arbitrarily initialize SAI using input LAI (v3.7)
if ( NoahmpIO%SF_URBAN_PHYSICS == 0 ) then
if ( urbanpt_flag .eqv. .true. ) then
NoahmpIO%LFMASSXY(I,J) = NoahmpIO%LAI(I,J) * 1000.0 / &
max(NoahmpIO%SLA_TABLE(NoahmpIO%IVGTYP(I,J)),1.0) ! use LAI to initialize (v3.7)
max(NoahmpIO%SLA_TABLE(NoahmpIO%NATURAL_TABLE),1.0)! use LAI to initialize (v3.7)
else
NoahmpIO%LFMASSXY(I,J) = NoahmpIO%LAI(I,J) * 1000.0 / &
max(NoahmpIO%SLA_TABLE(NoahmpIO%NATURAL_TABLE),1.0)! use LAI to initialize (v3.7)
max(NoahmpIO%SLA_TABLE(NoahmpIO%IVGTYP(I,J)),1.0) ! use LAI to initialize (v3.7)
endif
NoahmpIO%STMASSXY(I,J) = NoahmpIO%XSAIXY(I,J) * 1000.0 / 3.0 ! use SAI to initialize (v3.7)
NoahmpIO%RTMASSXY(I,J) = 500.0 ! these are all arbitrary and probably should be
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyMainGlacierMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ subroutine EnergyMainGlacier(noahmp)
if ( RadSwDownRefHeight > 0.0 ) then
AlbedoSfc = RadSwReflSfc / RadSwDownRefHeight
else
AlbedoSfc = -999.9
AlbedoSfc = undefined_real
endif

end associate
Expand Down
2 changes: 1 addition & 1 deletion src/EnergyMainMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ subroutine EnergyMain(noahmp)
if ( RadSwDownRefHeight > 0.0 ) then
AlbedoSfc = RadSwReflSfc / RadSwDownRefHeight
else
AlbedoSfc = -999.9
AlbedoSfc = undefined_real
endif

end associate
Expand Down
8 changes: 4 additions & 4 deletions utility/Machine.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module Machine
integer, public, parameter :: kind_noahmp = 4 ! single precision
#endif

integer, public, parameter :: undefined_int = -99999 ! undefined integer for variable initialization
real(kind=kind_noahmp), public, parameter :: undefined_real = -99999.0 ! undefined real for variable initializatin
integer, public, parameter :: undefined_int_neg = -99999 ! undefined integer negative for variable initialization
real(kind=kind_noahmp), public, parameter :: undefined_real_neg = -99999.0 ! undefined real negative for variable initializatin
integer, public, parameter :: undefined_int = -9999 ! undefined integer for variable initialization
real(kind=kind_noahmp), public, parameter :: undefined_real = -9999.0 ! undefined real for variable initializatin
integer, public, parameter :: undefined_int_neg = -9999 ! undefined integer negative for variable initialization
real(kind=kind_noahmp), public, parameter :: undefined_real_neg = -9999.0 ! undefined real negative for variable initializatin

end module Machine