Changeset 15670

Timestamp:

08/01/13 11:28:17 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not change time unit in dakota input update

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (5 diffs)
• Tria.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -6208 +6208 @@
                         switch(name){
                                 case ThicknessEnum:
-                                        /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{*/
+                                        /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium*/
                                         IssmDouble  thickness[6];
                                         IssmDouble  thickness_init[6];
@@ -6274 +6274 @@
                                         this->inputs->AddInput(new PentaInput(SurfaceEnum,surface,P1Enum));
 
-                                        /*}}}*/
                                         break;
                                 default:
@@ -6300 +6299 @@
 void  Penta::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){
 
-        int i,j,t;
-        TransientInput* transientinput=NULL;
-        IssmDouble values[6];
-        IssmDouble time;
-        int row;
-        IssmDouble yts;
+        int             i,t,row;
+        IssmDouble      time;
+        TransientInput *transientinput = NULL;
+        IssmDouble      values[6];
 
         /*Check that name is an element input*/
@@ -6313 +6310 @@
 
                 case VertexEnum:
-
                         /*Create transient input: */
-
-                        parameters->FindParam(&yts,ConstantsYtsEnum);
-
                         for(t=0;t<ncols;t++){ //ncols is the number of times
 
@@ -6323 +6316 @@
                                 for(i=0;i<6;i++){
                                         row=this->vertices[i]->Sid();
-                                        values[i]=(IssmDouble)matrix[ncols*row+t];
+                                        values[i]=matrix[ncols*row+t];
                                 }
 
-                                /*time? :*/
-                                time=(IssmDouble)matrix[(nrows-1)*ncols+t]*yts;
+                                /*time:*/
+                                time=matrix[(nrows-1)*ncols+t];
 
                                 if(t==0) transientinput=new TransientInput(name);

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -6819 +6819 @@
 void  Tria::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols, int name, int type){
 
-        int i,j,t;
-        TransientInput* transientinput=NULL;
-        IssmDouble values[3];
-        IssmDouble time;
-        int row;
-        IssmDouble yts;
+        int             i,t,row;
+        IssmDouble      time;
+        TransientInput *transientinput = NULL;
+        IssmDouble      values[3];
 
         /*Check that name is an element input*/
@@ -6832 +6830 @@
 
                 case VertexEnum:
-
                         /*Create transient input: */
-
-                        parameters->FindParam(&yts,ConstantsYtsEnum);
                         for(t=0;t<ncols;t++){ //ncols is the number of times
 
@@ -6841 +6836 @@
                                 for(i=0;i<3;i++){
                                         row=this->vertices[i]->Sid();
-                                        values[i]=(IssmDouble)matrix[ncols*row+t];
+                                        values[i]=matrix[ncols*row+t];
                                 }
 
-                                /*time? :*/
-                                time=(IssmDouble)matrix[(nrows-1)*ncols+t]*yts;
+                                /*time:*/
+                                time=matrix[(nrows-1)*ncols+t];
 
                                 if(t==0) transientinput=new TransientInput(name);