diff --git a/src/NEST/lsf_reg.f90 b/src/NEST/lsf_reg.f90
deleted file mode 100644
index 654f27e95feac23cfc0ee498130ae5b4df8b3095..0000000000000000000000000000000000000000
--- a/src/NEST/lsf_reg.f90
+++ /dev/null
@@ -1,127 +0,0 @@
-program lsf_reg_test
-
-implicit none
-
-double precision xp(8),yp(8),zp(8),lsfp(8)
-double precision xp0(8),yp0(8),zp0(8)
-double precision x,y,z
-double precision xn,yn,zn
-double precision r(7)
-integer i
-
-xp0=(/0.d0,1.d0,0.d0,1.d0,0.d0,1.d0,0.d0,1.d0/)
-yp0=(/0.d0,0.d0,1.d0,1.d0,0.d0,0.d0,1.d0,1.d0/)
-zp0=(/0.d0,0.d0,0.d0,0.d0,1.d0,1.d0,1.d0,1.d0/)
-
-! first try with a linerar lsf function
-! in this test, the unit cube defined by xp0,yp0,zp0 is stretched
-! by a factor r(7) and translated by an offset (r(4),r(5),r(6))
-! a random point is generated xp, yp ,zp which is inside the cube
-! the values of the level set function at the corners of the cube
-! are obtained as the distance to a plane
-
-do i=1,100
-print*,i
-call random_number (r)
-r(4:6)=0.d0
-r(7)=1.d0
-x=r(4)+r(1)*r(7)
-y=r(5)+r(2)*r(7)
-z=r(6)+r(3)*r(7)
-xp=r(4)+xp0*r(7)
-yp=r(5)+yp0*r(7)
-zp=r(6)+zp0*r(7)
-lsfp=0.3-xp/2.d0-yp/4.d0-zp/4.d0
-call lsf_reg (xp,yp,zp,lsfp,x,y,z,xn,yn,zn)
-write (*,'("from",f,f,f)') x,y,z
-write (*,'(" to",f,f,f)') xn,yn,zn
-write (*,'("norm",f,f,f)') x-xn,y-yn,z-zn
-enddo
-
-end program lsf_reg_test
-
-!-------------------------
-
-subroutine lsf_reg (xp,yp,zp,lsfp,x,y,z,xn,yn,zn)
-
-! this routine takes the values of the level set function lsfp(8) known at the 8 nodes of a
-! cube (or element) of coordinates xp(8),yp(8),zp(8) and relocates a point of coordinates
-! x,y,z that is located in the vicinity of the surface defined by the zero value of the level
-! set function by projecting it onto the surface (lsfp=0)
-! the new location of the point is stored in xn,yn,zn
-
-! this is accomplished by assuming that the normal to the surface (lsfp=0) is correctly
-! approximated by the vector gradient of lsfp calculated at the original point x,y,z
-! the algorithm is applied repetitively until the distance to the surface is within a set
-! tolerance (here one millionth of the size of the cube)
-
-implicit none
-
-double precision xp(8),yp(8),zp(8),lsfp(8)
-double precision x,y,z
-double precision xn,yn,zn
-double precision r,s,t
-double precision h(8),dhdr(8),dhds(8),dhdt(8)
-double precision nr,ns,nt
-double precision phi
-
-r=(x-xp(1))/(xp(8)-xp(1))*2.d0-1.d0
-s=(y-yp(1))/(yp(8)-yp(1))*2.d0-1.d0
-t=(z-zp(1))/(zp(8)-zp(1))*2.d0-1.d0
-
-1 continue
-
-h(1)=(1.d0-r)*(1.d0-s)*(1.d0-t)/8.d0
-h(2)=(1.d0+r)*(1.d0-s)*(1.d0-t)/8.d0
-h(3)=(1.d0-r)*(1.d0+s)*(1.d0-t)/8.d0
-h(4)=(1.d0+r)*(1.d0+s)*(1.d0-t)/8.d0
-h(5)=(1.d0-r)*(1.d0-s)*(1.d0+t)/8.d0
-h(6)=(1.d0+r)*(1.d0-s)*(1.d0+t)/8.d0
-h(7)=(1.d0-r)*(1.d0+s)*(1.d0+t)/8.d0
-h(8)=(1.d0+r)*(1.d0+s)*(1.d0+t)/8.d0
-
-dhdr(1)=-(1.d0-s)*(1.d0-t)/8.d0
-dhdr(2)=(1.d0-s)*(1.d0-t)/8.d0
-dhdr(3)=-(1.d0+s)*(1.d0-t)/8.d0
-dhdr(4)=(1.d0+s)*(1.d0-t)/8.d0
-dhdr(5)=-(1.d0-s)*(1.d0+t)/8.d0
-dhdr(6)=(1.d0-s)*(1.d0+t)/8.d0
-dhdr(7)=-(1.d0+s)*(1.d0+t)/8.d0
-dhdr(8)=(1.d0+s)*(1.d0+t)/8.d0
-
-dhds(1)=-(1.d0-r)*(1.d0-t)/8.d0
-dhds(2)=-(1.d0+r)*(1.d0-t)/8.d0
-dhds(3)=(1.d0-r)*(1.d0-t)/8.d0
-dhds(4)=(1.d0+r)*(1.d0-t)/8.d0
-dhds(5)=-(1.d0-r)*(1.d0+t)/8.d0
-dhds(6)=-(1.d0+r)*(1.d0+t)/8.d0
-dhds(7)=(1.d0-r)*(1.d0+t)/8.d0
-dhds(8)=(1.d0+r)*(1.d0+t)/8.d0
-
-dhdt(1)=-(1.d0-r)*(1.d0-s)/8.d0
-dhdt(2)=-(1.d0+r)*(1.d0-s)/8.d0
-dhdt(3)=-(1.d0-r)*(1.d0+s)/8.d0
-dhdt(4)=-(1.d0+r)*(1.d0+s)/8.d0
-dhdt(5)=(1.d0-r)*(1.d0-s)/8.d0
-dhdt(6)=(1.d0+r)*(1.d0-s)/8.d0
-dhdt(7)=(1.d0-r)*(1.d0+s)/8.d0
-dhdt(8)=(1.d0+r)*(1.d0+s)/8.d0
-
-nr=sum(dhdr*lsfp)
-ns=sum(dhds*lsfp)
-nt=sum(dhdt*lsfp)
-
-phi=sum(h*lsfp)
-
-r=r-nr*phi
-s=s-ns*phi
-t=t-nt*phi
-
-if (abs(phi).gt.1.d-6) goto 1
-
-xn=xp(1)+(r+1.d0)/2.d0*(xp(8)-xp(1))
-yn=yp(1)+(s+1.d0)/2.d0*(yp(8)-yp(1))
-zn=zp(1)+(t+1.d0)/2.d0*(zp(8)-zp(1))
-
-return
-end
diff --git a/src/VTK/post.f90 b/src/VTK/post.f90
index 31bc2304588161a67d1256c6448f91f5c8b55c0c..b861e9a160e25a06be8b1745391ef9a0af59eacf 100644
--- a/src/VTK/post.f90
+++ b/src/VTK/post.f90
@@ -91,10 +91,10 @@ integer,dimension(:),allocatable::invoid,elvoid,rtf,ftr
integer myicon(100),nstep,ndir,iter,ii,lsf,levmax
logical,dimension(:),allocatable::influid,do_it,subset_leaves,instrain
-logical :: nest,nestscl
+logical :: nest
character clsf*3,c4*4,cc4*4,dir*128
-character cs,nestin,nestsclin
+character cs,nestin
double precision :: eps,dil,current_time,activation_time,zmin,xx,yy,zz,maxe2d,dist
double precision, allocatable, dimension (:) :: ov_nodee2d, ov_nodecrit
@@ -133,33 +133,6 @@ if (nstep.lt.1000) c4(1:1)='0'
if (nstep.lt.100) c4(1:2)='00'
if (nstep.lt.10) c4(1:3)='000'
-do i=1,1
- write (*,*) 'Is this a nested model? (y/n)'
- read (*,'(a)') nestin
- select case (trim(nestin))
- case ('y','Y','yes','Yes')
- nest=.true.
- do j=1,1
- write (*,*) 'Should the values be scaled to fit the large(st) scale model? (y/n)'
- read (*,'(a)') nestsclin
- select case (trim(nestsclin))
- case ('y','Y','yes','Yes')
- nestscl=.true.
- case ('n','N','no','No')
- nestscl=.false.
- case default
- write (*,*) 'Error: Please input either "y" or "n"'
- j=0
- end select
- enddo
- case ('n','N','no','No')
- nest=.false.
- case default
- write (*,*) 'Error: Please input either "y" or "n"'
- i=0
- end select
-enddo
-
print*,'Is it a debug file ? (y or n)'
read (*,'(a)') cs
select case (cs)
@@ -177,9 +150,22 @@ case default
stop
end select
+write (*,*) 'Is this a nested model? (y/n)'
+read (*,'(a)') nestin
+select case (trim(nestin))
+case ('y','Y','yes','Yes')
+ nest=.true.
+case ('n','N','no','No')
+ nest=.false.
+case default
+ write (*,*) 'Error: Response must be either "y" or "n"'
+ stop
+end select
+
!==============================================================================
!==============================================================================
+
write(*,*) '**************************************************************************'
write(*,*) '--------------------------------------------------------------------------'
write(*,*) '--------------------------------------------------------------------------'
@@ -294,7 +280,9 @@ read(7)(ov%x(i),ov%y(i),ov%z(i), &
!======================
read(7) (ov%icon(1:8,ie), &
+! Line below added by dwhipp - 12/09
ov%pressure(ie), &
+! Line below added by dwhipp - 12/09
ov%spressure(ie), &
ov%crit(ie), &
ov%e2d(ie), &
diff --git a/src/module_definitions.f90 b/src/module_definitions.f90
index df1c151e43b53fa9b0e3298da2ddc095c33257bc..e2fd8ffa6b892f742c64b42475ffc78e1e241fa4 100644
--- a/src/module_definitions.f90
+++ b/src/module_definitions.f90
@@ -366,10 +366,8 @@ module definitions
! [x,y,z]minls: location of (0,0,0) in the SS model within the LS model
type nest_info
- double precision :: sselemx,sselemy,sselemz,sselemx0,sselemy0,sselemz0
- double precision :: xminls,yminls,zminls
- character(len=5) :: ssoutdir
character(len=128) :: lsoutfile
+ double precision :: sselemx,sselemy,sselemz,xminls,yminls,zminls
end type nest_info
end module definitions
diff --git a/src/read_input_file.f90 b/src/read_input_file.f90
index c34643a64f2d763a16ff45cd685e553e16e63af1..2860fa7440d283b206c3237bdc4a4d2bb40cafc3 100644
--- a/src/read_input_file.f90
+++ b/src/read_input_file.f90
@@ -828,10 +828,6 @@ if (params%nest) then
if (iproc.eq.0) call scanfile (params%infile,'lsoutfile',nest%lsoutfile,ires)
call mpi_bcast(nest%lsoutfile,128,mpi_character,0,mpi_comm_world,ierr)
- nest%ssoutdir='SSOUT'
- if (iproc.eq.0) call scanfile (params%infile,'ssoutdir',nest%ssoutdir,ires)
- call mpi_bcast(nest%ssoutdir,5,mpi_character,0,mpi_comm_world,ierr)
-
nest%sselemx=1.d0
if (iproc==0) call scanfile (params%infile,'sselemx',nest%sselemx,ires)
call mpi_bcast(nest%sselemx,1,mpi_double_precision,0,mpi_comm_world,ierr)
@@ -855,18 +851,6 @@ if (params%nest) then
nest%zminls=0.d0
if (iproc==0) call scanfile (params%infile,'zminls',nest%zminls,ires)
call mpi_bcast(nest%zminls,1,mpi_double_precision,0,mpi_comm_world,ierr)
-
- nest%sselemx0=1.d0
- if (iproc==0) call scanfile (params%infile,'sselemx0',nest%sselemx0,ires)
- call mpi_bcast(nest%sselemx0,1,mpi_double_precision,0,mpi_comm_world,ierr)
-
- nest%sselemy0=1.d0
- if (iproc==0) call scanfile (params%infile,'sselemy0',nest%sselemy0,ires)
- call mpi_bcast(nest%sselemy0,1,mpi_double_precision,0,mpi_comm_world,ierr)
-
- nest%sselemz0=1.d0
- if (iproc==0) call scanfile (params%infile,'sselemz0',nest%sselemz0,ires)
- call mpi_bcast(nest%sselemz0,1,mpi_double_precision,0,mpi_comm_world,ierr)
endif
! Defined, but not broadcast or read from input file
@@ -1037,16 +1021,12 @@ if (params%debug.gt.0 .and. iproc.eq.0) then
if (params%nest) then
write(*,'(a)') shift//'--- Nest parameters ---'
write(*,'(a,a)') shift//'lsoutfile ',trim(nest%lsoutfile)
- write(*,'(a,a)') shift//'ssoutdir ',trim(nest%ssoutdir)
write(*,'(a,e11.4)') shift//'sselemx ',nest%sselemx
write(*,'(a,e11.4)') shift//'sselemy ',nest%sselemy
write(*,'(a,e11.4)') shift//'sselemz ',nest%sselemz
write(*,'(a,e11.4)') shift//'xminls ',nest%xminls
write(*,'(a,e11.4)') shift//'yminls ',nest%yminls
write(*,'(a,e11.4)') shift//'zminls ',nest%zminls
- write(*,'(a,e11.4)') shift//'sselemx0 ',nest%sselemx0
- write(*,'(a,e11.4)') shift//'sselemy0 ',nest%sselemy0
- write(*,'(a,e11.4)') shift//'sselemz0 ',nest%sselemz0
endif
write(*,'(a,e11.4)') shift//'distance_exponent ',params%distance_exponent
endif
@@ -1212,16 +1192,12 @@ if (params%debug.gt.1) then
if (params%nest) then
write(threadinfo%Logunit,'(a)') '--- Nest parameters ---'
write(threadinfo%Logunit,'(a32,a)') 'lsoutfile ',trim(nest%lsoutfile)
- write(threadinfo%Logunit,'(a32,a)') 'ssoutdir ',trim(nest%ssoutdir)
write(threadinfo%Logunit,'(a32,e11.4)') 'sselemx ',nest%sselemx
write(threadinfo%Logunit,'(a32,e11.4)') 'sselemy ',nest%sselemy
write(threadinfo%Logunit,'(a32,e11.4)') 'sselemz ',nest%sselemz
write(threadinfo%Logunit,'(a32,e11.4)') 'xminls ',nest%xminls
write(threadinfo%Logunit,'(a32,e11.4)') 'yminls ',nest%yminls
write(threadinfo%Logunit,'(a32,e11.4)') 'zminls ',nest%zminls
- write(threadinfo%Logunit,'(a32,e11.4)') 'sselemx0 ',nest%sselemx0
- write(threadinfo%Logunit,'(a32,e11.4)') 'sselemy0 ',nest%sselemy0
- write(threadinfo%Logunit,'(a32,e11.4)') 'sselemz0 ',nest%sselemz0
endif
write(threadinfo%Logunit,'(a32,e11.4)') 'distance_exponent ',params%distance_exponent
endif
diff --git a/src/write_global_output.f90 b/src/write_global_output.f90
index 1518ad422f2cbbb12174d03ac67771eb753dcf19..de0f318728ed80e5f07ec6f2e372b4c944aea40b 100644
--- a/src/write_global_output.f90
+++ b/src/write_global_output.f90
@@ -80,7 +80,7 @@ call mpi_comm_rank (mpi_comm_world,iproc,ierr)
if (iproc.eq.0) then
if (params%nest) then
- outdir=nest%ssoutdir
+ outdir='SSOUT'
else
outdir='OUT'
endif