[cig-commits] r14431 - seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-03-24 13:21:49 -0700 (Tue, 24 Mar 2009)
New Revision: 14431

Modified:
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/read_citcoms_data.c
Log:
fixed a typo, changed two flags, and some minor debugging output

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.f90	2009-03-24 20:03:47 UTC (rev 14430)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/citcoms_isotropic_no_crust.f90	2009-03-24 20:21:49 UTC (rev 14431)
@@ -68,7 +68,7 @@
 
   rho = rho * 1000.0d0 / RHOAV
   vpv = vpv * 1000.0d0 / (R_EARTH * inv_time)
-  vph = vph * 1000.0d0 / (R_EARTH * inv_time)
+  vsv = vsv * 1000.0d0 / (R_EARTH * inv_time)
   
   vph = vpv
   vsh = vsv

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90	2009-03-24 20:03:47 UTC (rev 14430)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/get_model_properties.serial.f90	2009-03-24 20:21:49 UTC (rev 14431)
@@ -42,15 +42,15 @@
 
   HONOR_1D_SPHERICAL_MOHO = .false.
   ONE_CRUST = .true.
+  CASE_3D = .true.
 
-  TRANSVERSE_ISOTROPY = .true.
+  TRANSVERSE_ISOTROPY = .false.
 
   ISOTROPIC_3D_MANTLE = .true.
   ANISOTROPIC_3D_MANTLE = .false.
   ANISOTROPIC_INNER_CORE = .false.
 
   CRUSTAL = .false.
-  CASE_3D = .false.
 
   ATTENUATION_3D = .false.
 

Modified: seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/read_citcoms_data.c
===================================================================
--- seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/read_citcoms_data.c	2009-03-24 20:03:47 UTC (rev 14430)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/read_citcoms_data.c	2009-03-24 20:21:49 UTC (rev 14431)
@@ -1010,6 +1010,7 @@
         int32_t header[4];
 
         snprintf(citcoms_bound_filename, 255, fmt, citcoms_model_filename_base);
+        fprintf(stderr, "reading CitcomS domain information from '%s'\n", citcoms_bound_filename);
         fp = fopen(citcoms_bound_filename, "rb");
         if(fp == NULL) {
             fprintf(stderr, "error while opening file '%s'\n",
@@ -1059,6 +1060,7 @@
             abort();
         }
         fclose(fp);
+        fprintf(stderr, "finished reading '%s'\n", citcoms_bound_filename);
     }
 
     MPI_Bcast(buffer, buffer_size, MPI_DOUBLE, 0, MPI_COMM_WORLD);
@@ -1155,6 +1157,7 @@
         }
 
         snprintf(filename2, 255, fmt2, citcoms_model_filename_base, dom->rank, citcoms_step);
+        /* if(myrank == 0) fprintf(stderr, "reading mantle model from '%s' and other files\n", filename2); */
         f2 = fopen(filename2, "rb");
         if(f2 == NULL) {
             fprintf(stderr, "error while opening file '%s'\n",
@@ -1327,8 +1330,10 @@
     float tmp[5], recv[5];
 
     /* some statistics */
+    /*
     fprintf(stderr, "rank=%d, points=%ld, distance searched=%ld, elements searched=%ld, hint=%ld, inverse mapping=%ld\n",
             myrank, npoints, dist_searched, elem_searched, hint_works, inv_mapping_iter);
+    */
 
     tmp[0] = npoints;
     tmp[1] = dist_searched;
@@ -1339,7 +1344,7 @@
     MPI_Allreduce(tmp, recv, 5, MPI_FLOAT, MPI_SUM, MPI_COMM_WORLD);
 
     if(myrank==0)
-        fprintf(stderr, "total points=%e, distance searched=%e, elements searched=%e, hint=%e, inverse mapping=%e\n",
+        fprintf(stderr, "total points=%e, distance searched=%e, elements searched=%e, hints=%e, inverse mappings=%e\n",
                 recv[0], recv[1], recv[2], recv[3], recv[4]);
 
     /* free memory */
@@ -1356,6 +1361,7 @@
     }
 
     free(domains);
+
     return;
 }