Changeset 4525

Timestamp:

07/12/10 10:54:50 (15 years ago)

Author:

Eric.Larour

Message:

New matlab solver

Location:

issm/trunk

Files:

• src/m/classes/public/solversettomatlab.m (added)
• src/m/solutions/SpawnCore.m (modified) (2 diffs)
• src/mex/DakotaResponses/DakotaResponses.cpp (modified) (1 diff)
• src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp (modified) (1 diff)
• src/mex/Qmu/Qmu.cpp (modified) (1 diff)
• src/mex/Solver/Solver.cpp (modified) (2 diffs)
• test/Verification/test25_IceSheetIceFrontM2dDakota/Square.par (modified) (1 diff)

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

@@ -11 +11 @@
 solution_type=femmodel.parameters.SolutionType;
 
-displaystring(verbose,'%s%i',['   qmu iteration:'],counter);
+displaystring(1,'%s%i',['   qmu iteration:'],counter);
 
 %first update the inputs to the femmodel using the variables provided to us by dakota.
@@ -21 +21 @@
 
 %now process the results to get response function values
-responses=zeros(numel(responsedescriptors),1);
-for i=1:numel(responsedescriptors),
-        descriptor=responsedescriptors{i};
-        responses(i)=qmuresponse(femmodel,descriptor);
-end
+responses=DakotaResponses(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,responsedescriptors);

issm/trunk/src/mex/DakotaResponses/DakotaResponses.cpp ¶

@@ -43 +43 @@
                 pfield=mxGetCell(RESPONSESDESCRIPTORS,i);
                 stringlength = (mxGetM(pfield) * mxGetN(pfield) * sizeof(mxChar)) + 1 ;
+                string=(char*)xmalloc(stringlength);
                 mxGetString(pfield,string,stringlength);
-                
                 responses_descriptors[i]=string;
         }

issm/trunk/src/mex/InputUpdateFromDakota/InputUpdateFromDakota.cpp ¶

@@ -47 +47 @@
                 pfield=mxGetCell(VARIABLESDESCRIPTORS,i);
                 stringlength = (mxGetM(pfield) * mxGetN(pfield) * sizeof(mxChar)) + 1 ;
+                string=(char*)xmalloc(stringlength);
                 mxGetString(pfield,string,stringlength);
 

issm/trunk/src/mex/Qmu/Qmu.cpp ¶

@@ -38 +38 @@
         Qmux(femmodel,parameters);
 
+        /*Free ressources:*/
+        delete parameters;
+
         /*end module: */
         MODULEEND();
+
 
 }

issm/trunk/src/mex/Solver/Solver.cpp ¶

@@ -13 +13 @@
         char* solver_string=NULL;
         Parameters* parameters=NULL;
+                
+        /*Matlab solver: */
+        mxArray* array[2];
+        char* matlabstring="-ksp_type matlab";
 
         /* output datasets: */
@@ -23 +27 @@
         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&SolverUsage);
 
-        /*Input datasets: */
-        FetchData(&Kff,KFF);
-        FetchData(&pf,PF);
-        FetchData(&uf0,UF0);
+        /*First, check solver string: */
         FetchParams(&parameters,PARAMETERS);
         parameters->FindParam(&solver_string,SolverStringEnum);
+        
+        /*Fetch rest of data only if not running the matlab solver: */
+        if (strcmp(solver_string,matlabstring)!=0){
+                /*Input datasets: */
+                FetchData(&Kff,KFF);
+                FetchData(&pf,PF);
+                FetchData(&uf0,UF0);
+        }
 
-        /*!Reduce vector: */
-        Solverx(&uf, Kff, pf, uf0, solver_string);
+        /*Run solver code: */
+        if (strcmp(solver_string,matlabstring)!=0){
+                /*Petsc solver: */
+                Solverx(&uf, Kff, pf, uf0, solver_string);
+        }
+        else{
+                /*Matlab solver: */
+                array[0]=KFF;
+                array[1]=PF;
+                mexCallMATLAB(1,UF,2,array,"\\");
+        }
 
-        /*write output datasets: */
-        WriteData(UF,uf);
+        /*write output datasets if running Petsc solver: */
+        if (strcmp(solver_string,matlabstring)!=0) WriteData(UF,uf);
 
         /*Free ressources: */
-        MatFree(&Kff);
-        VecFree(&pf);
-        VecFree(&uf0);
-        VecFree(&uf);
+        if (strcmp(solver_string,matlabstring)!=0){
+                MatFree(&Kff);
+                VecFree(&pf);
+                VecFree(&uf0);
+                VecFree(&uf);
+                delete parameters;
+        }
         xfree((void**)&solver_string);
-        delete parameters;
 
         /*end module: */

issm/trunk/test/Verification/test25_IceSheetIceFrontM2dDakota/Square.par ¶

@@ -63 +63 @@
 
 md.eps_rel=10^-10; %tighten for qmu analysese
+md.solverstring