Changeset 4233

Timestamp:

06/25/10 12:15:02 (15 years ago)

Author:

Eric.Larour

Message:

Simplification of SpawnCoreParallel

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/Qmux/DakotaFree.cpp (added)
• modules/Qmux/Qmux.h (modified) (1 diff)
• modules/Qmux/SpawnCoreParallel.cpp (modified) (3 diffs)

issm/trunk/src/c/Makefile.am

@@ -1043 +1043 @@
                                         ./modules/Qmux/DakotaResponses.cpp\
                                         ./modules/Qmux/DakotaMPI_Bcast.cpp\
+                                        ./modules/Qmux/DakotaFree.cpp\
                                         ./modules/Qmux/SpawnCore.cpp\
                                         ./modules/Qmux/SpawnCoreParallel.cpp\

issm/trunk/src/c/modules/Qmux/Qmux.h

@@ -20 +20 @@
 void DakotaResponses(double* responses,char** responses_descriptors,int numresponses,FemModel* femmodel);
 void DakotaMPI_Bcast(double** pvariables, char*** pvariables_descriptors,int* pnumvariables, int* pnumresponses);
+void DakotaFree(double** pvariables,char*** pvariables_descriptors,char*** presponses_descriptors,int numvariables,int numresponses);
 #endif
 

issm/trunk/src/c/modules/Qmux/SpawnCoreParallel.cpp

@@ -43 +43 @@
         char    *string                    = NULL;
         int      string_length;
-        double  *qmu_part                  = NULL;
-        int      qmu_npart;
         int      verbose                   = 0;
         int      dummy;
@@ -57 +55 @@
         femmodel->parameters->FindParam(&responses_descriptors,&dummy,ResponseDescriptorsEnum);
 
-        /* only cpu 0, running dakota is providing us with variables, variables_descriptors and responses. 
-         * broadcast onto other cpus: */
+        /* only cpu 0, running dakota is providing us with variables and variables_descriptors and numresponses: broadcast onto other cpus: */
         DakotaMPI_Bcast(&variables,&variables_descriptors,&numvariables,&numresponses);
 
@@ -91 +88 @@
         DakotaResponses(responses,responses_descriptors,numresponses,femmodel);
 
-        /*Free ressources:{{{1*/
-        //variables only on cpu != 0
-        if(my_rank!=0){
-                xfree((void**)&variables);
-                for(i=0;i<numvariables;i++){
-                        string=variables_descriptors[i];
-                        xfree((void**)&string);
-                }
-                xfree((void**)&variables_descriptors);
-        }
-        //responses descriptors
-        for(i=0;i<numresponses;i++){
-                string=responses_descriptors[i];
-                xfree((void**)&string);
-        }
-        //rest of dynamic allocations.
-        xfree((void**)&responses_descriptors);
-        xfree((void**)&qmu_part);
-        /*}}}*/
+        /*Free ressources:*/
+        DakotaFree(&variables,&variables_descriptors,&responses_descriptors, numvariables, numresponses);
 }