Skip to content

Commit 6a7fc64

Browse files
dangerbabydangerbaby
committed
increased NN param to allow longer arrays
1 parent 2631ad7 commit 6a7fc64

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ config_*
1919
./junk/*
2020
./do_not_git
2121
./do_not_git/*
22+
cshore_m
2223
do_not_git
2324
junk

‎src-repo/CSHORE_USACE.f‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
c lzhu added a new parameter NFR
9898
C NFR=maximum number of frequency beams for JONSWAP spectrum
9999

100-
PARAMETER (NN=5000, NB=30000, NL=100,NURM=1408,NSPECTRUM=5000)
100+
PARAMETER (NN=20000, NB=30000, NL=100,NURM=1408,NSPECTRUM=5000)
101101
REAL YVAL
102102
CHARACTER FINMIN*100, VER*70, BASENAME*90 !bdj
103103
DIMENSION DUMVEC(NN),QTIDE(NB),SMDEDY(NB)
@@ -1383,7 +1383,7 @@ SUBROUTINE OPENER(BASENAME)
13831383
SUBROUTINE INPUT(VER)
13841384
C
13851385
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
1386-
PARAMETER (NN=5000, NB=30000, NL=100,NSPECTRUM=5000)
1386+
PARAMETER (NN=20000, NB=30000, NL=100,NSPECTRUM=5000)
13871387
CHARACTER COMMEN*70, VER*70 !bdj
13881388
DIMENSION TWAVE(NB),TPIN(NB),HRMSIN(NB),WANGIN(NB),TSURG(NB),
13891389
+ SWLIN(NB),TWIND(NB),WIND10(NB),WINDAN(NB),TSLAND(NB),
@@ -2243,7 +2243,7 @@ SUBROUTINE INPUT(VER)
22432243
SUBROUTINE BOTTOM
22442244
C
22452245
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
2246-
PARAMETER (NN=5000, NB=30000, NL=100)
2246+
PARAMETER (NN=20000, NB=30000, NL=100)
22472247
DIMENSION SLOPE(NN), PSLOPE(NN), ZBRAW(NN), ZPRAW(NN)
22482248
C
22492249
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
@@ -2527,7 +2527,7 @@ SUBROUTINE BOTTOM
25272527
SUBROUTINE PARAM
25282528
C
25292529
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
2530-
PARAMETER (NN=5000,NL=100)
2530+
PARAMETER (NN=20000,NL=100)
25312531
C
25322532
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
25332533
+ ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
@@ -2626,7 +2626,7 @@ SUBROUTINE PARAM
26262626
SUBROUTINE LWAVE(J, L, WD, QDISP)
26272627
C
26282628
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
2629-
PARAMETER (NN=5000, NL=100)
2629+
PARAMETER (NN=20000, NL=100)
26302630
C
26312631
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
26322632
+ ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
@@ -2846,7 +2846,7 @@ FUNCTION ERFCC(X)
28462846
SUBROUTINE DVEG(J, L, WHRMS, D)
28472847
C
28482848
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
2849-
PARAMETER (NN=5000,NL=100,NFR=500,NNZ=50,NSPECTRUM=5000)
2849+
PARAMETER (NN=20000,NL=100,NFR=500,NNZ=50,NSPECTRUM=5000)
28502850
C NFR=maximum number of frequency beams for JONSWAP spectrum
28512851

28522852
DIMENSION FREQ(NFR),WNUM(NFR),EJONSPEC(NFR),SDSCZ(NFR)
@@ -3052,7 +3052,7 @@ SUBROUTINE DVEG(J, L, WHRMS, D)
30523052
SUBROUTINE DBREAK(J, L, WHRMS, D)
30533053
C
30543054
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
3055-
PARAMETER (NN=5000,NL=100)
3055+
PARAMETER (NN=20000,NL=100)
30563056
C
30573057
COMMON /PERIOD/ TP, WKPO, ANGLE, WT(NN),FREQMIN,FREQMAX,FREQNUM
30583058
COMMON /CONSTA/ GRAV, SQR2, SQR8, PI, TWOPI, SQRG1, SQRG2
@@ -3130,7 +3130,7 @@ SUBROUTINE DBREAK(J, L, WHRMS, D)
31303130
SUBROUTINE OUTPUT(ITIME,L,ITEQO,ICONV)
31313131
C
31323132
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
3133-
PARAMETER (NN=5000, NB=30000,NL=100)
3133+
PARAMETER (NN=20000, NB=30000,NL=100)
31343134
DIMENSION DUMVEC(NN),EDEPTH(NN)
31353135
C
31363136
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
@@ -3833,7 +3833,7 @@ SUBROUTINE OUTPUT(ITIME,L,ITEQO,ICONV)
38333833
SUBROUTINE POFLOW(J, L, PKHSIG, DEDX)
38343834
C
38353835
IMPLICIT DOUBLE PRECISION(A-H,O-Z)
3836-
PARAMETER(NN=5000, NL=100)
3836+
PARAMETER(NN=20000, NL=100)
38373837
C
38383838
COMMON /PERIOD/ TP,WKPO,ANGLE,WT(NN),FREQMIN,FREQMAX,FREQNUM
38393839
COMMON /CONSTA/ GRAV,SQR2,SQR8,PI,TWOPI,SQRG1,SQRG2
@@ -3881,7 +3881,7 @@ SUBROUTINE POFLOW(J, L, PKHSIG, DEDX)
38813881
SUBROUTINE QORATE(ITIME,L,ITEQO,ICONV,ICALL)
38823882
C
38833883
IMPLICIT DOUBLE PRECISION(A-H,O-Z)
3884-
PARAMETER (NN=5000, NB=30000,NL=100)
3884+
PARAMETER (NN=20000, NB=30000,NL=100)
38853885
C
38863886
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
38873887
+ ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
@@ -4194,7 +4194,7 @@ SUBROUTINE QORATE(ITIME,L,ITEQO,ICONV,ICALL)
41944194
SUBROUTINE SEDTRA(L)
41954195
C
41964196
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
4197-
PARAMETER (NN=5000,NB=30000,NL=100)
4197+
PARAMETER (NN=20000,NB=30000,NL=100)
41984198
DIMENSION QRAW(NN),GSLRAW(NN),ASLRAW(NN),ASLOPE(NN),RS(NN),RB(NN),
41994199
+ PBWD(NN),PSWD(NN),VSWD(NN),QSXWD(NN),QBXWD(NN),QRAWD(NN),
42004200
+ HDIP(NN),QSYWD(NN),QBYWD(NN)
@@ -4855,7 +4855,7 @@ SUBROUTINE SEDTRA(L)
48554855
SUBROUTINE CHANGE(ITIME,L,IEND,ICALL)
48564856
C
48574857
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
4858-
PARAMETER (NN=5000, NB=30000,NL=100)
4858+
PARAMETER (NN=20000, NB=30000,NL=100)
48594859
DIMENSION DZBDT(NN),CB(NN),R(NN),DELZBRW(NN),DELZBJ(NN),VDUM(NN),
48604860
+ V(NL),VDY(NL),AVY(NL),ADZX(NL)
48614861
C
@@ -5119,7 +5119,7 @@ SUBROUTINE CHANGE(ITIME,L,IEND,ICALL)
51195119
C #13##################### SUBROUTINE INTGRL ##########################
51205120
SUBROUTINE INTGRL(NUM,DEL,F,G)
51215121
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
5122-
PARAMETER (NN=5000)
5122+
PARAMETER (NN=20000)
51235123
DIMENSION F(NN)
51245124
C
51255125
C NUM can be even or odd integer
@@ -5147,7 +5147,7 @@ SUBROUTINE INTGRL(NUM,DEL,F,G)
51475147
C where NPFS = (2NPT+1) = number of points for smoothing
51485148
SUBROUTINE SMOOTH(NUM,RAW,F)
51495149
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
5150-
PARAMETER (NN=5000)
5150+
PARAMETER (NN=20000)
51515151
DIMENSION RAW(NN),F(NN)
51525152
COMMON /COMPAR/ HWDMIN,NPT,NPE
51535153
C
@@ -5179,7 +5179,7 @@ SUBROUTINE SMOOTH(NUM,RAW,F)
51795179
C where values of F at nodes J=1 to (J1-1) are computed
51805180
SUBROUTINE EXTRAPO(J1,J2,F)
51815181
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
5182-
PARAMETER (NN=5000)
5182+
PARAMETER (NN=20000)
51835183
DIMENSION F(NN)
51845184
COMMON /COMPAR/ HWDMIN,NPT,NPE
51855185
C
@@ -5208,7 +5208,7 @@ SUBROUTINE EXTRAPO(J1,J2,F)
52085208
SUBROUTINE WETDRY(ITIME,L,ITEQO)
52095209
C
52105210
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
5211-
PARAMETER (NN=5000,NB=30000,NL=100)
5211+
PARAMETER (NN=20000,NB=30000,NL=100)
52125212
DIMENSION G(NN), DG(NN), ETA(NN),ETAP(NN)
52135213
C
52145214
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
@@ -5828,7 +5828,7 @@ FUNCTION GDWD(R,X)
58285828
SUBROUTINE TRANWD(F1,JR,F2,JS,JE)
58295829
C
58305830
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
5831-
PARAMETER(NN=5000)
5831+
PARAMETER(NN=20000)
58325832
DIMENSION F1(NN),F2(NN)
58335833
C
58345834
IF(JR.GE.JS) THEN
@@ -5917,7 +5917,7 @@ SUBROUTINE TSINTP(N1,T1,W1,N2,T2,W2)
59175917
SUBROUTINE PONDED(L)
59185918
C
59195919
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
5920-
PARAMETER (NN=5000,NL=100)
5920+
PARAMETER (NN=20000,NL=100)
59215921
C
59225922
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
59235923
+ ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
@@ -6031,7 +6031,7 @@ SUBROUTINE PONDED(L)
60316031
SUBROUTINE WTRANS(ITIME,L)
60326032
C
60336033
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
6034-
PARAMETER (NN=5000,NB=30000,NL=100)
6034+
PARAMETER (NN=20000,NB=30000,NL=100)
60356035
C
60366036
COMMON/OPTION/TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
60376037
+ ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
@@ -6152,7 +6152,7 @@ SUBROUTINE WTRANS(ITIME,L)
61526152
SUBROUTINE EROSON(ITIME,L,IEND)
61536153
C
61546154
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
6155-
PARAMETER (NN=5000,NB=30000,NL=100)
6155+
PARAMETER (NN=20000,NB=30000,NL=100)
61566156
DIMENSION GRS1(NN,NL),GRS2(NN,NL),GRS3(NN,NL),GRS4(NN,NL),
61576157
+ GRS5(NN,NL),FBA3(NN,NL),DFSWD(NN),BSF(NN),DUMVEC(NN)
61586158
C
@@ -6357,7 +6357,7 @@ FUNCTION GFDWD(R)
63576357
SUBROUTINE SRFSP(L)
63586358
C
63596359
IMPLICIT DOUBLE PRECISION(A-H,O-Z)
6360-
PARAMETER(NN=5000, NL=100)
6360+
PARAMETER(NN=20000, NL=100)
63616361
C
63626362
COMMON /PERIOD/ TP,WKPO,ANGLE,WT(NN),FREQMIN,FREQMAX,FREQNUM
63636363
COMMON /BPROFL/ DXD2,DXDX,DX2,DX,XB(NN),ZB(NN,NL),FB2(NN,NL),
@@ -6641,7 +6641,7 @@ SUBROUTINE DISPERSION(DEPTH, PERIOD, WKZ)
66416641
SUBROUTINE PHASEAVEFV(J,L,WHRMS,D,STREAMSTRESSSTA, FVCWLWT)
66426642
c
66436643
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
6644-
PARAMETER (NN=5000,NL=100,NFR=500,NNZ=50)
6644+
PARAMETER (NN=20000,NL=100,NFR=500,NNZ=50)
66456645
C NFR=maximum number of frequency beams for JONSWAP spectrum
66466646

66476647
COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,

‎src-repo/CSHORE_USACE_LINUX.out‎

0 Bytes
Binary file not shown.

‎src-repo/cshore_usace_win.out‎

0 Bytes
Binary file not shown.

‎usace_distribute_bundle/bin/CSHORE_USACE_LINUX.out‎

0 Bytes
Binary file not shown.

‎usace_distribute_bundle/bin/cshore_usace_win.out‎

0 Bytes
Binary file not shown.

‎usace_distribute_bundle/example_application/run_model.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
if isunix
8585
clean
86-
!../bin/CSHORE_USACE_LINUX.out >scr.txt
86+
!../bin/CSHORE_USACE_LINUX.out
8787
else
8888
!..\bin\cshore_usace_win.out
8989
end

0 commit comments

Comments
 (0)