-
Notifications
You must be signed in to change notification settings - Fork 322
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
Dynamic lakes - without tools changes #1109
Changes from 21 commits
b3e0824
eb45afd
91ac079
36b3f15
35c16af
587d8f9
63b2452
48cddcc
e9a2709
50bf197
079e5c4
5dd8925
27d982e
69a6553
7f8ef41
ddfba1e
83484a9
124c552
f9f87b6
e182341
5a64ed8
273b75e
9f8d2df
9976b45
e44c19d
2bfb8d7
e37d269
30394f8
4f9dcdc
2a8c23c
a672692
ffc879f
6ae44c3
82f39d7
5658dde
a9fa875
52105c4
de3e12c
acf0984
8088c3c
a31875d
3ab74de
8ff6ca3
2cb54b5
f2e2011
f6bf84a
d9b4972
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -117,6 +117,9 @@ module TemperatureType | |
real(r8), pointer :: fact_col (:,:) ! used in computing tridiagonal matrix | ||
real(r8), pointer :: c_h2osfc_col (:) ! heat capacity of surface water | ||
|
||
! lake heat | ||
real(r8), pointer :: lake_heat (:) ! total heat of lake water (J/m²) | ||
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.
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. |
||
|
||
contains | ||
|
||
procedure, public :: Init | ||
|
@@ -279,6 +282,7 @@ subroutine InitAllocate(this, bounds) | |
allocate(this%fact_col (begc:endc, -nlevsno+1:nlevgrnd)) ; this%fact_col (:,:) = nan | ||
allocate(this%c_h2osfc_col (begc:endc)) ; this%c_h2osfc_col (:) = nan | ||
|
||
allocate(this%lake_heat (begc:endc)) ; this%lake_heat (:) = nan | ||
end subroutine InitAllocate | ||
|
||
!------------------------------------------------------------------------ | ||
|
@@ -620,6 +624,11 @@ subroutine InitHistory(this, bounds, is_simple_buildtemp, is_prog_buildtemp ) | |
ptr_patch=this%t_veg10_night_patch, default='inactive') | ||
endif | ||
|
||
! add lake heat history field here | ||
this%lake_heat(begc:endc) = spval | ||
call hist_addfld1d (fname='LAKE_HEAT', units='J/m^2', & | ||
avgflag='A', long_name='Heat content of gridcell lake water', & | ||
ptr_col=this%lake_heat, default='active') | ||
|
||
end subroutine InitHistory | ||
|
||
|
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.
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.
You're right: we can safely remove those lines, and the temperature_inst%lake_heat.
I wrote those lines to perform a double check on lake heat, as calculated in the LakeTemperatureMod.F90. As it is now included in the AccumulateHeatLake routine in TotalWaterHeatMod.F90, I removed those comments (e44c19d).