Skip to content

Commit

Permalink
Whitespace cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
billsacks committed Aug 23, 2020
1 parent 9f8d2df commit 9976b45
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
14 changes: 6 additions & 8 deletions src/biogeophys/TotalWaterAndHeatMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -881,9 +881,7 @@ subroutine ComputeHeatLake(bounds, num_lakec, filter_lakec, &
!
! Note: Changes to this routine - for anything involving liquid or ice - should
! generally be accompanied by similar changes to ComputeLiqIceMassLake



!
! !ARGUMENTS:
type(bounds_type) , intent(in) :: bounds
integer , intent(in) :: num_lakec
Expand Down Expand Up @@ -974,13 +972,14 @@ subroutine ComputeHeatLake(bounds, num_lakec, filter_lakec, &
end do
end do

do fc = 1, num_lakec
do fc = 1, num_lakec
c = filter_lakec(fc)
heat(c) = heat_dry_mass(c) + heat_ice(c) + heat_liquid(c) + latent_heat_liquid(c)
end do

! Lake water heat content
! Note that we do NOT accumulate heat_liquid and cv_liquid in this call. See the comments at the top of AccumulateHeatLake for rationale.
! Note that we do NOT accumulate heat_liquid and cv_liquid in this call. See the
! comments at the top of AccumulateHeatLake for rationale.
call AccumulateHeatLake(bounds, num_lakec, filter_lakec, temperature_inst, lakestate_inst, &
heat)

Expand Down Expand Up @@ -1079,8 +1078,8 @@ subroutine AccumulateHeatLake(bounds, num_c, filter_c, &
! calculate heat content of lake itself
do j = 1, nlevlak
do fc = 1, num_c
c = filter_c(fc)
! liquid heat
c = filter_c(fc)
! liquid heat
h2olak_liq = dz_lake(c,j) * denh2o * (1 - lake_icefrac(c,j))
call AccumulateLiquidWaterHeat( &
temp = t_lake(c,j), &
Expand Down Expand Up @@ -1265,7 +1264,6 @@ subroutine AccumulateLiquidWaterHeat(temp, h2o, &
latent_heat_liquid = latent_heat_liquid + h2o*hfus
end subroutine AccumulateLiquidWaterHeat


!-----------------------------------------------------------------------
pure function TempToHeat(temp, cv) result(heat)
!
Expand Down
6 changes: 2 additions & 4 deletions src/dyn_subgrid/dynConsBiogeophysMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -203,17 +203,15 @@ subroutine dyn_water_content_set_baselines(bounds, natveg_and_glc_filterc, &

! set baselines for lake columns

! Calculate the total water volume of the lake column
! Calculate the total water volume of the lake column
call AccumulateLiqIceMassLake(bounds, num_lakec, filter_lakec, lakestate_inst, &
liquid_mass = lake_liquid_mass_col(bounds%begc:bounds%endc), &
ice_mass = lake_ice_mass_col(bounds%begc:bounds%endc))

do fc = 1, num_lakec
c = filter_lakec(fc)

c = filter_lakec(fc)
dynbal_baseline_liq(c) = lake_liquid_mass_col(c)
dynbal_baseline_ice(c) = lake_ice_mass_col(c)

end do

end associate
Expand Down

0 comments on commit 9976b45

Please sign in to comment.