Changeset 22822 for issm/trunk/src/c/classes/Elements/Element.cpp

Timestamp:

05/31/18 10:44:24 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22820

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/classes/Elements/Element.cpp (modified) (3 diffs)

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

@@ -1400 +1400 @@
                 parameters->FindParam(&N,NULL,ControlInputSizeNEnum);
                 parameters->FindParam(&M,NULL,ControlInputSizeMEnum);
-                if(control_index>0) for(int n=0;n<control_index-1;n++) start+=N[n]*M[n];
+                if(control_index>0) {
+                        for(int n=0;n<control_index;n++){
+                                start+=N[n]*M[n];
+                        }
+                }
 
                 for(int n=0;n<N[control_index];n++){
@@ -1662 +1666 @@
             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);
@@ -1671 +1675 @@
                                                 values_min[i] = min_vector[N*(vertexids[i]-1)+t];
                                                 values_max[i] = max_vector[N*(vertexids[i]-1)+t];
-                                         } 
+                                         }
                                         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));
                                                                 break;
                     case PentaEnum:
-                                                                        values_input->AddTimeInput(new PentaInput(ControlInputValuesEnum,values,P1Enum)); 
+                                                                        values_input->AddTimeInput(new PentaInput(input_enum,values,P1Enum)); 
                                                                         mins_input->AddTimeInput(new PentaInput(ControlInputMinsEnum,values_min,P1Enum)); 
                                                                         maxs_input->AddTimeInput(new PentaInput(ControlInputMaxsEnum,values_max,P1Enum)); 
                                                                         break;
                     case TetraEnum:
-                                                                        values_input->AddTimeInput(new TetraInput(ControlInputValuesEnum,values,P1Enum)); 
+                                                                        values_input->AddTimeInput(new TetraInput(input_enum,values,P1Enum)); 
                                                                         mins_input->AddTimeInput(new TetraInput(ControlInputMinsEnum,values_min,P1Enum)); 
                                                                         maxs_input->AddTimeInput(new TetraInput(ControlInputMaxsEnum,values_max,P1Enum));