Changeset 19290

Timestamp:

04/21/15 09:19:41 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not change spc from m/yr to m/s, it is already in m/s

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp

@@ -9 +9 @@
 void StressbalanceSIAAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
 
-        /*Intermediary*/
-        int        count;
-        IssmDouble yts;
-        bool       isSIA;
-
         /*Fetch parameters: */
-        iomodel->Constant(&yts,ConstantsYtsEnum);
+        bool isSIA;
         iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
 
@@ -25 +20 @@
 
         /*Initialize conunter*/
-        count=0;
+        int count=0;
 
         /*vx and vy are spc'd if we are not on nodeonSIA: */
@@ -41 +36 @@
                         else{
                                 if (!xIsNan<IssmDouble>(iomodel->Data(StressbalanceSpcvxEnum)[i])){
-                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,iomodel->Data(StressbalanceSpcvxEnum)[i]/yts,StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx.
+                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,0,iomodel->Data(StressbalanceSpcvxEnum)[i],StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 1 to vx.
                                         count++;
                                 }
 
                                 if (!xIsNan<IssmDouble>(iomodel->Data(StressbalanceSpcvyEnum)[i])){
-                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,iomodel->Data(StressbalanceSpcvyEnum)[i]/yts,StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy
+                                        constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,iomodel->Data(StressbalanceSpcvyEnum)[i],StressbalanceSIAAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy
                                         count++;
                                 }