Skip to content

Jytang/lake #19

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

Open
jinyun1tang wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Jytang/lake #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af1eece
update calendar calculation
jinyuntang Oct 30, 2023
c6b4a5d
added fixed-depth lake option
jinyuntang Oct 31, 2023
c96265c
turn off unnessary output to screen
jinyuntang Nov 1, 2023
cd7234d
bug fix for lake model after rebase
Aug 5, 2024
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
128 changes: 128 additions & 0 deletions examples/dryland_maize/CheckOutput.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/dryland_maize/mesite
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
41.2 899.0 10.0 0
41.2 899.0 10.0 0 0
2.1E+05 7.8E+05 370.0 1.8 0.3 0.005
31 0 0 3 50.0 50.0 0.0
0.0 0.0 0.1 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.1 0.0
Expand Down
2 changes: 1 addition & 1 deletion examples/lake/vasite
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
38.4 129.0 16.3 0
38.4 129.0 16.3 0 0
2.1E+05 7.8E+05 275.0 1.8 0.3 0.002
35 0 0 1 50.0 50.0 0.0
0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
Expand Down
6 changes: 3 additions & 3 deletions examples/sample_run/st022852
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
69.1 130.0 -8.0 1.0
210000.0 780000.0 282.9 1.8 0.3 0.005
62 0 0 1 3 100.0 0.0
69.1 130.0 -8.0 1.0 0
210000.0 780000.0 326.0 1.8 0.3 0.005
0 0 0 1 3 100.0 0.0
0.0 1.0 1.0 0.0 0.0 0.0 0.0 0.0 0.0 1.0 1.0 0.0 0.0
1.0
1.0
Expand Down
4 changes: 0 additions & 4 deletions f77src/ecosys_core/BLOCKDATA001.f
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion f77src/ecosys_core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ configure_file(filec.h filec.h COPYONLY)
configure_file(files.h files.h COPYONLY)
configure_file(parameters.h parameters.h COPYONLY)
set(ECOSYS_SOURCES
BLOCKDATA001.f
bkinit.f
day.f
endrun.f
erosion.f
Expand Down
5 changes: 5 additions & 0 deletions f77src/ecosys_core/bkinit.f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
subroutine bkinit
include "blk17.h"

ICOR=(/1,-1,0,0,1,1,2,3,3,4,4,5/)
END subroutine bkinit
1 change: 1 addition & 0 deletions f77src/ecosys_core/blkc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@
2,NPR,NPS,JOUT,IOUT,KOUT,IOLD,ILAST,IRUN,IBEGIN,ISTART,IEND
3,ISOIL(4,JZ,JY,JX),LYRX,LYRC,LSG(JZ,JY,JX),NP(JY,JX)
4,NP0(JY,JX),IFLGI(JP,JY,JX),IFLGC(JP,JY,JX),IETYP(JY,JX)
5,iLAKE(JY,JX)

9 changes: 6 additions & 3 deletions f77src/ecosys_core/readi.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,21 @@ SUBROUTINE readi(NA,ND,NT,NE,NAX,NDX,NTX,NEX,NF,NFX,NTZ
C :=2 means allowing freeze-thaw plus SOC accumulation to change elevation
C :=3 means allowing freeze-thaw plus SOC accumulation, plus erosion to change elevation
C :=-1 means no change in elevation.
READ(1,*)(datav(jj),jj=1,4)
READ(1,*)(datav(jj),jj=1,5)
ALATG=datav(1)
ALTIG=datav(2)
ATCAG=datav(3)
IDTBLG=int(datav(4))
C READ(1,*)ALATG,ALTIG,ATCAG,IDTBLG
iLAKEG=int(datav(5))
C READ(1,*)ALATG,ALTIG,ATCAG,IDTBLG,iLAKEG
READ(1,*)OXYEG,Z2GEG,CO2EIG,CH4EG,Z2OEG,ZNH3EG
READ(1,*)IETYPG,ISALTG,IERSNG,NCNG,DTBLIG,DTBLDIG,DTBLGG
READ(1,*)RCHQNG,RCHQEG,RCHQSG,RCHQWG,RCHGNUG,RCHGEUG,RCHGSUG
2,RCHGWUG,RCHGNTG,RCHGETG,RCHGSTG,RCHGWTG,RCHGDG
READ(1,*)(DHI(NX),NX=1,NHE)
READ(1,*)(DVI(NY),NY=1,NVS)
CLOSE(1)

DO 9895 NX=NHW,NHE
DO 9890 NY=NVN,NVS
ALAT(NY,NX)=ALATG
Expand All @@ -93,7 +95,8 @@ SUBROUTINE readi(NA,ND,NT,NE,NAX,NDX,NTX,NEX,NF,NFX,NTZ
Z2OE(NY,NX)=Z2OEG
ZNH3E(NY,NX)=ZNH3EG
IETYP(NY,NX)=IETYPG
NCN(NY,NX)=NCNG
NCN(NY,NX)=max(NCNG,1)
iLAKE(NY,NX)=iLAKEG
DTBLI(NY,NX)=DTBLIG
DTBLDI(NY,NX)=DTBLDIG
DTBLG(NY,NX)=DTBLGG
Expand Down
1 change: 1 addition & 0 deletions f77src/ecosys_core/reads.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ SUBROUTINE reads(NA,ND,NT,NE,NAX,NDX,NTX,NEX,NF,NFX,NTZ
DCNOR(N)=DCNOR(N-1)
26 CONTINUE
READ(4,*)NPX,NPY,JOUT,IOUT,KOUT,ICLM

C
C INCREMENTS IN START AND END DATES FOR SUCCESSIVE SCENARIOS
C FROM LOOPS FOR SCENES, SCENARIOS IN RUNSCRIPT SET IN MAIN.F
Expand Down
43 changes: 38 additions & 5 deletions f77src/ecosys_core/redist.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2663,6 +2663,9 @@ SUBROUTINE redist(I,J,NHW,NHE,NVN,NVS)
TFLWX(N3,N2,N1)=TFLWX(N3,N2,N1)+FLWX(N,N3,N2,N1)-FLWXNU(N5,N4)
TFLWH(N3,N2,N1)=TFLWH(N3,N2,N1)+FLWH(N,N3,N2,N1)-FLWHNU(N5,N4)
THFLW(N3,N2,N1)=THFLW(N3,N2,N1)+HFLW(N,N3,N2,N1)-HFLWNU(N5,N4)
C if(n3==1)then
C write(*,*)'n3u',HFLW(N,N3,N2,N1),HFLWNU(N5,N4)
C endif
ELSE
TFLW(N3,N2,N1)=TFLW(N3,N2,N1)+FLW(N,N3,N2,N1)-FLW(N,N6,N5,N4)
TFLWX(N3,N2,N1)=TFLWX(N3,N2,N1)+FLWX(N,N3,N2,N1)
Expand All @@ -2671,7 +2674,13 @@ SUBROUTINE redist(I,J,NHW,NHE,NVN,NVS)
2-FLWH(N,N6,N5,N4)
THFLW(N3,N2,N1)=THFLW(N3,N2,N1)+HFLW(N,N3,N2,N1)
2-HFLW(N,N6,N5,N4)
C if(N3==2)then
C write(*,*)'TKSFLW',HFLW(N,N3,N2,N1)
C 2,HFLW(N,N6,N5,N4),N3,N6
C endif
ENDIF
C write(*,*)TFLW(N3,N2,N1),FLW(N,N3,N2,N1),FLWNU(N5,N4)
C 2,FLW(N,N6,N5,N4)
C IF(N1.EQ.1.AND.N3.EQ.1)THEN
C WRITE(*,6632)'TFLW',I,J,N,N1,N2,N3,N4,N5,N6,NU(N2,N1)
C 2,TFLW(N3,N2,N1),FLW(N,N3,N2,N1),FLW(N,N6,N5,N4),FLWNU(N5,N4)
Expand Down Expand Up @@ -3456,8 +3465,11 @@ SUBROUTINE redist(I,J,NHW,NHE,NVN,NVS)
IF(VHCP(NUM(NY,NX),NY,NX).GT.ZEROS(NY,NX))THEN
TKS(NUM(NY,NX),NY,NX)=(ENGY+HFLWS)
2/VHCP(NUM(NY,NX),NY,NX)

if(abs(TKS(NUM(NY,NX),NY,NX)/tksx-1.)>0.025)then
if(TKS(NUM(NY,NX),NY,NX)/=TKS(NUM(NY,NX),NY,NX))then
write(*,*)ENGY,HFLWS,VHCP(NUM(NY,NX),NY,NX)
pause
endif
if(abs(TKS(NUM(NY,NX),NY,NX)/tksx-1.)>0.25)then
TKS(NUM(NY,NX),NY,NX)=TKSX
endif
ELSE
Expand Down Expand Up @@ -4413,6 +4425,9 @@ SUBROUTINE redist(I,J,NHW,NHE,NVN,NVS)
TVOLI=0.0
TVOLIH=0.0
TENGY=0.0
C write(*,*)'NU=',NU(NY,NX),NL(NY,NX),NUM(NY,NX),NUI(NY,NX)
C write(*,*)TFLW(NU(NY,NX),NY,NX),iLAKE(NY,NX)
C if(NU(NY,NX)/=1)pause
DO 125 L=NU(NY,NX),NL(NY,NX)
C
C WATER, ICE, HEAT, TEMPERATURE
Expand All @@ -4421,8 +4436,14 @@ SUBROUTINE redist(I,J,NHW,NHE,NVN,NVS)
VHCPX=VHCP(L,NY,NX)
VOLWXX=VOLW(L,NY,NX)
VOLIXX=VOLI(L,NY,NX)
VOLW0=VOLW(L,NY,NX)
if(iLAKE(NY,NX).EQ.1)then
VOLW(L,NY,NX)=VOLW(L,NY,NX)+TFLW(L,NY,NX)+FINH(L,NY,NX)
2+TTHAW(L,NY,NX)+FLU(L,NY,NX)
else
VOLW(L,NY,NX)=VOLW(L,NY,NX)+TFLW(L,NY,NX)+FINH(L,NY,NX)
2+TTHAW(L,NY,NX)+TUPWTR(L,NY,NX)+FLU(L,NY,NX)
endif
C if(VOLW(L,NY,NX)<0. .and. L==NU(NY,NX))then
C write(*,*)VOLWXX,VOLW(L,NY,NX),TFLW(L,NY,NX),FINH(L,NY,NX)
C 2,TTHAW(L,NY,NX),TUPWTR(L,NY,NX),FLU(L,NY,NX)
Expand Down Expand Up @@ -4478,14 +4499,26 @@ SUBROUTINE redist(I,J,NHW,NHE,NVN,NVS)
IF(VHCP(L,NY,NX).GT.ZEROS(NY,NX))THEN
TKS(L,NY,NX)=(ENGY+THFLW(L,NY,NX)+THTHAW(L,NY,NX)
2+TUPHT(L,NY,NX)+HWFLU(L,NY,NX))/VHCP(L,NY,NX)
if(L==1.and.abs(TKS(L,NY,NX)/TKS10-1.)>0.025)then

IF(TKS(L,NY,NX)/=TKS(L,NY,NX)
2.or.TKS(L,NY,NX)>400.)then
write(*,*)ENGY,THFLW(L,NY,NX),THTHAW(L,NY,NX)
2,TUPHT(L,NY,NX),HWFLU(L,NY,NX)
endif
if(L==1.and.abs(TKS(L,NY,NX)/TKS10-1.)>0.25)then
TKS(L,NY,NX)=TKS10
endif
ELSE
TKS(L,NY,NX)=TKS(NUM(NY,NX),NY,NX)
ENDIF

C if(L==2)then
C write(*,*)'watawTKS',TKS(L-1,NY,NX),TKS(L,NY,NX)
C 2,THFLW(L,NY,NX),THTHAW(L,NY,NX)
C 3,TUPHT(L,NY,NX),HWFLU(L,NY,NX)
C endif
TCS(L,NY,NX)=TKS(L,NY,NX)-273.15
C if(L.eq.1)write(*,*)TCS(L,NY,NX)
if(TCS(L,NY,NX)/=TCS(L,NY,NX))PAUSE
TSMX(L,NY,NX)=AMAX1(TSMX(L,NY,NX),TCS(L,NY,NX))
TSMN(L,NY,NX)=AMIN1(TSMN(L,NY,NX),TCS(L,NY,NX))
UN2GS(NY,NX)=UN2GS(NY,NX)+XN2GS(L,NY,NX)
Expand Down Expand Up @@ -5669,7 +5702,7 @@ SUBROUTINE redist(I,J,NHW,NHE,NVN,NVS)
C
C SOIL SUBSIDENCE
C
IF(IERSNG.GE.0)THEN
IF(IERSNG.GE.0.and.iLAKE(NY,NX).eq.0)THEN
IF(BKDS(NU(NY,NX),NY,NX).LE.ZERO)THEN
ICHKLX=0
ELSE
Expand Down
Loading