forked from NCAR/ccpp-physics
-
Notifications
You must be signed in to change notification settings - Fork 35
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.
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
Updates to radiation, cloud, and land processes for improved surface temperature and radiative flux biases #244
Open
rhaesung
wants to merge
3
commits into
ufs-community:ufs/dev
Choose a base branch
from
rhaesung:hr5
base: ufs/dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+33
−8
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2511,7 +2511,19 @@ subroutine thermoprop (parameters,nsoil ,nsnow ,isnow ,ist ,dzsnso , | |
real (kind=kind_phys), dimension(-nsnow+1: 0) :: tksno !snow thermal conductivity (j/m3/k) | ||
real (kind=kind_phys), dimension( 1:nsoil) :: sice !soil ice content | ||
real (kind=kind_phys), parameter :: sbeta = -2.0 | ||
real (kind=kind_phys), dimension(4,20) :: soil_carbon ! soil carbon content [kg/m3] | ||
real (kind=kind_phys), parameter :: soil_carbon_df = 0.25 ! soil carbon therm cond (Lawrence and Slater) | ||
real (kind=kind_phys), parameter :: soil_carbon_hcpct = 2.5e6 ! soil carbon heat capacity (Lawrence and Slater) | ||
! -------------------------------------------------------------------------------------------------- | ||
! soil carbon [kg/m3] by vegetation type estimated from global PNNL soil carbon dataset | ||
! and VIIRS surface type | ||
|
||
soil_carbon(1,:) = (/90,65,90,65,90,40,50,50,40,50,90,60,60,60,0,20,0,90,90,60/) | ||
soil_carbon(2,:) = (/40,30,40,30,40,25,30,30,25,30,40,30,30,30,0,15,0,60,60,40/) | ||
soil_carbon(3,:) = (/20,15,20,15,20,15,20,15,15,15,25,20,20,20,0,10,0,40,40,30/) | ||
soil_carbon(4,:) = (/15,10,15,10,15,10,15,10,10,10,20,10,10,10,0,10,0,40,30,20/) | ||
|
||
soil_carbon = soil_carbon / 130.0 ! convert to soil carbon relative to peat | ||
|
||
! compute snow thermal conductivity and heat capacity | ||
|
||
|
@@ -2530,6 +2542,11 @@ subroutine thermoprop (parameters,nsoil ,nsnow ,isnow ,ist ,dzsnso , | |
hcpct(iz) = sh2o(iz)*cwat + (1.0-parameters%smcmax(iz))*parameters%csoil & | ||
+ (parameters%smcmax(iz)-smc(iz))*cpair + sice(iz)*cice | ||
call tdfcnd (parameters,iz,df(iz), smc(iz), sh2o(iz)) | ||
|
||
! adjust for soil carbon organic content | ||
|
||
! hcpct(iz) = (1.0 - soil_carbon(iz,vegtyp)) * hcpct(iz) + soil_carbon(iz,vegtyp) * soil_carbon_hcpct | ||
df(iz) = (1.0 - soil_carbon(iz,vegtyp)) * df(iz) + soil_carbon(iz,vegtyp) * soil_carbon_df | ||
end do | ||
|
||
if ( parameters%urban_flag ) then | ||
|
@@ -3003,6 +3020,10 @@ subroutine albedo (parameters,vegtyp ,ist ,ice ,nsoil , & !in | |
if (ib.eq.1) fsun = 0. | ||
end do | ||
|
||
! snow age | ||
|
||
call snow_age (parameters,dt,tg,sneqvo,sneqv,tauss,fage) | ||
|
||
if(cosz <= 0) goto 100 | ||
|
||
! weight reflectance/transmittance by lai and sai | ||
|
@@ -3015,10 +3036,6 @@ subroutine albedo (parameters,vegtyp ,ist ,ice ,nsoil , & !in | |
tau(ib) = max(parameters%taul(ib)*wl+parameters%taus(ib)*ws, mpe) | ||
end do | ||
|
||
! snow age | ||
|
||
call snow_age (parameters,dt,tg,sneqvo,sneqv,tauss,fage) | ||
|
||
! snow albedos: only if cosz > 0 and fsno > 0 | ||
|
||
if(opt_alb == 1) & | ||
|
@@ -9128,7 +9145,9 @@ subroutine groundwater(parameters,nsnow ,nsoil ,dt ,sice ,zsoil , & !in | |
|
||
! ka = hk(iwt) | ||
! harmonic average, c.he changed based on gy niu's update | ||
ka = 2.0*(hk(iwt)*parameters%dksat(iwt)*1.0e3) / (hk(iwt)+parameters%dksat(iwt)*1.0e3) | ||
! ka = 2.0*(hk(iwt)*parameters%dksat(iwt)*1.0e3) / (hk(iwt)+parameters%dksat(iwt)*1.0e3) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @HelinWei-NOAA is there a reason to keep the old code? |
||
! tried one suggesteed by gy niu | ||
ka = 0.5*(hk(iwt)+parameters%dksat(iwt)*1.0e3) | ||
|
||
wh_zwt = - zwt * 1.e3 !(mm) | ||
wh = smpfz - znode(iwt)*1.e3 !(mm) | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
while we're at it, can we get rid of the goto here? change this line to
if(cosz > 0) then
and change
100 continue
below toend if
I don't know how to propose the same in the glacier code, so I'll just add here.
Add
if(cosz > 0) then
above this line.Add
end if
below this line.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree to remove "goto".
Once the bug fix is set here, I will handle the fix in the Noah-MPv5.0 which has a different code structure.