setenv C ~abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one foreach f ( Makefile Make.csh ) echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -bw Makefile /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one 19c19 < include ../config/$(ARCH)_$(TYPE) --- > #include ../config/$(ARCH)_$(TYPE) 21c21 < #include intelsse-nc-btrmas_one --- > include intelsse-nc-btrmas_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -bw Make.csh /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one 26c26 < #setenv ARCH intelsse-nc-btrmas --- > setenv ARCH intelsse-nc-btrmas 28c28 < setenv ARCH intel-pgi-relo-nc-btrmas --- > #setenv ARCH intel-pgi-relo-nc-btrmas end foreach f ( *.h *.c ) echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw dimensions.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw dimensions_relo.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_xc_mp.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_xc_sm.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_za_mp1.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_za_mp.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_za_sm.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_za_zt.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw stmt_fns.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw unit_offset.h /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw machi_c.c /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one end foreach f ( *.f *.F ) echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw barotp_dry_and_nodry.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/barotp_dry_and_nodry.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw bigrid.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/bigrid.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw forfun.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/forfun.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw inigiss.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/inigiss.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw inikpp.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/inikpp.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw inimy.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/inimy.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw matinv.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/matinv.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw poflat.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/poflat.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw prtmsk.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/prtmsk.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw psmoo.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/psmoo.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw restart.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/restart.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw sgefs.f /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/sgefs.f end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw asselin.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/asselin.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw barotp.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/barotp.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw blkdat.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/blkdat.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw cnuity.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/cnuity.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw convec.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/convec.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw diapfl.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/diapfl.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw dpthuv.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/dpthuv.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw dpudpv.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/dpudpv.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw geopar.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/geopar.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw hybgen.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/hybgen.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw hycom_cice.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/hycom_cice.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw hycom.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/hycom.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw icloan.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/icloan.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw inicon.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/inicon.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw isnan.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/isnan.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw latbdt_river.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/latbdt_river.F 27c27 < logical lfatal,lfatalp,rarwave,debitf --- > logical lfatal,lfatalp,rarwave, boundary_mpi,debitf 31c31 < real crs,fin,fatal,xf,xfder,dtime,q --- > real crs,fin,fatal,xf,xfder,dtime 80a81 > boundary_mpi = .true. 84c85 < urivr = uoff+19 --- > urivr = 1000+19 96c97 < open(unit=uoff+99,file=trim(flnminp)//'rivers.input') --- > open(unit=uoff+99,file=trim(flnminp)//'rivers.list') 112c113 < c --- Read rivers.input --- > c --- Read the rivers.list 494a496 > if (boundary_mpi) then 497a500,508 > else > if (i.ge.i0+1-nbdy.and.i.le.i0+ii+nbdy) then > do k = max(1-nbdy,j-j0), min(jj+nbdy,j-j0+lnport(l)-1) > pline(k+j0) = depths(i-i0,k) > rspedw(k+j0,ll1) = onetai(i-i0,k) > xline(k+j0) = scuy(i-i0,k) !!Alex > enddo > endif > endif 528a540 > if (boundary_mpi) then 532a545,554 > else > if (i.ge.i0+1-nbdy.and.i.le.i0+ii+nbdy) then > do k = max(1-nbdy,j-j0), min(jj+nbdy,j-j0+lnport(l)-1) > pline(k+j0) = depths(i-i0,k) > rspede(k+j0,ll1) = onetai(i-i0,k) > xline(k+j0) = scuy(i+1-i0,k) !!Alex > !!Alex xline(k+j0) = scuy(i-i0,k) > enddo > endif > endif 563a586 > if (boundary_mpi) then 567a591,600 > else > if (j.ge.j0+1-nbdy.and.j.le.j0+jj+nbdy) then > do k = max(1-nbdy,i-i0), min(ii+nbdy,i-i0+lnport(l)-1) > pline(k+i0) = depths(k,j-j0) > rspedn(k+i0,ll1) = onetai(k,j-j0) > xline(k+i0) = scvx(k,j+1-j0) !!Alex > !!Alex xline(k+i0) = scvx(k,j-j0) > enddo > endif > endif 598a632 > if (boundary_mpi) then 601a636,644 > else > if (j.ge.j0+1-nbdy.and.j.le.j0+jj+nbdy) then > do k = max(1-nbdy,i-i0), min(ii+nbdy,i-i0+lnport(l)-1) > pline(k+i0) = depths(k,j-j0) > rspeds(k+i0,ll1) = onetai(k,j-j0) > xline(k+i0) = scvx(k,j-j0) !!Alex > enddo > endif > endif 740,741c783 < open(unit=urivr, < & file=trim(flnminp)//'/rivers/'//trim(nameriver(l))//'.r') --- > open(unit=urivr,file=trim(nameriver(l))//'.r') 747,750c789 < c --- ignore all header lines, above one starting with "---" < if (cline(1:3).eq.'---') then !last header line < j=1 < endif --- > if (cline(1:3).eq.'---') j=1 759,760d797 < c --- model day, transport (m^3/s), T (degC), S (psu) < c --- set T < -9 for no change in temperature from the river 773c810 < exit !do loop --- > goto 200 781a819 > 200 continue 785,786c823,824 < q = (dtime-xtime2(l))/(xtime1(l)-xtime2(l)) < xdeb = ( xdeb2(l) + q*(xdeb1(l)-xdeb2(l)) )*xpport(l) --- > xdeb = ( xdeb2(l)+( dtime-xtime2(l)) *(xdeb1(l)-xdeb2(l))/ > & (xtime1(l)-xtime2(l)) )* xpport(l) 792,793c830,834 < xtemp = xtemp2(l) + q*(xtemp1(l)-xtemp2(l)) < xsaln = xsaln2(l) + q*(xsaln1(l)-xsaln2(l)) --- > xtemp = xtemp2(l) + (dtime-xtime2(l))*(xtemp1(l)-xtemp2(l)) > & /(xtime1(l)-xtime2(l)) > > xsaln = xsaln2(l) + (dtime-xtime2(l))*(xsaln1(l)-xsaln2(l)) > & /(xtime1(l)-xtime2(l)) 800a842,843 > ! pline(j) = xtemp > if (xtemp.gt.-99.9) then 801a845,848 > else ! no temp data for river > if (kdport(l).eq.4) pline(j) = temp(i ,j,1,n) > if (kdport(l).eq.3) pline(j) = temp(i-1,j,1,n) > endif 806a854,855 > ! pline(j) = xsaln > if (xsaln.gt.-99.9) then 807a857,860 > else ! no saln data for river > if (kdport(l).eq.4) pline(j) = saln(i ,j,1,n) > if (kdport(l).eq.3) pline(j) = saln(i-1,j,1,n) > endif 818a872,873 > ! pline(i) = xtemp > if (xtemp.gt.-99.9) then 819a875,878 > else ! no temp data for river > if (kdport(l).eq.1) pline(i) = temp(i,j-1,1,n) > if (kdport(l).eq.2) pline(i) = temp(i,j ,1,n) > endif 824a884,885 > ! pline(i) = xsaln > if (xsaln.gt.-99.9) then 825a887,890 > else ! no saln data for river > if (kdport(l).eq.1) pline(i) = saln(i,j-1,1,n) > if (kdport(l).eq.2) pline(i) = saln(i,j ,1,n) > endif 840a906 > if (boundary_mpi) then 846a913,932 > else > if (i.ge.i0+1-margin.and.i.le.i0+ii+margin) then > do k=max(1 -margin,j-j0), > & min(jj+margin,j-j0+lnport(l)-1) > pline(k+j0) = pbavg(i-i0,k,n) > enddo > endif > if (i.ge.i0-margin.and.i+1.le.i0+ii+margin) then > do k=max(1 -margin,j-j0), > & min(jj+margin,j-j0+lnport(l)-1) > uline(k+j0,1) = ubavg(i+1-i0,k,n) > enddo > endif > if (i+1.ge.i0-margin.and.i+2.le.i0+ii+margin) then > do k=max(1 -margin,j-j0), > & min(jj+margin,j-j0+lnport(l)-1) > uline(k+j0,2) = ubavg(i+2-i0,k,n) > enddo > endif > endif ! boundary_mpi 903a990 > if (boundary_mpi) then 907a995,1002 > else > if (i.ge.i0+1-margin.and.i.le.i0+ii+margin) then > do k=max(1-margin,j-j0),min(jj+margin,j-j0+lnport(l)-1) > pbsavu(i-i0,k ) = pline(k+j0) > ubavg (i-i0,k,n) = uline(k+j0,1) > enddo > endif > endif ! boundary_mpi 915a1011 > if (boundary_mpi) then 921a1018,1032 > else > if (i.ge.i0+1-margin.and.i.le.i0+ii+margin) then > do k = max(1 -margin,j-j0), > & min(jj+margin,j-j0+lnport(l)-1) > pline(k+j0) = pbavg(i-i0,k,n) > uline(k+j0,1) = ubavg(i-i0,k,n) > enddo > endif > if (i.ge.i0+2-margin.and.i-1.le.i0+ii+margin) then > do k = max(1 -margin,j-j0), > & min(jj+margin,j-j0+lnport(l)-1) > uline(k+j0,2) = ubavg(i-1-i0,k,n) > enddo > endif > endif ! boundary_mpi 979a1091 > if (boundary_mpi) then 983a1096,1104 > else > if (i.ge.i0-margin.and.i+1.le.i0+ii+margin) then > do k=max(1 -margin,j-j0), > & min(jj+margin,j-j0+lnport(l)-1) > pbsavu(i+1-i0,k ) = pline(k+j0) > ubavg (i+1-i0,k,n) = uline(k+j0,1) > enddo > endif > endif ! boundary_mpi 990a1112 > if (boundary_mpi) then 996a1119,1133 > else > if (j.ge.j0+1-margin.and.j.le.j0+jj+margin) then > do k = max(1 -margin,i-i0), > & min(ii+margin,i-i0+lnport(l)-1) > pline(k+i0) = pbavg(k,j-j0,n) > uline(k+i0,1) = vbavg(k,j-j0,n) > enddo > endif > if (j.ge.j0+2-margin.and.j-1.le.j0+jj+margin) then > do k = max(1 -margin,i-i0), > & min(ii+margin,i-i0+lnport(l)-1) > uline(k+i0,2) = vbavg(k,j-1-j0,n) > enddo > endif > endif ! boundary_mpi 1053a1191 > if (boundary_mpi) then 1057a1196,1204 > else > if (j.ge.j0-margin.and.j+1.le.j0+jj+margin) then > do k=max(1 -margin,i-i0), > & min(ii+margin,i-i0+lnport(l)-1) > pbsavv(k,j+1-j0 ) = pline(k+i0) > vbavg (k,j+1-j0,n) = uline(k+i0,1) > enddo > endif > endif ! boundary_mpi 1063a1211 > if (boundary_mpi) then 1069a1218,1237 > else > if (j.ge.j0+1-margin.and.j.le.j0+jj+margin) then > do k = max(1 -margin,i-i0), > & min(ii+margin,i-i0+lnport(l)-1) > pline(k+i0) = pbavg(k,j-j0,n) > enddo > endif > if (j.ge.j0-margin.and.j+1.le.j0+jj+margin) then > do k = max(1 -margin,i-i0), > & min(ii+margin,i-i0+lnport(l)-1) > uline(k+i0,1) = vbavg(k,j+1-j0,n) > enddo > endif > if (j+1.ge.j0-margin.and.j+2.le.j0+jj+margin) then > do k = max(1 -margin,i-i0), > & min(ii+margin,i-i0+lnport(l)-1) > uline(k+i0,2) = vbavg(k,j+2-j0,n) > enddo > endif > endif ! boundary_mpi 1128a1297 > if (boundary_mpi) then 1132a1302,1310 > else > if (j.ge.j0+1-margin.and.j.le.j0+jj+margin) then > do k=max(1 -margin,i-i0), > & min(ii+margin,i-i0+lnport(l)-1) > pbsavv(k,j-j0 ) = pline(k+i0) > vbavg (k,j-j0,n) = uline(k+i0,1) > enddo > endif > endif ! boundary_mpi end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw latbdy.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/latbdy.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw machine.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/machine.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_archiv.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_archiv.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_cb_arrays.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_cb_arrays.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_dimensions.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_dimensions.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_floats.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_floats.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_hycom.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_hycom.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_incupd.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_incupd.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_mean.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_mean.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_momtum.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_momtum.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_nc.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_nc.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_OICPL.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_OICPL.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_pipe.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_pipe.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_stokes.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_stokes.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_tides.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_tides.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_tsadvc.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_tsadvc.F 71c71 < & scal,scali,dt2,fldr) --- > & scal,scali,dt2,aux1) 81c81 < & intent(in),optional :: fldr --- > & intent(in),optional :: aux1 181c181 < call advem_fct2c( fld,fldc,u,v,fco,fcn,scal,scali,dt2,fldr) !!Alex river --- > call advem_fct2c( fld,fldc,u,v,fco,fcn,scal,scali,dt2,aux1) !!Alex river 1001c1001 < subroutine advem_fct2c(fld,fldc,u,v,fco,fcn, scal,scali,dt2,fldr) --- > subroutine advem_fct2c(fld,fldc,u,v,fco,fcn, scal,scali,dt2,aux1) 1010c1010 < & intent(in),optional :: fldr --- > & intent(in),optional :: aux1 1026c1026 < c fldr - value of the advected field at a river boundary (optional) --- > c aux1 - value of the advected field at a river boundary (optional) 1171,1175c1171 < if (fldr(i,j).gt.-9.0) then < flx(i,j) = fldr( i,j)*uloc(i,j) < else < flx(i,j) = fldlo(i,j)*uloc(i,j) < endif --- > flx(i,j) = aux1(i,j)*uloc(i,j) 1190,1194c1186 < if (fldr(i,j).gt.-9.0) then < flx(i,j) = fldr( i, j)*uloc(i,j) < else < flx(i,j) = fldlo(i-1,j)*uloc(i,j) < endif --- > flx(i,j) = aux1(i,j)*uloc(i,j) 1204c1196 < ! write(lp,*) 'tsadvt2 = ',fldr(i,j) --- > ! write(lp,*) 'tsadvt2 = ',aux1(i,j) 1247,1251c1239 < if (fldr(i,j).gt.-9.0) then < fly(i,j) = fldr(i,j)*vloc(i,j) < else < fly(i,j) = fld( i,j)*vloc(i,j) < endif --- > fly(i,j) = aux1(i,j)*vloc(i,j) 1266,1270c1254 < if (fldr(i,j).gt.-9.0) then < fly(i,j) = fldr(i,j )*vloc(i,j) < else < fly(i,j) = fld( i,j-1)*vloc(i,j) < endif --- > fly(i,j) = aux1(i,j)*vloc(i,j) 2118,2124c2102,2103 < if (iuopn(i,j).eq.2) then < if (triver(i,j).lt.-9.0) then < util5(i,j) = -99.9 < else < util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase < endif < endif --- > if (iuopn(i,j).eq.2) > & util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase 2128,2134c2107,2108 < if (iuopn(i,j).eq.2) then < if (triver(i,j).lt.-9.0) then < util5(i,j) = -99.9 < else < util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase < endif < endif --- > if (iuopn(i,j).eq.2) > & util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase 2142,2148c2116,2117 < if (ivopn(i,j).eq.2) then < if (triver(i,j).lt.-9.0) then < util5(i,j) = -99.9 < else < util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase < endif < endif --- > if (ivopn(i,j).eq.2) > & util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase 2152,2158c2121,2122 < if (ivopn(i,j).eq.2) then < if (triver(i,j).lt.-9.0) then < util5(i,j) = -99.9 < else < util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase < endif < endif --- > if (ivopn(i,j).eq.2) > & util5(i,j) = sig(triver(i,j),sriver(i,j))-thbase 2188c2152 < & triver) --- > & triver( 1-nbdy,1-nbdy)) 2195c2159 < & sriver) --- > & sriver( 1-nbdy,1-nbdy)) 2225c2189 < & sriver) --- > & sriver( 1-nbdy,1-nbdy)) 2255c2219 < & sriver) --- > & sriver( 1-nbdy,1-nbdy)) 2272c2236 < & sriver) --- > & sriver( 1-nbdy,1-nbdy)) 2949d2912 < c> May 2016 - added rivrtr for rivers as ports end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_xc.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_xc.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mod_za.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mod_za.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mxkprf.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mxkprf.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mxkrt.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mxkrt.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mxkrtm.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mxkrtm.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw mxpwp.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/mxpwp.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw overtn.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/overtn.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw thermf.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/thermf.F 28d27 < real q 92,97c91,93 < q = onem* delt1*salflx(i,j)/(saln(i,j,1,n)*qthref) < pbavg(i,j,n) = pbavg(i,j,n)-q < if (delt1.ne.baclin) then < c --- Robert-Asselin time filter correction < pbavg(i,j,m) = pbavg(i,j,m)-q*0.5*ra2fac < endif --- > pbavg(i,j,n) = pbavg(i,j,n)- > & onem* delt1*salflx(i,j)/ > & (saln(i,j,1,n)*qthref) 99,100c95,97 < q = onem*0.5*delt1*salflx(i,j)/(saln(i,j,1,n)*qthref) < pbavg(i,j,n) = pbavg(i,j,n)-q --- > pbavg(i,j,n) = pbavg(i,j,n)- > & onem*0.5*delt1*salflx(i,j)/ > & (saln(i,j,1,n)*qthref) 127,132c124,126 < ! q = onem* delt1*salflx(i,j)/(saln(i,j,1,n)*qthref) < ! pbavg(i,j,n) = pbavg(i,j,n)-q < ! if (delt1.ne.baclin) then < !c --- Robert-Asselin time filter correction < ! pbavg(i,j,m) = pbavg(i,j,m)-q*0.5*ra2fac < ! endif --- > ! pbavg(i,j,n) = pbavg(i,j,n)- > ! & onem* delt1*salflx(i,j)/ > ! & (saln(i,j,1,n)*qthref) 134,135c128,130 < ! q = onem*0.5*delt1*salflx(i,j)/(saln(i,j,1,n)*qthref) < ! pbavg(i,j,n) = pbavg(i,j,n)-q --- > ! pbavg(i,j,n) = pbavg(i,j,n)- > ! & onem*0.5*delt1*salflx(i,j)/ > ! & (saln(i,j,1,n)*qthref) 1842d1836 < c> Jul. 2016 - add Asselin correction to epmass calculation end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw trcupd.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/trcupd.F end echo ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** ***** diff -ibw wtime.F /u/home/abozec/hycom/BOXR0.10/src_2.2.99masswet_Alan_relo_one/wtime.F end