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

Timestamp:

11/21/19 14:07:14 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: more cleanup

File:

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

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

@@ -707 +707 @@
         switch(this->ObjectEnum()){
         case TriaEnum:
-                this->inputs->AddInput(new TriaInput(SmbMassBalanceSubstepEnum,&smb[0],P1Enum));
-                this->inputs->AddInput(new TriaInput(SmbRunoffSubstepEnum,&runoff[0],P1Enum));
+                this->AddInput2(SmbMassBalanceSubstepEnum,&smb[0],P1Enum);
+                this->AddInput2(SmbRunoffSubstepEnum,&runoff[0],P1Enum);
                 break;
         case PentaEnum:
-                this->inputs->AddInput(new PentaInput(SmbMassBalanceSubstepEnum,&smb[0],P1Enum));
-                this->inputs->AddInput(new PentaInput(SmbRunoffSubstepEnum,&runoff[0],P1Enum));
-                this->InputExtrude(SmbMassBalanceSubstepEnum,-1);
-                this->InputExtrude(SmbRunoffSubstepEnum,-1);
-                break;
-        case TetraEnum:
-                this->inputs->AddInput(new TetraInput(SmbMassBalanceSubstepEnum,&smb[0],P1Enum));
-                this->inputs->AddInput(new TetraInput(SmbRunoffSubstepEnum,&runoff[0],P1Enum));
+                this->AddInput2(SmbMassBalanceSubstepEnum,&smb[0],P1Enum);
+                this->AddInput2(SmbRunoffSubstepEnum,&runoff[0],P1Enum);
                 this->InputExtrude(SmbMassBalanceSubstepEnum,-1);
                 this->InputExtrude(SmbRunoffSubstepEnum,-1);
@@ -1914 +1908 @@
                         }
                 }
-                this->inputs->AddInput(new ControlInput(input_enum,TransientInputEnum,values_input,mins_input,maxs_input,grad_input,P1Enum,id));
+                //this->inputs->AddInput(new ControlInput(input_enum,TransientInputEnum,values_input,mins_input,maxs_input,grad_input,P1Enum,id));
                 xDelete<IssmDouble>(times);
         }
@@ -2027 +2021 @@
                                 }
                         }
-                        //datasetinput->AddInput(transientinput,input_id);
                         xDelete<IssmDouble>(times);
                 }
@@ -2041 +2034 @@
                         for(t=0;t<N;t++) layers[t] = vector[N*this->Sid()+t];
                         DoubleArrayInput* arrayinput=new DoubleArrayInput(input_enum,layers,N);
-                        //datasetinput->AddInput(arrayinput,input_id);
                         xDelete<IssmDouble>(layers);
                 }