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

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-02-25 11:39:19 -0800 (Wed, 25 Feb 2009)
New Revision: 14150

Modified:
   seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/read_citcoms_data.c
Log:
Fixed two bugs when expanding filenames


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-02-25 18:31:51 UTC (rev 14149)
+++ seismo/3D/SPECFEM3D_GLOBE/branches/pluggable/MODELS/3D/citcoms_isotropic_no_crust/read_citcoms_data.c	2009-02-25 19:39:19 UTC (rev 14150)
@@ -804,7 +804,6 @@
     int i, buffer_size;
     int total_citcoms_proc;
     double *buffer;
-    double cx[4], cy[4], cz[4];
     FILE *fp;
     cap_t my_cap;
     domain_t *curr, *prev;
@@ -880,8 +879,9 @@
     prev = NULL;
 
     for(i=0; i<total_citcoms_proc; i++) {
-        double *tmp = &(buffer[i*ncolumns]);
+        const double *tmp = &(buffer[i*ncolumns]);
         double ctheta, cphi;
+        double cx[4], cy[4], cz[4];
         cap_t citcoms_cap;
         int j;
 
@@ -941,7 +941,7 @@
         int nno, size;
         double *coord, *seismic;
 
-        snprintf(filename1, 255, fmt1, curr->rank);
+        snprintf(filename1, 255, fmt1, citcoms_model_filename_base, curr->rank);
         f1 = fopen(filename1, "rb");
         if(f1 == NULL) {
             fprintf(stderr, "error while opening file '%s'\n",
@@ -949,7 +949,7 @@
             abort();
         }
 
-        snprintf(filename2, 255, fmt2, curr->rank, citcoms_step);
+        snprintf(filename2, 255, fmt2, citcoms_model_filename_base, curr->rank, citcoms_step);
         f2 = fopen(filename2, "rb");
         if(f2 == NULL) {
             fprintf(stderr, "error while opening file '%s'\n",