Changeset 74baec for pcp

Timestamp:

Jul 8, 2008, 1:10:17 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

0ab37b

Parents:

375dcf

Message:

fft_3d_create_plan: small BUGFIX - local_data was free'd twice and work not at all

File:

• pcp/src/myfft.c (modified) (2 diffs)

pcp/src/myfft.c

@@ -270 +270 @@
     plan->Levplan[i].local_nyz = plan->Levplan[i].local_ny*plan->Levplan[i].nz;
     plan->Levplan[i].nyz = plan->Levplan[i].ny*plan->Levplan[i].nz;
-    fprintf(stderr,"(%i) nlocal (x%i, y%i, yz%i), n (%i, %i, %i), N (%i, %i, %i)\n", P->Par.me, plan->Levplan[i].local_nx, plan->Levplan[i].local_ny, plan->Levplan[i].local_nyz, plan->Levplan[i].nx, plan->Levplan[i].ny, plan->Levplan[i].nz, plan->Levplan[i].N[0], plan->Levplan[i].N[1], plan->Levplan[i].N[2]);  
+    if (P->Call.out[LeaderOut]) fprintf(stderr,"(%i) nlocal (x%i, y%i, yz%i), n (%i, %i, %i), N (%i, %i, %i)\n", P->Par.me, plan->Levplan[i].local_nx, plan->Levplan[i].local_ny, plan->Levplan[i].local_nyz, plan->Levplan[i].nx, plan->Levplan[i].ny, plan->Levplan[i].nz, plan->Levplan[i].N[0], plan->Levplan[i].N[1], plan->Levplan[i].N[2]);  
     plan->Levplan[i].LocalSizeC = plan->Levplan[i].nx*plan->Levplan[i].local_nyz;
     plan->Levplan[i].LocalSizeR = plan->Levplan[i].local_nx*plan->Levplan[i].ny*plan->Levplan[i].N[2];
@@ -305 +305 @@
     }
   }
-  if (plan->local_data != NULL) {
-    Free(plan->local_data, "fft_3d_create_plan: plan->local_data");
-    plan->local_data = NULL;
-  }
-  if (plan->work != NULL) {
-    Free(plan->local_data, "fft_3d_create_plan: plan->local_data");
-    plan->work = NULL;
-  }
+  Free(plan->local_data, "fft_3d_create_plan: plan->local_data");
+  Free(plan->work, "fft_3d_create_plan: plan->work");
   Free(MaxNFields, "fft_3d_create_plan: MaxNFields");
   return plan;