Skip to content
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

494 redux local ice fixes #527

Merged
merged 17 commits into from
Feb 25, 2025
Merged

494 redux local ice fixes #527

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8fe05fd
developments from AM3
JhanSrbinovsky Nov 27, 2024
e0c0617
rollback
JhanSrbinovsky Nov 27, 2024
6236198
remove reduntant file
JhanSrbinovsky Dec 13, 2024
5983ee9
how did this happen - droped a whole calc
JhanSrbinovsky Dec 27, 2024
319dc6a
run with @Whyborn's revised grid_info completes IF this error check is
JhanSrbinovsky Jan 12, 2025
0e84962
clobber ice point soil parameters
JhanSrbinovsky Jan 14, 2025
a3ba35b
developments from AM3
JhanSrbinovsky Nov 27, 2024
be834b8
rollback
JhanSrbinovsky Nov 27, 2024
4ecf853
Merge branch '494-merge-soilsnow-from-am3' into 494_redux_local
JhanSrbinovsky Jan 14, 2025
da2aef5
changes to accomodate new grid info
JhanSrbinovsky Jan 14, 2025
1e508a5
update commments
JhanSrbinovsky Jan 14, 2025
535a334
rollback to main version
JhanSrbinovsky Jan 16, 2025
a239290
rm legacy type casting
JhanSrbinovsky Jan 16, 2025
0720441
rm redundant file
JhanSrbinovsky Jan 17, 2025
3178b8b
this spec init should possibly go completely
JhanSrbinovsky Jan 21, 2025
31a233f
gammz initialization required
JhanSrbinovsky Jan 23, 2025
c71bee4
(#494) - Remove incorrect densities in water balance calc.
ccarouge Feb 13, 2025
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
77 changes: 0 additions & 77 deletions src/coupled/AM3/control/cable/util/init/cbl_um_init_veg.F90.manual
View file
Open in desktop

This file was deleted.

255 changes: 0 additions & 255 deletions src/params/cable_params_mod.F90
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions src/science/soilsnow/cbl_hyd_redistrib.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ MODULE hydraulic_redistribution_mod
SUBROUTINE hydraulic_redistribution(dels, soil, ssnow, canopy, veg, met)

USE cable_common_module, ONLY : wiltParam, satuParam
!data
USE cable_surface_types_mod, ONLY: evergreen_broadleaf, c4_grassland

IMPLICIT NONE
REAL, INTENT(IN) :: dels ! integration time step (s)
Expand Down Expand Up @@ -97,10 +99,9 @@ SUBROUTINE hydraulic_redistribution(dels, soil, ssnow, canopy, veg, met)
hr_perTime(:,k,j) = hr_perTime(:,k,j)/soil%zse(k)
hr_perTime(:,j,k) = hr_perTime(:,j,k)/soil%zse(j)

! Overwrite to give zero redistribution for all types except
! evergreen broadleaf (2) and c4 grass (7)
! NB: Hard-wired numbers should be removed in future version
WHERE( .NOT.(veg%iveg == 2 .OR. veg%iveg == 7 ) )
! Zero redistribution: all types except evergreen broadleaf, c4 grass
WHERE( .NOT. ( veg%iveg == evergreen_broadleaf .OR. &
veg%iveg == c4_grassland ) )
hr_perTime(:,k,j) = 0.0
hr_perTime(:,j,k) = 0.0
ENDWHERE
Expand Down Expand Up @@ -175,10 +176,9 @@ SUBROUTINE hydraulic_redistribution(dels, soil, ssnow, canopy, veg, met)
hr_perTime(:,k,j) = hr_perTime(:,k,j)/soil%zse(k)
hr_perTime(:,j,k) = hr_perTime(:,j,k)/soil%zse(j)

! Overwrite to give zero redistribution for all types except
! evergreen broadleaf (2) and c4 grass (7)
! NB: Hard-wired numbers should be removed in future version
WHERE( .NOT.( veg%iveg == 2 .OR. veg%iveg == 7 ) )
! Zero redistribution: all types except evergreen broadleaf, c4 grass
WHERE( .NOT. ( veg%iveg == evergreen_broadleaf .OR. &
veg%iveg == c4_grassland ) )
hr_perTime(:,k,j) = 0.0
hr_perTime(:,j,k) = 0.0
ENDWHERE
Expand Down
Loading
Loading