Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions src/science/gw_hydro/cable_gw_hydro.F90
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ SUBROUTINE soil_snow_gw(dels, soil, ssnow, canopy, met, bal, veg)
END IF

!> 7. MMY???
IF( (.NOT.cable_user%cable_runtime_coupled ) .AND. (first_gw_hydro_call)) THEN
IF( (cable_user%soilsnow_init_spec ) .AND. (first_gw_hydro_call)) THEN

IF (cable_runtime%um) canopy%dgdtg = 0.0 ! RML added um condition

Expand Down Expand Up @@ -1081,7 +1081,7 @@ SUBROUTINE soil_snow_gw(dels, soil, ssnow, canopy, met, bal, veg)
soil%zse_vec(i,k) + gammzz_snow(i,k)
END DO
END DO
ENDIF ! if(.NOT.cable_runtime_coupled) and first_gw_hydro_call
ENDIF ! IF( (cable_user%soilsnow_init_spec ) ) and first_gw_hydro_call

!> wbliq_old is used for hysteresis
ssnow%wbliq_old = ssnow%wbliq
Expand Down
8 changes: 4 additions & 4 deletions src/science/soilsnow/cbl_soilsnow_init_special.F90
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SUBROUTINE spec_init_soil_snow(dels, soil, ssnow, canopy, met, bal, veg,heat_cap

ktau = ktau +1

IF( .NOT.cable_user%cable_runtime_coupled ) THEN
IF( (cable_user%soilsnow_init_spec ) ) THEN

IF( ktau_gl <= 1 ) THEN
IF (cable_runtime%um) canopy%dgdtg = 0.0 ! RML added um condition
Expand Down Expand Up @@ -76,7 +76,7 @@ SUBROUTINE spec_init_soil_snow(dels, soil, ssnow, canopy, met, bal, veg,heat_cap
& + (ssnow%wb(:,1) - ssnow%wbice(:,1) ) * Ccswat * Cdensity_liq &
& + ssnow%wbice(:,1) * Ccsice * Cdensity_ice, xx ) * soil%zse(1)
END IF
ENDIF ! if(.NOT.cable_runtime_coupled)
ENDIF ! if(.NOT.soilsnow_init_spec )

IF (ktau <= 1) THEN
xx=heat_cap_lower_limit(:,1)
Expand Down Expand Up @@ -131,7 +131,7 @@ SUBROUTINE spec_init_snowcheck(dels, ssnow, soil, met )
!H!ssnow%smass(j,3) = 0.0
!H!ssnow%ssdn(j,:) = ssnow%ssdnn(j)

IF( .NOT.cable_user%CABLE_RUNTIME_COUPLED ) THEN
IF( (cable_user%soilsnow_init_spec ) ) THEN
IF( soil%isoilm(j) == 9 .AND. ktau_gl <= 2 ) &
! permanent ice: fixed hard-wired number in next version
ssnow%ssdnn(j) = 700.0
Expand All @@ -144,7 +144,7 @@ SUBROUTINE spec_init_snowcheck(dels, ssnow, soil, met )
!H!ssnow%tggsn(j,:) = MIN( CTFRZ, ssnow%tgg(j,1) )
!H!ssnow%ssdn(j,2) = ssnow%ssdn(j,1)
!H!ssnow%ssdn(j,3) = ssnow%ssdn(j,1)
IF( .NOT. cable_user%cable_runtime_coupled) THEN
IF( (cable_user%soilsnow_init_spec ) ) THEN
IF( soil%isoilm(j) == 9 .AND. ktau_gl <= 2 ) THEN
! permanent ice: fix hard-wired number in next version
ssnow%ssdn(j,1) = 450.0
Expand Down
2 changes: 1 addition & 1 deletion src/science/soilsnow/cbl_soilsnow_main.F90
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ SUBROUTINE soil_snow(dels, soil, ssnow, canopy, met, bal, veg)

ssnow%wbliq = ssnow%wb - ssnow%wbice

!%cable_runtime_coupled special initalizations in um_init NA for ESM1.5
! soilsnow_init_spec, special initalizations in um_init NA for ESM1.5

xx=soil%css * soil%rhosoil
IF (ktau <= 1) &
Expand Down
2 changes: 1 addition & 1 deletion src/util/cable_runtime_opts_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ MODULE cable_runtime_opts_mod
consistency_check = .FALSE., & !
casa_dump_read = .FALSE., & !
casa_dump_write = .FALSE., & !
cable_runtime_coupled = .TRUE. , & !
soilsnow_init_spec = .FALSE., & !
LogWorker = .TRUE. , & ! Write Output of each worker
! L.Stevens - Test Switches
l_new_roughness_soil = .FALSE., & !
Expand Down