Changeset 7515

Timestamp:

02/25/11 15:16:06 (14 years ago)

Author:

Eric.Larour

Message:

Grid on water was not being freezed whenever bedslope solution was run

File:

• issm/trunk/src/c/objects/Node.cpp (modified) (2 diffs)

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

@@ -85 +85 @@
         if (iomodel->numbernodetoelementconnectivity) this->inputs->AddInput(new IntInput(NumberNodeToElementConnectivityEnum,(IssmInt)iomodel->numbernodetoelementconnectivity[io_index]));
         if (analysis_type==DiagnosticHorizAnalysisEnum) this->inputs->AddInput(new IntInput(ApproximationEnum,(IssmInt)iomodel->vertices_type[io_index]));
-
+        
         /*set single point constraints: */
+
+        /*spc all nodes on water*/
+        if (!iomodel->gridonwater) _error_("iomodel->gridonwater is NULL");
+        if (iomodel->gridonwater[io_index]){
+                for(k=1;k<=gsize;k++){
+                        this->FreezeDof(k);
+                }
+        }
 
         /*Diagnostic Horiz*/
@@ -115 +123 @@
                         }
                 }
-                /*spc all nodes on water*/
-                if (!iomodel->gridonwater) _error_("iomodel->gridonwater is NULL");
-                if (iomodel->gridonwater[io_index]){
-                        for(k=1;k<=gsize;k++){
-                                this->FreezeDof(k);
-                        }
-                }
+                
         }