Changeset 6005

Timestamp:

09/23/10 16:16:14 (15 years ago)

Author:

Eric.Larour

Message:

Implementing a new petscoptions class, that pulls together option strings
for each analysis type, that will be fed to the Petsc library on a per analysis
basis. Everthing implemented up to marshall. Still need to update ModelProcessor,
and SetConfigurationType, etc ...

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/objects/IoModel.cpp (modified) (3 diffs)
• c/objects/IoModel.h (modified) (1 diff)
• c/objects/Loads/Icefront.h (modified) (1 diff)
• c/toolkits/petsc/patches/NewMat.cpp (modified) (1 diff)
• m/classes/@model/model.m (modified) (1 diff)
• m/classes/@model/setdefaultparameters.m (modified) (1 diff)
• m/classes/petscoptions.m (added)
• m/clusters/astrid.m (modified) (1 diff)
• m/model/PetscOptions2PetscRc.m (modified) (4 diffs)
• m/model/marshall.m (modified) (1 diff)
• m/model/petscoptiontostring.m (added)
• m/model/presolve.m (modified) (1 diff)
• m/model/solvers/asmoptions.m (added)
• m/model/solvers/mumpsoptions.m (added)
• m/utils/OS/oshostname.m (modified) (1 diff)
• mex/SystemMatrices/SystemMatrices.h (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -64 +64 @@
         parameters->AddObject(new DoubleParam(ViscosityOvershootEnum,iomodel->viscosity_overshoot));
         parameters->AddObject(new BoolParam(WaitOnLockEnum,iomodel->waitonlock));
-        parameters->AddObject(new StringParam(PetscRcEnum,iomodel->petscrc));
         parameters->AddObject(new IntParam(NumberOfElementsEnum,iomodel->numberofelements));
         parameters->AddObject(new BoolParam(KffEnum,iomodel->kff));

issm/trunk/src/c/objects/IoModel.cpp

@@ -48 +48 @@
                 xfree((void**)&this->gridonpattyn);
         }
-        xfree((void**)&this->petscrc);
+        xfree((void**)&this->numpetscoptions);
         xfree((void**)&this->elementonbed);
         xfree((void**)&this->elementonsurface);
@@ -182 +182 @@
         IoModelFetchData(&this->connectivity,iomodel_handle,"connectivity");
         IoModelFetchData(&this->lowmem,iomodel_handle,"lowmem");
-        IoModelFetchData(&this->petscrc,iomodel_handle,"petscrc");
+        IoModelFetchData(&this->numpetscoptions,iomodel_handle,"numpetscoptions");
         IoModelFetchData(&this->viscosity_overshoot,iomodel_handle,"viscosity_overshoot");
         IoModelFetchData(&this->artdiff,iomodel_handle,"artificial_diffusivity");
@@ -227 +227 @@
         this->control_analysis=0;
         this->control_parameter=NULL;
-        this->petscrc=NULL;
+        this->numpetscoptions=NULL;
         this->numberofvariables=0;
         this->numvariabledescriptors=0;

issm/trunk/src/c/objects/IoModel.h

@@ -22 +22 @@
                 int     qmu_analysis;
                 int     control_analysis;
-                char*   petscrc;
+                char*   numpetscoptions;
 
                 /*2d mesh: */

issm/trunk/src/c/objects/Loads/Icefront.h

@@ -88 +88 @@
                 /*}}}*/
 };
-
 #endif  /* _ICEFRONT_H_ */

issm/trunk/src/c/toolkits/petsc/patches/NewMat.cpp

@@ -94 +94 @@
         /*preallocation  according to type: */
         MatGetType(outmatrix,&type);
-        if(strcmp(type,"mpiaij")==0){
+        if((strcmp(type,"mpiaij")==0) || (strcmp(type,"aijmumps")==0)){
+                printf("here\n");
                 MatMPIAIJSetPreallocation(outmatrix,d_nz,NULL,o_nz,NULL);
         }

issm/trunk/src/m/classes/@model/model.m

@@ -266 +266 @@
         %PETSc and MATLAB solver string
         md.petscoptions=NaN;
-        md.petscrc='';
+        md.numpetscoptions=1;
 
         %Analysis and sub_analysis

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -235 +235 @@
 md.alloc_cleanup=1;
 
-%set petsc options cell array, so that PETSC uses the correct solvers
-md=solversettomumps(md);
+%set petsc options for different analysis
+md.petscoptions=petscoptions;
+md.petscoptions=addoptions(md.petscoptions,DiagnosticHorizAnalysisEnum,asmoptions);
+md.petscoptions=addoptions(md.petscoptions,DiagnosticVertAnalysisEnum,mumpsoptions);
+md.numpetscoptions=3; %don't forget the default analysis!
 
 %solution speed-up

issm/trunk/src/m/clusters/astrid.m

@@ -9 +9 @@
     properties (SetAccess=public) 
                  % {{{1
-                 name='astrid'
+                 name='astrid';
                  login='larour';
                  np=15;

issm/trunk/src/m/model/PetscOptions2PetscRc.m

@@ -3 +3 @@
 %
 % Usage:     petscstring=PetscOptions2PetscRc(petscoptions,filename);
+%            petscstring=PetscOptions2PetscRc(petscoptions);
 %
 % Example:   md.petscsrc=PetscOptions2PetscRc(md.petscoptions,'petsc.rc');
@@ -9 +10 @@
 
 
-%open file for writing
-fid=fopen(filename,'w');
-if fid==-1,
-        error(['PetscOptions2PetscRc error: could not open ' filename ' for writing']);
+if nargin==2,
+        %open file for writing
+        fid=fopen(filename,'w');
+        if fid==-1,
+                error(['PetscOptions2PetscRc error: could not open ' filename ' for writing']);
+        end
+
+        %write header
+        fprintf(fid,'%s%s%s\n\n','%Petsc options file: ',filename,' written from Matlab petscoptions array');
 end
-
-%write header
-fprintf(fid,'%s%s%s\n\n','%Petsc options file: ',filename,' written from Matlab petscoptions array');
 
 %initialize petscstring: 
@@ -28 +31 @@
         elseif length(option)==1,
                 %this option has only one argument
-                fprintf(fid,'-%s\n',option{1});
+                if(nargin==2),
+                        fprintf(fid,'-%s\n',option{1});
+                end
                 petscstring=[petscstring ' -' option{1}];
         elseif length(option)==2,
                 %option with value. value can be string or scalar
                 if isscalar(option{2}),
-                        fprintf(fid,'-%s %g\n',option{1},option{2});
+                        if(nargin==2),
+                                fprintf(fid,'-%s %g\n',option{1},option{2});
+                        end
                         petscstring=[petscstring ' -' option{1} ' ' num2str(option{2})];
                 elseif ischar(option{2}),
-                        fprintf(fid,'-%s %s\n',option{1},option{2});
+                        if(nargin==2),
+                                fprintf(fid,'-%s %s\n',option{1},option{2});
+                        end
                         petscstring=[petscstring ' -' option{1} ' ' option{2}];
                 else
@@ -44 +53 @@
                 error(['PetscOptions2PetscRc error: option #' num2str(i) ' is not well formatted']);
         end
-
 end

issm/trunk/src/m/model/marshall.m

@@ -180 +180 @@
 WriteData(fid,md.outputfilename,'String','outputfilename');
 
+%petsc options:
+WriteData(fid,md.numpetscoptions,'Integer','numpetscoptions');
+WriteData(fid,md.petscoptions.analyses,'Mat','petscoptionsanalyses');
+for i=1:md.numpetscoptions,
+        WriteData(fid,md.petscoptions.strings{i},'String',['petscoptionsstrings_' num2str(i-1)]);
+end
+
 %close file
 st=fclose(fid);

issm/trunk/src/m/model/presolve.m

@@ -34 +34 @@
 end
 
-%deal with petsc options
-md.petscrc=PetscOptions2PetscRc(md.petscoptions,[md.name '.petsc']);
+%package together petscoptions: 
+md.petscoptions=marshall(md.petscoptions);
+md.numpetscoptions=size(md.petscoptions.analyses,1);

issm/trunk/src/m/utils/OS/oshostname.m

@@ -21 +21 @@
         hostname=ddewhite(hostname);
 end
+
+hostname='ericmac';

issm/trunk/src/mex/SystemMatrices/SystemMatrices.h

@@ -36 +36 @@
 #define PF   (mxArray**)&plhs[4]
 #define KMAX (mxArray**)&plhs[5]
+#define KMAX (mxArray**)&plhs[2]
 
 /* serial arg counts: */