Changeset 22794 for issm/trunk-jpl/src/c/classes/Elements/Element.cpp

Timestamp:

05/17/18 14:20:40 (7 years ago)

Author:

erobo

Message:

CHG: added basal melt to IoCodeConversions, added better names to transient inputs for transient controls, fixed bug in controladm1qn3

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (2 diffs)

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

@@ -1662 +1662 @@
             for(int t=0;t<N;t++) times[t] = vector[(M-1)*N+t];
                                 /*Create the three transient inputs for the control input*/
-            TransientInput* values_input=new TransientInput(ControlInputValuesEnum,times,N);
+            TransientInput* values_input=new TransientInput(input_enum,times,N);
                                 TransientInput* mins_input = new TransientInput(ControlInputMinsEnum,times,N);
                                 TransientInput* maxs_input = new TransientInput(ControlInputMaxsEnum,times,N);
@@ -1674 +1674 @@
                                         switch(this->ObjectEnum()){
                     case TriaEnum:
-                                                                        values_input->AddTimeInput(new TriaInput(ControlInputValuesEnum,values,P1Enum)); 
+                                                                        values_input->AddTimeInput(new TriaInput(input_enum,values,P1Enum)); 
                                                                         mins_input->AddTimeInput(new TriaInput(ControlInputMinsEnum,values_min,P1Enum)); 
                                                                         maxs_input->AddTimeInput(new TriaInput(ControlInputMaxsEnum,values_max,P1Enum));