Changeset 23533

Timestamp:

12/11/18 14:00:26 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed numbering

Location:

issm/trunk-jpl/src/c

Files:

• classes/Constraints/Constraints.cpp (modified) (1 diff)
• classes/Constraints/Constraints.h (modified) (1 diff)
• modules/ModelProcessorx/CreateNodes.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp

@@ -31 +31 @@
 }
 /*}}}*/
-int  Constraints::NumberOfConstraints(void){/*{{{*/
-
-        int localconstraints;
-        int numberofconstraints;
-
-        /*Get number of local constraints*/
-        localconstraints=this->Size();
-
-        /*figure out total number of constraints combining all the cpus (no clones here)*/
-        ISSM_MPI_Reduce(&localconstraints,&numberofconstraints,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() );
-        ISSM_MPI_Bcast(&numberofconstraints,1,ISSM_MPI_INT,0,IssmComm::GetComm());
-
-        return numberofconstraints;
-}
-/*}}}*/

issm/trunk-jpl/src/c/classes/Constraints/Constraints.h

@@ -28 +28 @@
                 /*numerics*/
                 void ActivatePenaltyMethod(int in_analysis);
-                int  NumberOfConstraints(void);
-
 };
 

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

@@ -215 +215 @@
                         for(i=0;i<iomodel->numberofelements;i++){
                                 if(iomodel->my_elements[i]){
-                                        nodes->AddObject(new Node(id0+i+1,id0-i,lid++,0,iomodel,analysis,approximation));
+                                        nodes->AddObject(new Node(id0+i+1,id0+i,lid++,0,iomodel,analysis,approximation));
                                 }
                         }
@@ -532 +532 @@
                         for(i=0;i<iomodel->numberofelements;i++){
                                 if(iomodel->my_elements[i]){
-                                        nodes->AddObject(new Node(id0+i+1,id0-i,lid++,0,iomodel,analysis,FSvelocityEnum));
+                                        nodes->AddObject(new Node(id0+i+1,id0+i,lid++,0,iomodel,analysis,FSvelocityEnum));
                                 }
                         }
@@ -547 +547 @@
                                 if(iomodel->my_elements[i]){
                                         for(j=0;j<elementnbv;j++){
-                                                nodes->AddObject(new Node(vnodes+elementnbv*i+j+1,vnodes-elementnbv*i+j,lid++,iomodel->elements[+elementnbv*i+j]-1,iomodel,analysis,FSpressureEnum));
+                                                nodes->AddObject(new Node(vnodes+elementnbv*i+j+1,vnodes+elementnbv*i+j,lid++,iomodel->elements[+elementnbv*i+j]-1,iomodel,analysis,FSpressureEnum));
 
                                         }
@@ -588 +588 @@
                         for(i=0;i<iomodel->numberofelements;i++){
                                 if(iomodel->my_elements[i]){
-                                        nodes->AddObject(new Node(id0+i+1,id0-i,lid++,0,iomodel,analysis,FSvelocityEnum));
+                                        nodes->AddObject(new Node(id0+i+1,id0+i,lid++,0,iomodel,analysis,FSvelocityEnum));
                                 }
                         }