diff --git a/src/Makefile b/src/Makefile index 04865f2849c145d6cf106474c858042bc0ffbe29..cf0323c96d4c341f402a5e8c8339082a26951833 100644 --- a/src/Makefile +++ b/src/Makefile @@ -35,7 +35,7 @@ define_bcs/define_bc_pipo.o \ define_bcs/define_bc_riedel.o \ define_bcs/define_bc_ritske.o \ define_bcs/define_bc_ritske_isurf.o \ -define_bcs/define_bc_segmented_s-line.o \ +define_bcs/define_bc_segmented_s_line.o \ define_bcs/define_bc.sphere.o \ define_bcs/define_bc_sphere.o \ define_bcs/define_bc_subduction.o \ diff --git a/src/define_bc.f90 b/src/define_bc.f90 index 64713959f0898589c6db7eb650480559c788ee4a..d958b67109935c9b3f8d1e7a09ea223a0687061c 100644 --- a/src/define_bc.f90 +++ b/src/define_bc.f90 @@ -62,7 +62,7 @@ eps=1.d-10 osolve%kfix=0 osolve%kfixt=0 -if (bcdef%bctype='') then +if (bcdef%bctype=='') then bccase=params%infile else bccase=bcdef%bctype @@ -714,7 +714,7 @@ case('input.txt','input.small.txt','basic') if (abs(bcdef%utrans).gt.eps) then osolve%u(i)=osolve%u(i)+bcdef%utrans endif - if (abs(bcdef%vtrans.gt.eps) then + if (abs(bcdef%vtrans).gt.eps) then osolve%v(i)=osolve%v(i)+bcdef%vtrans endif enddo @@ -752,8 +752,8 @@ case ('input.ritske','ritske') case ('input.ritske_isurf','ritske_isurf') call define_bc_ritske_isurf (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo) -case ('input.segmented_s-line','segmented_s-line') - call define_bc_segmented_s-line (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo) +case ('input.segmented_s_line','segmented_s_line') + call define_bc_segmented_s_line (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo) case ('input.sphere','sphere') call define_bc_sphere (osolve%nnode,osolve%kfix,osolve%kfixt,osolve%x,osolve%y,osolve%z,osolve%u,osolve%v,osolve%w,osolve%temp,vo) @@ -790,4 +790,4 @@ if (params%debug==2) call output_bc (osolve) return end !------------------------------------------------------------------------------| -!------------------------------------------------------------------------------| \ No newline at end of file +!------------------------------------------------------------------------------| diff --git a/src/define_isostasy_bc.f90 b/src/define_isostasy_bc.f90 index d90665250a0dd0873f8f298de7dd74197e9fdb0f..f68d485e2c1e694a93d2e04e6df2038b139172f9 100644 --- a/src/define_isostasy_bc.f90 +++ b/src/define_isostasy_bc.f90 @@ -49,7 +49,7 @@ type (bc_definition) bcdef !------------------------------------------------------------------------------| integer i,j,iproc,nproc,ierr,nb,xdisp,ydisp,xnow,ynow -double precision eps,pi,zsl,dxy,zdisp,vinit,x1,x2 +double precision eps,pi,zsl,dxy,zdisp,vinit,x1,x2,uv,uvw,thetax,thetay double precision,dimension(:,:),allocatable :: zisoslx,zisosly !------------------------------------------------------------------------------| @@ -72,7 +72,7 @@ dxy=1./real(nb) ! ldisp(i)=l+bcdef%zisodisp(xdisp,ydisp) ! enddo !else - allocate(zisoslx(nb+1,nb+1)),zisosly(nb+1,nb+1)) + allocate(zisoslx(nb+1,nb+1),zisosly(nb+1,nb+1)) do j=1,nb+1 do i=1,nb+1 if (i==1) then @@ -107,7 +107,6 @@ dxy=1./real(nb) uvw=sqrt(osolve%u(i)**2.d0+osolve%v(i)**2.d0+osolve%w(i)**2.d0) thetax=atan(zisoslx(xnow,ynow)) thetay=atan(zisosly(xnow,ynow)) - newu= osolve%u(i)=osolve%u(i)+(1-cos(thetax)) osolve%v(i)=osolve%v(i)+(1-cos(thetay)) ! PLUS OR MINUS HERE??? @@ -140,7 +139,7 @@ dxy=1./real(nb) endif enddo deallocate(zisoslx,zisosly) -endif +!endif end !------------------------------------------------------------------------------| diff --git a/src/read_input_file.f90 b/src/read_input_file.f90 index 08a4a3c8b76fe9e87130ddd5c427dc621f863b34..a104d702236cf156e9a1822fa649c320204a1dcb 100644 --- a/src/read_input_file.f90 +++ b/src/read_input_file.f90 @@ -690,7 +690,7 @@ case('basic') call mpi_bcast(bcdef%wz0,1,mpi_double_precision,0,mpi_comm_world,ierr) call mpi_bcast(bcdef%wz1,1,mpi_double_precision,0,mpi_comm_world,ierr) -case('segmented_s-line') +case('segmented_s_line') bcdef%bc_parameters=0.d0 if (iproc==0) call scanfile (params%infile,'bc_param1',bcdef%bc_parameters(1),ires) if (iproc==0) call scanfile (params%infile,'bc_param2',bcdef%bc_parameters(2),ires) @@ -1259,7 +1259,7 @@ if (params%debug.gt.0 .and. iproc.eq.0) then write(*,'(a,e11.4)') shift//'vz1 ',bcdef%vz1 write(*,'(a,e11.4)') shift//'wz0 ',bcdef%wz0 write(*,'(a,e11.4)') shift//'wz1 ',bcdef%wz1 - case('segmented_s-line') + case('segmented_s_line') write(*,'(a)') shift//'Boundary condition parameters' do i=1,12 write(*,'(a,i2,a,e11.4)') shift//'bc_parameter ',i,' ',bcdef%bc_parameters(i) @@ -1481,7 +1481,7 @@ if (params%debug.gt.1) then write(threadinfo%Logunit,'(a32,e11.4)') 'vz1 ',bcdef%vz1 write(threadinfo%Logunit,'(a32,e11.4)') 'wz0 ',bcdef%wz0 write(threadinfo%Logunit,'(a32,e11.4)') 'wz1 ',bcdef%wz1 - case('segmented_s-line') + case('segmented_s_line') write(threadinfo%Logunit,'(a)') 'Boundary condition parameters' do i=1,12 write(threadinfo%Logunit,'(a32,i2,a,e11.4)') 'bc_parameter ',i,' ',bcdef%bc_parameters(i)