Changeset 15862

Timestamp:

08/21/13 16:04:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: indexingupdate needs to be turned to true if Node::DofInFSet or Node::DofInSSet is called

Location:

issm/trunk-jpl/src/c/classes

Files:

• Constraints/SpcTransient.cpp (modified) (2 diffs)
• Node.cpp (modified) (3 diffs)

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

@@ -101 +101 @@
 void SpcTransient::ConstrainNode(Nodes* nodes,Parameters* parameters){
 
-        Node* node=NULL;
-        IssmDouble time=0;
-        int    i;
-        IssmDouble alpha=-1;
-        IssmDouble value;
-        bool   found=false;
+        Node       *node  = NULL;
+        IssmDouble  time  = 0.;
+        int         i;
+        IssmDouble  alpha = -1.;
+        IssmDouble  value;
+        bool        found = false;
 
         /*Chase through nodes and find the node to which this SpcTransient applys: */
@@ -140 +140 @@
                 /*Apply or relax constraint: */
                 if(xIsNan<IssmDouble>(value)){
+                        printf("-------------- file: SpcTransient.cpp line: %i\n",__LINE__); 
                         node->RelaxConstraint(dof);
                 }

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

@@ -393 +393 @@
         /*Dof should be added to the f-set, and taken out of the s-set:*/
         DofInFSet(dof-1);
-        this->indexing.svalues[dof-1]=NAN;
+        this->indexing.svalues[dof-1]=0.;
 }
 /*}}}*/
@@ -454 +454 @@
         _assert_(dof<this->indexing.gsize);
 
-        this->indexing.f_set[dof]=0; //n splits into f (for which we solve) and s (single point constraints)
-        this->indexing.s_set[dof]=1;
+        if(this->indexing.f_set[dof] == 1){
+                this->indexingupdate = true;
+                this->indexing.f_set[dof]=0; //n splits into f (for which we solve) and s (single point constraints)
+                this->indexing.s_set[dof]=1;
+        }
 }
 /*}}}*/
@@ -464 +467 @@
          * to a fixed value during computations. */
 
-        this->indexing.f_set[dof]=1; 
-        this->indexing.s_set[dof]=0;
+        if(this->indexing.f_set[dof] == 0){
+                this->indexingupdate = true;
+                this->indexing.f_set[dof]=1; 
+                this->indexing.s_set[dof]=0;
+        }
 }
 /*}}}*/