Flex veg

.gitignore

@@ -4,6 +4,7 @@ data*txt
 *.log
 #*.out
 *.dat
+*.tar
 *.cmd
 *.ele
 *.face

src-repo/CSHORE_USACE_VegFeature.f → src-repo/old_code_archive/CSHORE_USACE-ver2014-2019-12-18-12-50.f

@@ -144,7 +144,7 @@
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      + ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     + IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     + IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PERIOD/ TP,WKPO,ANGLE,WT(NN),FREQMIN,FREQMAX,FREQNUM
       COMMON /SEAWAV/ TIMEBC(NB),TPBC(NB),HRMSBC(NB),WSETBC(NB),
      + SWLBC(NB),WANGBC(NB),NWAVE,NSURG,NWIND,NTIME,FREQMINBC(NB),
@@ -217,7 +217,9 @@
 C     
 C     Store the first line of this CSHORE program on ODOC output file
 C     ------------------------------------------------------------------
-      VER = 'CSHORE USACE version, 2014 last edit 2016-01-14' !bdj 
+      VER = 'CSHORE USACE version, 2014 last edit 2019-02-08 ' !bdj
+C      VER = 'CSHORE USACE version, 2014 last edit 2018-08-28 ' !bdj 
+C      VER = 'CSHORE USACE version, 2014 last edit 2016-01-14' !bdj 
 C      VER = 'CSHORE USACE version, 2014 last edit 2015-07-06' !bdj 
 C      VER = 'CSHORE USACE version, last edit 2015-03-23   ' !bdj
 C      VER = 'CSHORE USACE version 2014, merged on 2015-03-12  ' !bdj
@@ -1389,7 +1391,7 @@ SUBROUTINE INPUT(VER)
      +     FREQMININ(NB),FREQMAXIN(NB),FREQNUMIN(NB)
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +  ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +  IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +  IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PERIOD/ TP, WKPO,ANGLE,WT(NN),FREQMIN,FREQMAX,FREQNUM
       COMMON /SEAWAV/ TIMEBC(NB),TPBC(NB),HRMSBC(NB),WSETBC(NB),
      +  SWLBC(NB),WANGBC(NB),NWAVE,NSURG,NWIND,NTIME,FREQMINBC(NB),
@@ -1472,6 +1474,7 @@ SUBROUTINE INPUT(VER)
 C     
 C     IPROFL=0 for fixed bottom profile(no input for ISEDAV=0)
 C     IPROFL=1 for profile evolution computation(input ISEDAV)
+C     IPROFL=1.1 for IPROFL=1 and no initial bottom smoothing
 C     IPROFL=2 for dike erosion computation (ISEDAV=0)
 C     ISEDAV=0 for unlimited bottom sediment
 C     ISEDAV=1 for sediment availability limited by hard bottom
@@ -1480,7 +1483,14 @@ SUBROUTINE INPUT(VER)
 C     
 C     READ(11,1110) IPROFL
       READ(11,*) DUM      !bdj
-      IPROFL = NINT(DUM)  !bdj
+c     bdj 2018-08-28 to input ismooth
+      tmp = nint(10.*(dum-nint(dum)))
+      ismooth=1
+      if(tmp.eq.1) then
+         ismooth=0
+      endif
+c     end bdj 2018-08-28 to input ismooth
+      IPROFL = NINT(DUM)   !bdj
       IF(IPROFL.EQ.0.OR.IPROFL.EQ.2) IQYDY=0
       ISEDAV=0
 C     IF(IPROFL.EQ.1) READ(11,1110) ISEDAV
@@ -1800,7 +1810,7 @@ SUBROUTINE INPUT(VER)
              READ(11,*) TIMEBC(I+1),TPBC(I),HRMSBC(I),WSETBC(I), !lzhu
      +                  SWLBC(I),WANGBC(I),FREQMINBC(I),FREQMAXBC(I), !lzhu
      +                  FREQNUMBC(I)
-          ELSEIF (IIVEG.EQ.3.AND.DISS.EQ.3) THEN
+          ELSEIF (IVEG.EQ.3.AND.IDISS.EQ.3) THEN
              READ(11,*) TIMEBC(I+1),TPBC(I),HRMSBC(I),WSETBC(I), !lzhu
      +                  SWLBC(I),WANGBC(I),FREQMINBC(I),FREQMAXBC(I),
      +                  NMEASSPEC
@@ -2238,7 +2248,7 @@ SUBROUTINE BOTTOM
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      + ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     + IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     + IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /SEAWAV/ TIMEBC(NB),TPBC(NB),HRMSBC(NB),WSETBC(NB),
      + SWLBC(NB),WANGBC(NB),NWAVE,NSURG,NWIND,NTIME,FREQMINBC(NB),
      + FREQMAXBC(NB),FREQNUMBC(NB)
@@ -2442,6 +2452,9 @@ SUBROUTINE BOTTOM
       IF(IPERM.EQ.1.OR.ISEDAV.GE.1) CALL SMOOTH(JMAXL,ZPRAW,PSLOPE)
       DO 149 J=1,JMAX(L)
         ZB(J,L)=SLOPE(J)
+c bdj 2018-08-28  added to defeat the bottom smoothing for EMRRP model
+        if(ismooth.eq.0)        ZB(J,L)=ZBRAW(J)
+c end bdj 2018-08-28  added to defeat the bottom smoothing for EMRRP model
         IF(IPROFL.GE.1) ZB0(J,L)=ZB(J,L)
         IF(IPERM.EQ.1.OR.ISEDAV.GE.1) ZP(J,L)=PSLOPE(J)
         IF(ICLAY.EQ.1) ZP0(J,L)=ZP(J,L)
@@ -2518,7 +2531,7 @@ SUBROUTINE PARAM
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PERIOD/ TP, WKPO, ANGLE, WT(NN),FREQMIN,FREQMAX,FREQNUM
       COMMON /CONSTA/ GRAV, SQR2, SQR8, PI, TWOPI, SQRG1, SQRG2
       COMMON /SEDINP/ WF,SG,SPORO1,WFSGM1,GSGM1,TANPHI,BSLOP1,BSLOP2,
@@ -2617,7 +2630,7 @@ SUBROUTINE LWAVE(J, L, WD, QDISP)
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PERIOD/ TP, WKPO, ANGLE, WT(NN),FREQMIN,FREQMAX,FREQNUM
       COMMON /BINPUT/ XBINP(NN,NL), ZBINP(NN,NL), FBINP(NN,NL),XS(NL),
      +   YLINE(NL),DYLINE(NL),AGLINE(NL),NBINP(NL)
@@ -2751,7 +2764,7 @@ SUBROUTINE GBXAGF(CTHETA,USIGT,STHETA,VSIGT,GBX,GF)
       PARAMETER(NL=100)
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /CONSTA/ GRAV,SQR2, SQR8, PI, TWOPI,SQRG1, SQRG2
 C     
 C     For obliquelly incident waves, use approximate equations
@@ -2848,7 +2861,7 @@ SUBROUTINE DVEG(J, L, WHRMS, D)
       COMMON /VEGDISS/ DVEGSTA(NN)
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +  ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +  IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +  IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /MEASUREDSPEC/ VMEASOMEG(NSPECTRUM), 
      + VMEASSE(NSPECTRUM), VMEASWNUM(NSPECTRUM), NMEASSPEC
 
@@ -3122,7 +3135,7 @@ SUBROUTINE OUTPUT(ITIME,L,ITEQO,ICONV)
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +  ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +  IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +  IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PERIOD/ TP, WKPO, ANGLE, WT(NN),FREQMIN,FREQMAX,FREQNUM
       COMMON /SEAWAV/ TIMEBC(NB), TPBC(NB), HRMSBC(NB),
      +  WSETBC(NB), SWLBC(NB), WANGBC(NB), NWAVE, NSURG,
@@ -3871,7 +3884,7 @@ SUBROUTINE QORATE(ITIME,L,ITEQO,ICONV,ICALL)
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /SEAWAV/ TIMEBC(NB),TPBC(NB),HRMSBC(NB),WSETBC(NB),
      +   SWLBC(NB),WANGBC(NB),NWAVE,NSURG,NWIND,NTIME,FREQMINBC(NB),
      +   FREQMAXBC(NB),FREQNUMBC(NB)
@@ -4187,7 +4200,7 @@ SUBROUTINE SEDTRA(L)
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PERIOD/ TP,WKPO,ANGLE,WT(NN),FREQMIN,FREQMAX,FREQNUM
       COMMON /PREDIC/ HRMS(NN), SIGMA(NN), H(NN), WSETUP(NN), SIGSTA(NN)
       COMMON /BPROFL/ DXD2,DXDX,DX2,DX,XB(NN),ZB(NN,NL),FB2(NN,NL),
@@ -4842,12 +4855,12 @@ SUBROUTINE CHANGE(ITIME,L,IEND,ICALL)
 C     
       IMPLICIT DOUBLE PRECISION (A-H,O-Z)
       PARAMETER (NN=5000, NB=30000,NL=100)
-      DIMENSION DZBDT(NN),CB(NN),R(NN),DELZBRW(NN),DELZBJ(NN),V(NL),
-     +   VDY(NL),AVY(NL),ADZX(NL)
+      DIMENSION DZBDT(NN),CB(NN),R(NN),DELZBRW(NN),DELZBJ(NN),VDUM(NN),
+     +   V(NL),VDY(NL),AVY(NL),ADZX(NL)
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /SEAWAV/ TIMEBC(NB),TPBC(NB),HRMSBC(NB),WSETBC(NB),
      +   SWLBC(NB),WANGBC(NB),NWAVE,NSURG,NWIND,NTIME,FREQMINBC(NB),
      +   FREQMAXBC(NB),FREQNUMBC(NB)
@@ -5045,7 +5058,11 @@ SUBROUTINE CHANGE(ITIME,L,IEND,ICALL)
         DZX(J,LL)=DELZBJ(J)
  211  CONTINUE
  200  CONTINUE
-      CALL SMOOTH(ILINE,AVY,V)
+c     bdj added on 2019-02-07
+      CALL SMOOTH(ILINE,RESHAPE(AVY,SHAPE(DZBDT),pad=[0.D0]),VDUM)
+      V = VDUM(1:size(AVY))
+c     CALL SMOOTH(ILINE,AVY,V)
+c     end bdj added on 2019-02-07
       ILINE1=ILINE-1
       DO 220 LL=1, ILINE1
         VDY(LL)=(V(LL+1)-V(LL))/DYLINE(LL)
@@ -5195,7 +5212,7 @@ SUBROUTINE WETDRY(ITIME,L,ITEQO)
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PREDIC/ HRMS(NN),SIGMA(NN),H(NN),WSETUP(NN),SIGSTA(NN)
       COMMON /SEAWAV/ TIMEBC(NB),TPBC(NB),HRMSBC(NB),WSETBC(NB),
      +   SWLBC(NB),WANGBC(NB),NWAVE,NSURG,NWIND,NTIME,FREQMINBC(NB),
@@ -5902,7 +5919,7 @@ SUBROUTINE PONDED(L)
 C     
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /BPROFL/ DXD2,DXDX,DX2,DX,XB(NN),ZB(NN,NL),FB2(NN,NL),
      +   SWLDEP(NN,NL),BSLOPE(NN,NL),JMAX(NL),JSWL(NL)
       COMMON /PROCOM/ DELT,DELZB(NN,NL)
@@ -6016,7 +6033,7 @@ SUBROUTINE WTRANS(ITIME,L)
 C     
       COMMON/OPTION/TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON/PREDIC/HRMS(NN),SIGMA(NN),H(NN),WSETUP(NN),SIGSTA(NN)
       COMMON/BPROFL/DXD2,DXDX,DX2,DX,XB(NN),ZB(NN,NL),FB2(NN,NL),
      +   SWLDEP(NN,NL),BSLOPE(NN,NL),JMAX(NL),JSWL(NL)
@@ -6139,7 +6156,7 @@ SUBROUTINE EROSON(ITIME,L,IEND)
 C     
       COMMON/OPTION/TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +   ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +   IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +   IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /SEAWAV/ TIMEBC(NB),TPBC(NB),HRMSBC(NB),WSETBC(NB),
      +   SWLBC(NB),WANGBC(NB),NWAVE,NSURG,NWIND,NTIME,FREQMINBC(NB),
      +   FREQMAXBC(NB),FREQNUMBC(NB)
@@ -6627,7 +6644,7 @@ SUBROUTINE PHASEAVEFV(J,L,WHRMS,D,STREAMSTRESSSTA, FVCWLWT)
 
       COMMON /OPTION/ TIME,IPROFL,IANGLE,IROLL,IWIND,IPERM,IOVER,IWCINT,
      +  ISEDAV,IWTRAN,IVWALL(NL),ILAB,INFILT,IPOND,ITIDE,ILINE,IQYDY,
-     +  IVEG,ICLAY,IDISS,IFV,IWEIBULL
+     +  IVEG,ICLAY,ISMOOTH,IDISS,IFV,IWEIBULL
       COMMON /PERIOD/ TP, WKPO, ANGLE, WT(NN),FREQMIN,FREQMAX,FREQNUM
       COMMON /CONSTA/ GRAV, SQR2, SRQ8,PI,TWOPI,SQRG1,SQRG2
       COMMON /LINEAR/ WKP,CP(NN),WN(NN),WKPSIN,STHETA(NN),CTHETA(NN),