[cig-commits] r11383 - mc/1D/hc/trunk

[becker at geodynamics.org]

Author: becker
Date: 2008-03-09 17:12:22 -0700 (Sun, 09 Mar 2008)
New Revision: 11383

Modified:
   mc/1D/hc/trunk/hc_extract_sh_layer.c
   mc/1D/hc/trunk/make_tar
Log:
Added new output option for hc_extract_sh_layer



Modified: mc/1D/hc/trunk/hc_extract_sh_layer.c
===================================================================
--- mc/1D/hc/trunk/hc_extract_sh_layer.c	2008-03-08 02:16:40 UTC (rev 11382)
+++ mc/1D/hc/trunk/hc_extract_sh_layer.c	2008-03-10 00:12:22 UTC (rev 11383)
@@ -46,15 +46,16 @@
 	    argv[0],argv[0],mode,short_format);
     fprintf(stderr,"extracts spherical harmonic solution x (vel or str) from HC run\n");
     fprintf(stderr,"layer: 1...nset\n");
-    fprintf(stderr,"\tif ilayer=1..nset, will print one layer\n");
-    fprintf(stderr,"\tif ilayer=-1, will select nset\n");
-    fprintf(stderr,"\tif ilayer=-2, will print all layers\n");
-    fprintf(stderr,"mode: 1...3\n");
+    fprintf(stderr,"\tif ilayer= 1..nset, will print one layer\n");
+    fprintf(stderr,"\t          -1, will select nset\n");
+    fprintf(stderr,"\t          -2, will print all layers\n");
+    fprintf(stderr,"mode: 1...6\n");
     fprintf(stderr,"\tif mode = 1, will print x_r \n");
-    fprintf(stderr,"\tif mode = 2, will print x_pol x_tor \n");
-    fprintf(stderr,"\tif mode = 3, will print x_r x_pol x_tor\n");
-    fprintf(stderr,"\tif mode = 4, will print the depth levels of all layers\n");
-    
+    fprintf(stderr,"\t          2, will print x_pol x_tor \n");
+    fprintf(stderr,"\t          3, will print x_r x_pol x_tor\n");
+    fprintf(stderr,"\t          4, will print the depth levels of all layers\n");
+    fprintf(stderr,"\t          5, will print x_pol\n");
+    fprintf(stderr,"\t          6, will print x_tor\n");
     exit(-1);
     break;
   }
@@ -89,7 +90,13 @@
   }else{
     i1=ilayer-1;i2 = i1;
   }
-  shps = mode;
+  /* detect number of expansions */
+  if((mode == 1)||(mode == 5)||(mode = 6))
+    shps = 1;
+  else if(mode == 2)
+    shps = 2;
+  else if(mode == 3)
+    shps = 3;
   for(ilayer=i1;ilayer <= i2;ilayer++){
     /* 
        output 
@@ -127,6 +134,21 @@
     case 4:
       fprintf(stdout,"%5i %11g\n",ilayer,HC_Z_DEPTH(model->r[ilayer]));
       break;
+    case 5:
+      /*  */
+      if(verbose)
+	fprintf(stderr,"%s: printing x_pol SHE at layer %i (depth: %g)\n",
+		argv[0],ilayer,HC_Z_DEPTH(model->r[ilayer]));
+      sh_print_coefficients_to_file((sol+ilayer*3+1),shps,stdout,fac,FALSE,verbose);
+      break;
+    case 6:
+      /*  */
+      if(verbose)
+	fprintf(stderr,"%s: printing x_tor SHE at layer %i (depth: %g)\n",
+		argv[0],ilayer,HC_Z_DEPTH(model->r[ilayer]));
+      sh_print_coefficients_to_file((sol+ilayer*3+2),shps,stdout,fac,FALSE,verbose);
+      break;
+ 
     default:
       fprintf(stderr,"%s: error, mode %i undefined\n",argv[0],mode);
       exit(-1);

Modified: mc/1D/hc/trunk/make_tar
===================================================================
--- mc/1D/hc/trunk/make_tar	2008-03-08 02:16:40 UTC (rev 11382)
+++ mc/1D/hc/trunk/make_tar	2008-03-10 00:12:22 UTC (rev 11383)
@@ -13,7 +13,7 @@
 mkdir $HOME/tmp/hc/prem/
 mkdir $HOME/tmp/hc/hcplates/
 
-cp  *.c *.h Makefile  README.TXT INSTALLATION.TXT calc_vel_and_plot \
+cp  *.c *.h Makefile Makefile.include  README.TXT INSTALLATION.TXT calc_vel_and_plot \
      $HOME/tmp/hc
 cp example_data/* $HOME/tmp/hc/example_data/
 cp prem/prem* $HOME/tmp/hc/prem/