[cig-commits] r14459 - in mc/2D/ConMan/trunk/src: . gendeck

[becker at geodynamics.org]

Author: becker
Date: 2009-03-25 16:58:33 -0700 (Wed, 25 Mar 2009)
New Revision: 14459

Modified:
   mc/2D/ConMan/trunk/src/gendeck/gendeck.f
   mc/2D/ConMan/trunk/src/gendeck/run_gendeck
   mc/2D/ConMan/trunk/src/timdrv.F
   mc/2D/ConMan/trunk/src/timdrv.nn.F
Log:
Suggested reactivation of the nsmprt variable to allow separate output steps
for velocity&tremperature vs. stress, as indicated in the modified conman.lyx file.

Please advise on how to proceed with ConMan output modifications while assuring backward compat. 

(conman.lyx would not produce a new .pdf file using lyx, for some reason.)



Modified: mc/2D/ConMan/trunk/src/gendeck/gendeck.f
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/gendeck.f	2009-03-25 23:56:35 UTC (rev 14458)
+++ mc/2D/ConMan/trunk/src/gendeck/gendeck.f	2009-03-25 23:58:33 UTC (rev 14459)
@@ -547,11 +547,12 @@
       write (istdo, *)
       nsdprt = getint ('Enter steps between restart dumps:      ', 
      &                  nsdprt)
-      nsvprt = getint ('Enter steps between time series outputs:',
-     &                  nsvprt)
-      nstprt = getint ('Enter steps between field outputs:      ',   
+      nstprt = getint ('Enter steps between velocity and temp outputs:',
      &                  nstprt)
+      nsmprt = getint ('Enter steps between stress field outputs:      ',   
+     &                  nsmprt)
 c
+      nsvprt = nstprt
       if(addcomment)write (iunit,*) 'output information'
       write (iunit, "(4i6)") nsdprt, nsvprt, nstprt, nsmprt
 c

Modified: mc/2D/ConMan/trunk/src/gendeck/run_gendeck
===================================================================
--- mc/2D/ConMan/trunk/src/gendeck/run_gendeck	2009-03-25 23:56:35 UTC (rev 14458)
+++ mc/2D/ConMan/trunk/src/gendeck/run_gendeck	2009-03-25 23:58:33 UTC (rev 14459)
@@ -4,7 +4,7 @@
 #
 model=${1-new} 			# model name
 rayleigh=${2-1e5}		# Rayleigh number
-nelz=${3-50}			# number of elements in z
+nelz=${3-30}			# number of elements in z
 nsteps=${4-1000}		# number of timesteps
 aspect=${5-1}			# aspect ratio, determines x width
 heating=${6-0}			# internal heating
@@ -20,8 +20,8 @@
 wrap_around_bc="n"
 
 nstep_restart=`echo $nsteps | gawk '{print(int($1/3))}'` # when to print restart files?
-nstep_timeseries=50				    # for timeseries output
-nstep_field=`echo $nsteps | gawk '{print(int($1/30))}'`  # for field output
+nstep_field=`echo $nsteps | gawk '{print(int($1/30))}'`  # for velocity and temp field output
+nstep_stress=10000				    # for stress field output
 
 ndtime_print=1.0		# non-dim time to print results
 
@@ -70,8 +70,8 @@
 $ndtime_print
 1.0
 $nstep_restart
-$nstep_timeseries
 $nstep_field
+$nstep_stress
 y
 y
 y

Modified: mc/2D/ConMan/trunk/src/timdrv.F
===================================================================
--- mc/2D/ConMan/trunk/src/timdrv.F	2009-03-25 23:56:35 UTC (rev 14458)
+++ mc/2D/ConMan/trunk/src/timdrv.F	2009-03-25 23:58:33 UTC (rev 14459)
@@ -108,9 +108,15 @@
 c
       if (mod(lstep, nstprt) .eq. 0) then
         call print(x,v,t,ndof,nelx,nelz,numnp,lstep,time)
-        call EGlib ('prt_str ')
+
       endif
 c
+c.... print out stress fields
+c
+      if (mod(lstep, nsmprt) .eq. 0)then
+         call EGlib ('prt_str ')
+      endif
+c
 c.... overwrite restart output file every nsdout timesteps      
 c
       if ( iorstr .eq. 1) then

Modified: mc/2D/ConMan/trunk/src/timdrv.nn.F
===================================================================
--- mc/2D/ConMan/trunk/src/timdrv.nn.F	2009-03-25 23:56:35 UTC (rev 14458)
+++ mc/2D/ConMan/trunk/src/timdrv.nn.F	2009-03-25 23:58:33 UTC (rev 14459)
@@ -116,7 +116,6 @@
 c
       if (mod(lstep, nstprt) .eq. 0) then
         call print(x,v,t,ndof,nelx,nelz,numnp,lstep,time)
-        call EGlib ('prt_str ')
 c       do i=1,numnp
 c        t(i) = t(i)*1300.0
 c       enddo
@@ -134,6 +133,13 @@
 c       call print_reg(psol)
       endif
 c
+c... print out stress fields
+c      
+      if (mod(lstep, nsmprt) .eq. 0)then
+        call EGlib ('prt_str ')
+      endif
+
+c
 c.... overwrite restart output file every nsdout timesteps      
 c
       if ( iorstr .eq. 1) then