Changeset 24186

Timestamp:

09/30/19 13:45:59 (6 years ago)

Author:

schlegel

Message:

CHG: add option for matrix elements in dakota

Location:

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

Files:

• Penta.cpp (modified) (2 diffs)
• Tria.cpp (modified) (2 diffs)

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

@@ -4365 +4365 @@
         TransientInput *transientinput = NULL;
         IssmDouble      values[6];
+        IssmDouble      value;
 
         /*Check that name is an element input*/
@@ -4386 +4387 @@
                                 if(t==0) transientinput=new TransientInput(name);
                                 transientinput->AddTimeInput(new PentaInput(name,values,P1Enum),time);
+                                transientinput->Configure(parameters);
+                        }
+                        this->inputs->AddInput(transientinput);
+                        break;
+
+                case ElementEnum:
+                        /*Get value for the element: */
+                        for(t=0;t<ncols;t++){ //ncols is the number of times
+                                value=matrix[ncols*(this->Sid())+t];
+
+                                /*time:*/
+                                time=matrix[(nrows-1)*ncols+t];
+
+                                if(t==0) transientinput=new TransientInput(name);
+                                transientinput->AddTimeInput(new PentaInput(name,&value,P0Enum),time);
                                 transientinput->Configure(parameters);
                         }

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

@@ -5838 +5838 @@
         TransientInput *transientinput = NULL;
         IssmDouble      values[3];
+        IssmDouble      value;
 
         /*Check that name is an element input*/
@@ -5859 +5860 @@
                                 if(t==0) transientinput=new TransientInput(name);
                                 transientinput->AddTimeInput(new TriaInput(name,values,P1Enum),time);
+                                transientinput->Configure(parameters);
+                        }
+                        this->inputs->AddInput(transientinput);
+                        break;
+
+                case ElementEnum:
+                        /*Get value for the element: */
+                        for(t=0;t<ncols;t++){ //ncols is the number of times
+                                value=matrix[ncols*(this->Sid())+t];
+
+                                /*time:*/
+                                time=matrix[(nrows-1)*ncols+t];
+
+                                if(t==0) transientinput=new TransientInput(name);
+                                transientinput->AddTimeInput(new TriaInput(name,&value,P0Enum),time);
                                 transientinput->Configure(parameters);
                         }