Merge branch 'master' of github.com:teuben/pitp2016

teuben · Jul 22, 2016 · 9432a14 · 9432a14
2 parents 7a6866d + a4fa3d4
commit 9432a14
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 19 deletions.
diff --git a/Lehner/EM/Makefile b/Lehner/EM/Makefile
@@ -4,7 +4,7 @@ OBJS =	boundary.o derivs.o evolve.o initial.o main.o params.o rhs.o
 
 MAKEFLAGS = -r
 
-LIBS = -L/usr/local/lib/ -lbbhutil -lrnpl -lutilio -lvutil -lxvs 
+LIBS = # -L/usr/local/lib/ -lbbhutil -lrnpl -lutilio -lvutil -lxvs 
 
 F90 = ifort 
 F77 = ifort 

diff --git a/Lehner/EM/main.f90 b/Lehner/EM/main.f90
@@ -82,10 +82,10 @@ end subroutine norm3d
 	  call derivs(uold(iBy,:,:,:),dyBy,dx,N,2)
 	  call derivs(uold(iBz,:,:,:),dzBz,dx,N,3)
 
-          ret = gft_out_brief('constraint',time, (/n,n,n/), 3, dxBx+dyBy+dzBz)  
-          ret = gft_out_brief('Bx',time, (/n,n,n/), 3, uold(iBx,:,:,:))
-          ret = gft_out_brief('By',time, (/n,n,n/), 3, uold(iBy,:,:,:))
-          ret = gft_out_brief('Bz',time, (/n,n,n/), 3, uold(iBz,:,:,:))
+!          ret = gft_out_brief('constraint',time, (/n,n,n/), 3, dxBx+dyBy+dzBz)  
+!          ret = gft_out_brief('Bx',time, (/n,n,n/), 3, uold(iBx,:,:,:))
+!          ret = gft_out_brief('By',time, (/n,n,n/), 3, uold(iBy,:,:,:))
+!          ret = gft_out_brief('Bz',time, (/n,n,n/), 3, uold(iBz,:,:,:))
 
 	  call norm3d(divBnorm,dxBx+dyBy+dzBz,N)
 

diff --git a/Lehner/SIMPLE/Makefile b/Lehner/SIMPLE/Makefile
@@ -15,7 +15,7 @@ OLEVEL  = -O3
 FOPTS   = -O3
 F90OPTS = -O3 -W0# -H aesu
 COPTS   =
-LIBS    = -lbbhutil -lrnpl 
+LIBS    = # -lbbhutil -lrnpl 
 LDFLAGS = 
 LIBPATH = -L/usr/local/intel81/lib/
 F90FLAGS= $(ARCH) $(OLEVEL) $(F90OPTS)

diff --git a/Lehner/SIMPLEBH/Makefile b/Lehner/SIMPLEBH/Makefile
@@ -15,7 +15,7 @@ OLEVEL  = -O3
 FOPTS   = -O3
 F90OPTS = -O3 -W0# -H aesu
 COPTS   =
-LIBS    = -lbbhutil -lrnpl 
+LIBS    = # -lbbhutil -lrnpl 
 LDFLAGS = 
 LIBPATH = -L/usr/local/intel81/lib/
 F90FLAGS= $(ARCH) $(OLEVEL) $(F90OPTS)

diff --git a/Lehner/SIMPLEBH/main.f90 b/Lehner/SIMPLEBH/main.f90
@@ -58,14 +58,14 @@ program main
 	  if(mod(i,freq).eq.0) then
 	  !will call here for output
 	  print*,'out', time,maxval(abs(uold(1,:)))
-	  ret = gft_out_full('phi',time, nx, 'x', 1, x, uold(1,:))
-          ret = gft_out_full('g',time, nx, 'x', 1, x, uold(2,:))
-          ret = gft_out_full('pi',time, nx, 'x', 1, x, uold(3,:))
+! 	  ret = gft_out_full('phi',time, nx, 'x', 1, x, uold(1,:))
+!         ret = gft_out_full('g',time, nx, 'x', 1, x, uold(2,:))
+!         ret = gft_out_full('pi',time, nx, 'x', 1, x, uold(3,:))
 	  end if
 	  if(mod(i,10).eq.0) then
-	  ret =  gft_out_full('pir40',time, 1, 'x', 1, x(m1), uold(3,m1))
-          ret =  gft_out_full('pir70',time, 1, 'x', 1, x(m2), uold(3,m2))
-          ret =  gft_out_full('pir100',time, 1, 'x', 1, x(m3), uold(3,m3))
+!	  ret =  gft_out_full('pir40',time, 1, 'x', 1, x(m1), uold(3,m1))
+!         ret =  gft_out_full('pir70',time, 1, 'x', 1, x(m2), uold(3,m2))
+!         ret =  gft_out_full('pir100',time, 1, 'x', 1, x(m3), uold(3,m3))
 
 	  end if	
 

diff --git a/Lehner/TOY-MODEL/Makefile b/Lehner/TOY-MODEL/Makefile
@@ -15,7 +15,7 @@ OLEVEL  = -O3
 FOPTS   =  
 F90OPTS =  -O3 # -H aesu
 COPTS   =
-LIBS    = -lbbhutil -lrnpl -lutilio -lvutil -lxvs -lpthread
+LIBS    = # -lbbhutil -lrnpl -lutilio -lvutil -lxvs -lpthread
 LDFLAGS = -L/opt/intel/fc/9.1.040/lib
 LIBPATH = -L/usr/local/lib/
 F90FLAGS= $(ARCH) $(OLEVEL) $(F90OPTS)

diff --git a/Lehner/TOY-MODEL/main.f90 b/Lehner/TOY-MODEL/main.f90
@@ -42,9 +42,9 @@ program main
 	time = 0.0
 	call initial(uold,x,Nx)
         print*, time, maxval(abs(uold(1,:))),maxval(abs(uold(2,:)))
-        ret = gft_out_full('conduc',time, nx-1, 'x', 1, x,conduc(1:nx-1))
-        ret = gft_out_full('V',time, nx-1, 'x', 1, x,uold(1,1:nx-1)) 
-        ret = gft_out_full('W',time, nx-1, 'x', 1, x,uold(2,1:nx-1)) 
+!        ret = gft_out_full('conduc',time, nx-1, 'x', 1, x,conduc(1:nx-1))
+!        ret = gft_out_full('V',time, nx-1, 'x', 1, x,uold(1,1:nx-1)) 
+!        ret = gft_out_full('W',time, nx-1, 'x', 1, x,uold(2,1:nx-1)) 
 
 !save for analysis
         open(unit = 100, file="Us.dat")
@@ -70,8 +70,8 @@ program main
 	    !will call here for output
 	    print*, time, maxval(abs(uold(1,:))),maxval(abs(uold(2,:)))
  !           ret = gft_out_full('conduc',time, nx-1, 'x', 1, x,conduc(1:nx-1))
-            ret = gft_out_full('V',time, nx-1, 'x', 1, x,uold(1,1:nx-1))
-            ret = gft_out_full('W',time, nx-1, 'x', 1, x,uold(2,1:nx-1))
+!            ret = gft_out_full('V',time, nx-1, 'x', 1, x,uold(1,1:nx-1))
+!            ret = gft_out_full('W',time, nx-1, 'x', 1, x,uold(2,1:nx-1))
 
 !            write(100,*) 
 !            write(100,*) "#time=",time

diff --git a/contributors b/contributors
@@ -2,3 +2,4 @@ If you contribute, enter your name and email here::
 
 Peter Teuben      [email protected]
 Paulo Alves       [email protected]
+Ryan Farber       [email protected]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ If you contribute, enter your name and email here::

		Peter Teuben [email protected]
		Paulo Alves [email protected]
		Ryan Farber [email protected]