Changeset 15306

Timestamp:

06/21/13 16:39:07 (12 years ago)

Author:

Mathieu Morlighem

Message:

FIX: matrix allocation for 2d/3d couplings. nodes at the base are connected with nodes of other layers

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Penta.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• toolkits/petsc/objects/PetscMat.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2775 +2775 @@
                                 default: _error_("not supported");
                         }
+                }
+        }
+
+        /*Special case: 2d/3d coupling, the node of this element might be connected
+         *to the basal element*/
+        int analysis_type,approximation,numlayers;
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        if(analysis_type==DiagnosticHorizAnalysisEnum){
+                inputs->GetInputValue(&approximation,ApproximationEnum);
+                if(approximation==MacAyealPattynApproximationEnum || approximation==MacAyealStokesApproximationEnum){
+                        parameters->FindParam(&numlayers,MeshNumberoflayersEnum);
+                        o_nz += numlayers*3;
+                        d_nz += numlayers*3;
                 }
         }

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

@@ -86 +86 @@
         parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofelementsEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofverticesEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MeshNumberoflayersEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsResultsAsPatchesEnum));

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp

@@ -179 +179 @@
         PetscErrorCode ierr;
         ierr = MatSetValues(this->matrix,m,idxm,n,idxn,values,ISSMToPetscInsertMode(mode));
-        //if(ierr) _error_("PETSC's MatSetValues reported an error");
+        if(ierr) _error_("PETSC's MatSetValues reported an error");
 
 }