Changeset 4439

Timestamp:

07/07/10 15:48:47 (15 years ago)

Author:

Eric.Larour

Message:

Some modificiations on Qmu analysis

Location:

issm/trunk/src

Files:

• c/modules/DakotaResponsesx (added)
• c/modules/DakotaResponsesx/DakotaResponses.cpp (added)
• c/modules/DakotaResponsesx/InputUpdateFromDakotax.cpp (added)
• c/modules/DakotaResponsesx/InputUpdateFromDakotax.h (added)
• c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (1 diff)
• c/modules/OutputResultsx/MatlabWriteResults.cpp (modified) (2 diffs)
• c/modules/Qmux/DakotaResponses.cpp (deleted)
• c/modules/Qmux/SpawnCore.cpp (modified) (1 diff)
• c/modules/Qmux/SpawnCoreParallel.cpp (modified) (3 diffs)
• c/modules/Qmux/SpawnCoreSerial.cpp (modified) (1 diff)
• c/solutions/SolutionConfiguration.cpp (modified) (1 diff)
• m/classes/public/parseresultsfromdisk.m (modified) (1 diff)
• m/classes/public/solve.m (modified) (1 diff)
• m/solutions/MatlabProcessPatch.m (moved) (moved from issm/trunk/src/m/classes/public/ProcessPatch.m ) (1 diff)
• m/solutions/SpawnCore.m (modified) (2 diffs)
• m/solutions/issm.m (moved) (moved from issm/trunk/src/m/issm.m ) (3 diffs)
• mex/InputUpdateFromDakota (added)
• mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp (added)
• mex/InputUpdateFromDakota/InputUpdateFromDakota.h (added)
• mex/Makefile.am (modified) (2 diffs)

issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

@@ -11 +11 @@
 void InputUpdateFromDakotax(FemModel* femmodel, double* variables,char** variables_descriptors,int numvariables){
 
-        int verbose;
-        int qmu_npart;
-        int dummy;
+        int     verbose;
+        int     qmu_npart;
         double* qmu_part=NULL;
+        int     dummy;
 
         /*retrieve parameters: */

issm/trunk/src/c/modules/OutputResultsx/MatlabWriteResults.cpp

@@ -24 +24 @@
         /*output: */
         mxArray* dataref=NULL;
+        mxArray* processeddataref=NULL;
         mwSize nfields;
         mwSize maxfields;
@@ -90 +91 @@
                 result->SetMatlabField(dataref);
         }
-        
+
+        /*Now, process the patch in the dataref structure, by calling MatlabProcessPatch.m 
+         *on the current dataref structure: */
+        mexCallMATLAB(1,&processeddataref,1,&dataref, "MatlabProcessPatch");
+
         /*Assign output pointers:*/
-        *pdataref=dataref;
-
+        *pdataref=processeddataref;
 }
 #endif

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

@@ -24 +24 @@
                 SpawnCoreSerial(responses, numresponses, variables, variables_descriptors,numvariables, (mxArray*)femmodel, counter);
         #else
-
                 /*Call SpawnCoreParallel unless counter=-1 on cpu0, in which case, bail out and return 0: */
                 MPI_Bcast(&counter,1,MPI_INT,0,MPI_COMM_WORLD); 
                 if(counter==-1)return 0;
-
                 SpawnCoreParallel(responses, numresponses, variables, variables_descriptors,numvariables, (FemModel*)femmodel,counter);
         #endif
-
         return 1;
 }

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

@@ -46 +46 @@
         int      dummy;
         int      solution_type;
+        void (*solutioncore)(FemModel*)    = NULL;
 
         /*synchronize all cpus, as CPU 0 is probably late (it is starting the entire dakota strategy!) : */
@@ -54 +55 @@
         femmodel->parameters->FindParam(&verbose,VerboseEnum);
         femmodel->parameters->FindParam(&responses_descriptors,&dummy,ResponseDescriptorsEnum);
+        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
         /* only cpu 0, running dakota is providing us with variables and variables_descriptors and numresponses: broadcast onto other cpus: */
@@ -59 +61 @@
 
         /*Modify core inputs in objects contained in femmodel, to reflect the dakota variables inputs: */
-        InputUpdateFromDakotax(femmodel,variables,variables_descriptors,numvariables);
+        InputUpdateFromDakotax(femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,variables,variables_descriptors,numvariables);
 
-        /*Run the analysis core solution sequence: */
-        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        /*Run the core solution sequence: */
         if(verbose)_printf_("%s%s%s\n","Starting ",EnumAsString(solution_type)," core:");
-        switch(solution_type){
-                case DiagnosticAnalysisEnum:
-                        diagnostic_core(femmodel);
-                        break;
-                case ThermalAnalysisEnum:
-                        thermal_core(femmodel);
-                        break;
-                case PrognosticAnalysisEnum:
-                        prognostic_core(femmodel);
-                        break;
-                case Transient2DAnalysisEnum:
-                        transient2d_core(femmodel);
-                        break;
-                case Transient3DAnalysisEnum:
-                        transient3d_core(femmodel);
-                default:
-                        ISSMERROR("%s%s%s"," solution_type: ",EnumAsString(solution_type),", not supported yet!");
-                        break;
-        }
+        SolutionConfiguration(NULL,NULL,&solutioncore); solution_core(femmodel);
 
         /*compute responses: */
         if(verbose)_printf_("compute dakota responses:\n");
-        DakotaResponses(responses,responses_descriptors,numresponses,femmodel);
+        DakotaResponsesx(responses,femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters,responses_descriptors,numresponses,);
 
         /*Free ressources:*/

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

@@ -31 +31 @@
 
         //mexCallMATLAB arrays
-        mxArray* array[7];
+        mxArray* array[5];
 
         //output from SpawnCore in matlab routine.

issm/trunk/src/c/solutions/SolutionConfiguration.cpp

@@ -145 +145 @@
         
         /*Assign output pointers:*/
-        *pnumanalyses=numanalyses;
-        *panalyses=analyses;
-        *psolutioncore=solutioncore;
+        if(pnumanalyses) *pnumanalyses=numanalyses;
+        if(panalyses)*panalyses=analyses;
+        else xfree((void**)&analyses);
+        if(psolutioncore)*psolutioncore=solutioncore;
 
 }

issm/trunk/src/m/classes/public/parseresultsfromdisk.m

@@ -29 +29 @@
 
 %process patch if necessary
-results=ProcessPatch(results);
+results=MatlabProcessPatch(results);
 
 fclose(fid);

issm/trunk/src/m/classes/public/solve.m

@@ -53 +53 @@
 
 %Launch correct solution sequence
-md=issm(md);
+md=issm(md,md.analysis_type);
 
 %post processes qmu results if necessary

issm/trunk/src/m/solutions/MatlabProcessPatch.m

@@ -1 @@
-function structure=ProcessPatch(structure);
+function structure=MatlabProcessPatch(structure);
 %PROCESSPATCH - create a structure from a patch
 %

issm/trunk/src/m/solutions/SpawnCore.m

@@ -6 +6 @@
 %
 
-%recover parameters
+%retrieve parameters
 verbose=femmodel.parameters.Verbose;
 responsedescriptors=femmodel.parameters.responsedescriptors; 
-npart=femmodel.parameters.qmu_npart;
-part=femmodel.parameters.qmu_part+1; %C indexing
-numberofnodes=femmodel.parameters.NumberOfNodes;
+solution_type=femmodel.parameters.SolutionType;
 
 displaystring(verbose,'%s%i',['   qmu iteration:'],counter);
 
 %first update the inputs to the femmodel using the variables provided to us by dakota.
-count=1;
-while count<=numel(variables)
-        
-        descriptor=variabledescriptors{count};
-        if ~qmuisdistributed(descriptor),
-                inputs=add(inputs,descriptor,variables(count),'double');
-
-                count=count+1;
-        else
-                root=qmuroot(descriptor);
-                param=femmodel.parameters.(root);
-
-                %next npart values in variables are partition values for this param, collect them.
-                partition=variables(count:count+npart-1);
-
-                %update parameter:
-                param=param.*partition(part);
-
-                %add parameter to inputs
-                inputs=add(inputs,root,param,'doublevec',1,numberofnodes);
-
-                %skip next npart iterations, they all deal with the same parameter descriptor
-                count=count+npart;
-        end
-end
-
+[femmodel.elements femmodel.loads]=InputUpdateFromDakota(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,variables,variabledescriptors);
 
 %now run the core solution
-if analysis_type==DiagnosticAnalysisEnum(),
-
-        results=diagnostic_core(femmodel);
-
-else
-        error(['SpawnCore error message: could not find core solutoin for analysis type: ' analysis_type]);
-end
-
-%process results
-processedresults=processresults(femmodel,results);
+[dummy,dummy,solutioncore]=SolutionConfiguration(solution_type);
+eval(['femmodel=' solutioncore '(femmodel);']);
 
 %now process the results to get response function values
@@ -59 +24 @@
 for i=1:numel(responsedescriptors),
         descriptor=responsedescriptors{i};
-        responses(i)=qmuresponse(femmodel,results,processedresults,descriptor);
+        responses(i)=qmuresponse(femmodel,descriptor);
 end

issm/trunk/src/m/solutions/issm.m

@@ -1 @@
-function md=issm(md);
+function md=issm(md,solution_type);
 %ISSM - ISSM main parallel program
 %
@@ -7 +7 @@
         %timing
         t1=clock;
-
-        solution_type=md.analysis_type;
 
         %out of solution_type, figure out solution core function pointer, and types of analyses needed:
@@ -36 +34 @@
                 
                 displaystring(verbose,'%s',['write results'])
-                results=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
-                md.results.(EnumAsString(solution_type))=ProcessPatch(results);
+                md.results.(EnumAsString(solution_type))=OutputResults(femmodel.elements, femmodel.nodes , femmodel.vertices , femmodel.loads , femmodel.materials, femmodel.parameters, femmodel.results);
         else
                 %launch dakota driver for diagnostic core solution

issm/trunk/src/mex/Makefile.am

@@ -66 +66 @@
                                 TriMeshRefine\
                                 InputUpdateFromConstant\
+                                InputUpdateFromDakota\
                                 InputUpdateFromSolution\
                                 InputUpdateFromVector\
@@ -278 +279 @@
                           InputUpdateFromConstant/InputUpdateFromConstant.h
 
+InputUpdateFromDakota_SOURCES = InputUpdateFromDakota/InputUpdateFromDakota.cpp\
+                          InputUpdateFromDakota/InputUpdateFromDakota.h
+
 InputUpdateFromSolution_SOURCES = InputUpdateFromSolution/InputUpdateFromSolution.cpp\
                           InputUpdateFromSolution/InputUpdateFromSolution.h