Skip to content

Commit f255f6c

Browse files
jm-cjm-c
committed
Update storage after removing "surfaceforcingTice"
shift storage slot in big array "StoreDynvar2D" since slot #2 (previously used for surfaceforcingTice) was free. Also reduce by 1 total number of 2-D vars to store (reduce NDV2D from 23 to 22).
1 parent 9c9abe7 commit f255f6c

3 files changed

Lines changed: 65 additions & 65 deletions

File tree

‎pkg/autodiff/AUTODIFF.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
#ifdef ALLOW_AUTODIFF_WHTAPEIO
22
COMMON /AUTODIFF_WHTAPEIO_I/
33
& tapeFileCounter, tapeMaxCounter, tapeFileUnit, tapeFileUnitS
4-
integer tapeFileCounter, tapeMaxCounter
5-
integer tapeFileUnit, tapeFileUnitS(4)
6-
COMMON /AUTODIFF_WHTAPEIO_L/
4+
INTEGER tapeFileCounter, tapeMaxCounter
5+
INTEGER tapeFileUnit, tapeFileUnitS(4)
6+
COMMON /AUTODIFF_WHTAPEIO_L/
77
& tapeConcatIO, tapeSingleCpuIO, tapeBufferIO
88
logical tapeConcatIO, tapeSingleCpuIO, tapeBufferIO
99
#endif
1010

1111
c ad dump record number (used only if dumpAdByRec is true)
12-
integer dumpAdRecMn
13-
integer dumpAdRecDy
14-
integer dumpAdRecSi
15-
integer dumpAdRecEt
16-
COMMON /AUTODIFF_DUMP_AD_REC/
12+
INTEGER dumpAdRecMn
13+
INTEGER dumpAdRecDy
14+
INTEGER dumpAdRecSi
15+
INTEGER dumpAdRecEt
16+
COMMON /AUTODIFF_DUMP_AD_REC/
1717
& dumpAdRecMn, dumpAdRecDy, dumpAdRecSi,
1818
& dumpAdRecEt
1919

20-
integer ilev_1
21-
integer ilev_2
22-
integer ilev_3
23-
integer ilev_4
24-
integer max_lev2
25-
integer max_lev3
26-
integer max_lev4
27-
integer NDV3D, NDV2D, NEXF1, NEXF2, NCTRL1, NOB, NSI
20+
INTEGER ilev_1
21+
INTEGER ilev_2
22+
INTEGER ilev_3
23+
INTEGER ilev_4
24+
INTEGER max_lev2
25+
INTEGER max_lev3
26+
INTEGER max_lev4
27+
INTEGER NDV3D, NDV2D, NEXF1, NEXF2, NCTRL1, NOB, NSI
2828
#ifdef ALLOW_ADAMSBASHFORTH_3
2929
PARAMETER (NDV3D = 14)
3030
#else
3131
PARAMETER (NDV3D = 10)
3232
#endif
33-
PARAMETER (NDV2D = 23)
33+
PARAMETER (NDV2D = 22)
3434
PARAMETER (NEXF1 = 23)
3535
PARAMETER (NEXF2 = 24)
3636
PARAMETER (NCTRL1 = 20)
@@ -43,8 +43,8 @@ c ad dump record number (used only if dumpAdByRec is true)
4343
_RL StoreEXF1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,NEXF1)
4444
_RL StoreEXF2(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,NEXF2)
4545
_RL StoreCTRLS1(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,NCTRL1)
46-
_RL StoreOBCSN(1-Olx:sNx+Olx,Nr,nSx,nSy,NOB)
47-
_RL StoreOBCSS(1-Olx:sNx+Olx,Nr,nSx,nSy,NOB)
46+
_RL StoreOBCSN(1-OLx:sNx+OLx,Nr,nSx,nSy,NOB)
47+
_RL StoreOBCSS(1-OLx:sNx+OLx,Nr,nSx,nSy,NOB)
4848
_RL StoreOBCSE(1-OLy:sNy+OLy,Nr,nSx,nSy,NOB)
4949
_RL StoreOBCSW(1-OLy:sNy+OLy,Nr,nSx,nSy,NOB)
5050
_RL StoreSEAICE(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy,NSI)

‎pkg/autodiff/autodiff_restore.F‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -92,33 +92,33 @@ SUBROUTINE AUTODIFF_RESTORE( myThid )
9292
C- 2D arrays
9393
DO J=1-OLy,sNy+OLy
9494
DO I=1-OLx,sNx+OLx
95-
etaN(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,1)
96-
taux0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,3)
97-
taux1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,4)
98-
tauy0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,5)
99-
tauy1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,6)
100-
qnet0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,7)
101-
qnet1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,8)
102-
empmr0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,9)
103-
empmr1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,10)
104-
sst0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,11)
105-
sst1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,12)
106-
sss0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,13)
107-
sss1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,14)
108-
saltflux0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,15)
109-
saltflux1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,16)
95+
etaN(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,1)
96+
taux0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,2)
97+
taux1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,3)
98+
tauy0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,4)
99+
tauy1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,5)
100+
qnet0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,6)
101+
qnet1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,7)
102+
empmr0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,8)
103+
empmr1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,9)
104+
sst0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,10)
105+
sst1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,11)
106+
sss0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,12)
107+
sss1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,13)
108+
saltflux0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,14)
109+
saltflux1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,15)
110110
#ifdef SHORTWAVE_HEATING
111-
qsw0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,17)
112-
qsw1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,18)
111+
qsw0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,16)
112+
qsw1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,17)
113113
#endif
114114
#ifdef ATMOSPHERIC_LOADING
115-
pload0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,19)
116-
pload1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,20)
115+
pload0(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,18)
116+
pload1(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,19)
117117
#endif
118118
#ifdef EXACT_CONSERV
119-
etaH(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,21)
120-
dEtaHdt(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,22)
121-
PmEpR(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,23)
119+
etaH(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,20)
120+
dEtaHdt(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,21)
121+
PmEpR(I,J,bi,bj) = StoreDynVars2D(I,J,bi,bj,22)
122122
#endif
123123
ENDDO
124124
ENDDO

‎pkg/autodiff/autodiff_store.F‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -93,42 +93,42 @@ SUBROUTINE AUTODIFF_STORE( myThid )
9393
DO J=1-OLy,sNy+OLy
9494
DO I=1-OLx,sNx+OLx
9595
StoreDynVars2D(I,J,bi,bj,1) = etaN(I,J,bi,bj)
96-
StoreDynVars2D(I,J,bi,bj,3) = taux0(I,J,bi,bj)
97-
StoreDynVars2D(I,J,bi,bj,4) = taux1(I,J,bi,bj)
98-
StoreDynVars2D(I,J,bi,bj,5) = tauy0(I,J,bi,bj)
99-
StoreDynVars2D(I,J,bi,bj,6) = tauy1(I,J,bi,bj)
100-
StoreDynVars2D(I,J,bi,bj,7) = qnet0(I,J,bi,bj)
101-
StoreDynVars2D(I,J,bi,bj,8) = qnet1(I,J,bi,bj)
102-
StoreDynVars2D(I,J,bi,bj,9) = empmr0(I,J,bi,bj)
103-
StoreDynVars2D(I,J,bi,bj,10) = empmr1(I,J,bi,bj)
104-
StoreDynVars2D(I,J,bi,bj,11) = sst0(I,J,bi,bj)
105-
StoreDynVars2D(I,J,bi,bj,12) = sst1(I,J,bi,bj)
106-
StoreDynVars2D(I,J,bi,bj,13) = sss0(I,J,bi,bj)
107-
StoreDynVars2D(I,J,bi,bj,14) = sss1(I,J,bi,bj)
108-
StoreDynVars2D(I,J,bi,bj,15) = saltflux0(I,J,bi,bj)
109-
StoreDynVars2D(I,J,bi,bj,16) = saltflux1(I,J,bi,bj)
96+
StoreDynVars2D(I,J,bi,bj,2) = taux0(I,J,bi,bj)
97+
StoreDynVars2D(I,J,bi,bj,3) = taux1(I,J,bi,bj)
98+
StoreDynVars2D(I,J,bi,bj,4) = tauy0(I,J,bi,bj)
99+
StoreDynVars2D(I,J,bi,bj,5) = tauy1(I,J,bi,bj)
100+
StoreDynVars2D(I,J,bi,bj,6) = qnet0(I,J,bi,bj)
101+
StoreDynVars2D(I,J,bi,bj,7) = qnet1(I,J,bi,bj)
102+
StoreDynVars2D(I,J,bi,bj,8) = empmr0(I,J,bi,bj)
103+
StoreDynVars2D(I,J,bi,bj,9) = empmr1(I,J,bi,bj)
104+
StoreDynVars2D(I,J,bi,bj,10) = sst0(I,J,bi,bj)
105+
StoreDynVars2D(I,J,bi,bj,11) = sst1(I,J,bi,bj)
106+
StoreDynVars2D(I,J,bi,bj,12) = sss0(I,J,bi,bj)
107+
StoreDynVars2D(I,J,bi,bj,13) = sss1(I,J,bi,bj)
108+
StoreDynVars2D(I,J,bi,bj,14) = saltflux0(I,J,bi,bj)
109+
StoreDynVars2D(I,J,bi,bj,15) = saltflux1(I,J,bi,bj)
110110
#ifdef SHORTWAVE_HEATING
111-
StoreDynVars2D(I,J,bi,bj,17) = qsw0(I,J,bi,bj)
112-
StoreDynVars2D(I,J,bi,bj,18) = qsw1(I,J,bi,bj)
111+
StoreDynVars2D(I,J,bi,bj,16) = qsw0(I,J,bi,bj)
112+
StoreDynVars2D(I,J,bi,bj,17) = qsw1(I,J,bi,bj)
113113
#else
114+
StoreDynVars2D(I,J,bi,bj,16) = 0.
114115
StoreDynVars2D(I,J,bi,bj,17) = 0.
115-
StoreDynVars2D(I,J,bi,bj,18) = 0.
116116
#endif
117117
#ifdef ATMOSPHERIC_LOADING
118-
StoreDynVars2D(I,J,bi,bj,19) = pload0(I,J,bi,bj)
119-
StoreDynVars2D(I,J,bi,bj,20) = pload1(I,J,bi,bj)
118+
StoreDynVars2D(I,J,bi,bj,18) = pload0(I,J,bi,bj)
119+
StoreDynVars2D(I,J,bi,bj,19) = pload1(I,J,bi,bj)
120120
#else
121+
StoreDynVars2D(I,J,bi,bj,18) = 0.
121122
StoreDynVars2D(I,J,bi,bj,19) = 0.
122-
StoreDynVars2D(I,J,bi,bj,20) = 0.
123123
#endif
124124
#ifdef EXACT_CONSERV
125-
StoreDynVars2D(I,J,bi,bj,21) = etaH(I,J,bi,bj)
126-
StoreDynVars2D(I,J,bi,bj,22) = dEtaHdt(I,J,bi,bj)
127-
StoreDynVars2D(I,J,bi,bj,23) = PmEpR(I,J,bi,bj)
125+
StoreDynVars2D(I,J,bi,bj,20) = etaH(I,J,bi,bj)
126+
StoreDynVars2D(I,J,bi,bj,21) = dEtaHdt(I,J,bi,bj)
127+
StoreDynVars2D(I,J,bi,bj,22) = PmEpR(I,J,bi,bj)
128128
#else
129+
StoreDynVars2D(I,J,bi,bj,20) = 0.
129130
StoreDynVars2D(I,J,bi,bj,21) = 0.
130131
StoreDynVars2D(I,J,bi,bj,22) = 0.
131-
StoreDynVars2D(I,J,bi,bj,23) = 0.
132132
#endif
133133
ENDDO
134134
ENDDO

0 commit comments

Comments
 (0)