Changeset 4453 for issm/trunk/src/mex/TriMesh/TriMesh.cpp

Timestamp:

07/07/10 17:35:32 (15 years ago)

Author:

Eric.Larour

Message:

Fixed some bugs in DakotaResponses and InputUpdateFromDakota modules.
Took out noerr variable in many of the modules.

File:

• issm/trunk/src/mex/TriMesh/TriMesh.cpp (modified) (4 diffs)

issm/trunk/src/mex/TriMesh/TriMesh.cpp

@@ -48 +48 @@
         double** riftsgridsy=NULL;
 
-        /* error handling: */
-        int             noerr=1;        
-  
         /* Triangle structures: */
         struct triangulateio in,out;
@@ -99 +96 @@
         
         /*Start reading the domain outline file: */
-        noerr=DomainOutlineRead(&nprof,&profngrids,&pprofx,&pprofy,domainname);
-        if(!noerr){
+        if(!DomainOutlineRead(&nprof,&profngrids,&pprofx,&pprofy,domainname)){
                 printf("%s%s%s\n",__FUNCT__," error message reading domain outline ",domainname);
                 mexErrMsgTxt(" ");
@@ -107 +103 @@
         /*Read rifts file if present: */
         if(riftname){
-                noerr=DomainOutlineRead(&numrifts,&riftsnumgrids,&riftsgridsx,&riftsgridsy,riftname);
-                if(!noerr){
+                if(!DomainOutlineRead(&numrifts,&riftsnumgrids,&riftsgridsx,&riftsgridsy,riftname)){
                         printf("%s%s%s\n",__FUNCT__," error message reading rifts outline ",riftname);
                         mexErrMsgTxt(" ");
@@ -268 +263 @@
 
         /*Associate elements with segments: */
-        noerr=AssociateSegmentToElement(&segments,out.numberofsegments,index,out.numberoftriangles);
+        AssociateSegmentToElement(&segments,out.numberofsegments,index,out.numberoftriangles);
 
         /*Order segments so that their normals point outside the domain: */