Commit dc9c1e9f authored by ph290's avatar ph290
Browse files

editing to calculate all M2, S2, N2, O1, K1 todal components

parent 7f6c28a0
......@@ -357,7 +357,7 @@ END MODULE GRAPHICS_VARIABLES
integer :: run_year,start_year,iline
real :: real_clock
real :: woa_nutrient_tmp, woa_nutrient
real :: smaj1, smin1, smaj2, smin2, smaj3, smin3
real :: smaj1, smin1, smaj2, smin2, smaj3, smin3, smaj4, smin4, smaj5, smin5
character(len=6) :: met_time
character(len=30) :: filter
character (len=50) :: filein
......@@ -485,7 +485,8 @@ END MODULE GRAPHICS_VARIABLES
read(1,'(i1)') imode
do i = 1,iline
read(1,'(16x,6f6.1)') smaj1, smin1, smaj2, smin2, smaj3, smin3
read(1,'(16x,11f6.1)') smaj1, smin1, smaj2, smin2, smaj3, smin3, smaj4, smin4, smaj5, smin5
!Note, reading in 1st 6 constituents of teh tides, but only using the first 5
! write(6,'(16x,6f6.1)') smaj1, smin1, smaj2, smin2, smaj3, smin3
if(i.eq.iline) then
semi_major(1)=smaj1*1e-2
......@@ -494,12 +495,16 @@ END MODULE GRAPHICS_VARIABLES
semi_minor(2)=smin2*1e-2
semi_major(3)=smaj3*1e-2
semi_minor(3)=smin3*1e-2
semi_major(4)=smaj4*1e-2
semi_minor(4)=smin4*1e-2
semi_major(5)=smaj5*1e-2
semi_minor(5)=smin5*1e-2
endif
enddo
close (1)
do i=1,3
do i=1,5
polarisn(i)=semi_minor(i)/semi_major(i)
enddo
......@@ -876,7 +881,8 @@ real :: woa_nutrient_tmp, woa_nutrient
read(1,'(i1)') imode
do i = 2,iline+1
read(1,'(f8.3,f8.3,38x,f6.1)') lon,lat,alldepth
read(1,'(f8.3,f8.3,68x,f6.1)') lon,lat,alldepth
! read(1,'(f8.3,f8.3,38x,f6.1)') lon,lat,alldepth
!write(6,'(f8.3,f8.3,38x,f6.1)') lon,lat,alldepth
if(i.eq.iline+1) newdepth = alldepth
enddo
......@@ -886,10 +892,10 @@ close (1)
!newN=20; kb=0.003
!original values above - just changed to 10 to speed up for demonstartion
!purposes
newN=20; kb=0.003
newN=20; kb=0.0025
if(alldepth.lt.30) newN = 10
if(alldepth.lt.10) newN = 5
if(alldepth.lt.5) newN = 3
!set up equal depth intervals of 2m for sections:
if(imode.eq.2) then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment