[cig-commits] commit: fix the input unit

[Mercurial]

changeset:   11:5fd212c54fba
user:        Sylvain Barbot <sylbar.vainbot at gmail.com>
date:        Tue Apr 26 17:01:21 2011 -0700
files:       relax.f90 run1.sh
description:
fix the input unit


diff -r 751057cf5019 -r 5fd212c54fba relax.f90
--- a/relax.f90	Tue Apr 26 16:31:14 2011 -0700
+++ b/relax.f90	Tue Apr 26 17:01:21 2011 -0700
@@ -208,7 +208,7 @@ PROGRAM relax
   ! abort calculation after help message
   ! or for dry runs
   IF (in%isdryrun) THEN
-     PRINT '("abort calculation")'
+     PRINT '("dry run: abort calculation")'
   END IF
   IF (in%isdryrun .OR. in%ishelp) THEN
      ! exit program
@@ -657,12 +657,19 @@ 100 CONTINUE
   ! free memory
   IF (ALLOCATED(gamma)) DEALLOCATE(gamma)
   IF (ALLOCATED(in%opts)) DEALLOCATE(in%opts)
+  IF (ALLOCATED(in%ptsname)) DEALLOCATE(in%ptsname)
   IF (ALLOCATED(in%op)) DEALLOCATE(in%op)
   IF (ALLOCATED(in%n)) DEALLOCATE(in%n)
   IF (ALLOCATED(in%stressstruc)) DEALLOCATE(in%stressstruc)
+  IF (ALLOCATED(in%stresslayer)) DEALLOCATE(in%stresslayer)
   IF (ALLOCATED(in%linearstruc)) DEALLOCATE(in%linearstruc)
+  IF (ALLOCATED(in%linearlayer)) DEALLOCATE(in%linearlayer)
+  IF (ALLOCATED(in%linearweakzone)) DEALLOCATE(in%linearweakzone)
   IF (ALLOCATED(in%nonlinearstruc)) DEALLOCATE(in%nonlinearstruc)
+  IF (ALLOCATED(in%nonlinearlayer)) DEALLOCATE(in%nonlinearlayer)
+  IF (ALLOCATED(in%nonlinearweakzone)) DEALLOCATE(in%nonlinearweakzone)
   IF (ALLOCATED(in%faultcreepstruc)) DEALLOCATE(in%faultcreepstruc)
+  IF (ALLOCATED(in%faultcreeplayer)) DEALLOCATE(in%faultcreeplayer)
   IF (ALLOCATED(sig)) DEALLOCATE(sig)
   IF (ALLOCATED(tau)) DEALLOCATE(tau)
   IF (ALLOCATED(moment)) DEALLOCATE(moment)
diff -r 751057cf5019 -r 5fd212c54fba run1.sh
--- a/run1.sh	Tue Apr 26 16:31:14 2011 -0700
+++ b/run1.sh	Tue Apr 26 17:01:21 2011 -0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-time ./relax <<EOF
+time ./relax $* --no-proj-output <<EOF
 # grid size (sx1,sx2,sx3)
 256 256 256
 # sampling size & smoothing (dx1,dx2,dx3,beta,nyquist)
@@ -16,7 +16,7 @@ 0 0
 # elastic parameters and gamma 
 1 1 0
 # integration time (t1) and time steps
-0 -1
+0 -1 1.000
 # number of observation planes
 0
 # number of observation points