Changeset 5531 for anuga_core/source/anuga/shallow_water/urs_ext.c

Timestamp:

Jul 18, 2008, 2:49:09 PM (16 years ago)

Author:

ole

Message:

Verified that urs_ext.c runs on 32 bit system and added comments towards
add permutation array to the c-code

File:

• anuga_core/source/anuga/shallow_water/urs_ext.c (modified) (6 diffs)

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -116 +116 @@
         if (!fname) 
         {
-          //printf("error\n");          
+          //printf("error\n");          
             PyErr_SetString(PyExc_ValueError, "filename not a string");
             return NULL;
@@ -256 +256 @@
 {
     FILE *fp;
-    int nsta, nsta0, i, isrc, ista;
+    int nsta, nsta0, i, isrc, ista, k;
     struct tgsrwg *mytgs=0, *mytgs0=0;
     char *muxFileName;                                                                  
@@ -299 +299 @@
     }
 
-    /* loop over remaining sources, check compatibility, and read them into 
-    *muxData */ 
-        for (isrc = 0; isrc < numSrc; isrc++)
+    /* loop over all sources, read headers and check compatibility */
+    for (isrc = 0; isrc < numSrc; isrc++)
     {
         muxFileName = muxFileNameArray[isrc];
@@ -376 +375 @@
 
     /* make array(s) to hold the demuxed data */
-    //FIXME: This can be reduced to only contain stations in order file
+    //FIXME: This can be reduced to only contain stations given in permutation file
     sts_data = (float**)malloc(nsta0*sizeof(float *));
     if (sts_data == NULL)
@@ -432 +431 @@
 
         /* loop over stations */
+        /* This is where we should only take stations with indices in the permutation array 
+           (and in that order) */
+        
+        //for i in range(len(permution)):
+        //     ista = permutation[i]
+        //     use ista with mux data
+        //     use i with the processed data to be returned         
+        i=0;
+        
         for(ista = 0; ista < nsta0; ista++)
         {               
@@ -438 +446 @@
 
             /* weight appropriately and add */
-            for(i = 0; i < mytgs0[ista].nt; i++)
+            for(k = 0; k < mytgs0[ista].nt; k++)
             {
-                if((isdata(sts_data[ista][i])) && isdata(temp_sts_data[i]))
+                if((isdata(sts_data[ista][k])) && isdata(temp_sts_data[k]))
                 {
-                    sts_data[ista][i] += temp_sts_data[i] * weights[isrc];
-                    //printf("%d,%d,%f\n",ista,i,sts_data[ista][i]);
+                    sts_data[ista][k] += temp_sts_data[k] * weights[isrc];
+                    //printf("%d,%d,%f\n",ista,k,sts_data[ista][k]);
                 }
                 else
                 {
-                    sts_data[ista][i] = NODATA;
+                    sts_data[ista][k] = NODATA;
                 }
             }