Changeset 24375

Timestamp:

11/21/19 13:59:04 (5 years ago)

Author:

Mathieu Morlighem

Message:

DEL: cleaning up old inputs

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Element.cpp (modified) (2 diffs)
• Elements/Element.h (modified) (2 diffs)
• Radar.cpp (modified) (2 diffs)

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

@@ -49 +49 @@
 
 /*Other*/
-void       Element::AddInput(Input* input_in){/*{{{*/
-
-        /*Call inputs method*/
-        _assert_(this->inputs);
-        this->inputs->AddInput(input_in);
-}/*}}}*/
 void       Element::ComputeLambdaS(){/*{{{*/
 
@@ -1735 +1729 @@
         return this->id;
 
-}
-/*}}}*/
-void       Element::InputChangeName(int original_enum,int new_enum){/*{{{*/
-        this->inputs->ChangeEnum(original_enum,new_enum);
 }
 /*}}}*/

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

@@ -62 +62 @@
 
                 /*Functions*/
-                void               AddInput(Input* input_in);
                 /*bool               AllActive(void);*/
                 /*bool               AnyActive(void);*/
@@ -133 +132 @@
                 IssmDouble         IceVolumeAboveFloatation(IssmDouble* mask, bool scaled);
                 int                Id();
-                void               InputChangeName(int enum_type,int enum_type_old);
                 void               InputCreate(IssmDouble* vector,Inputs2* inputs2,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code);
                 void               ControlInputCreate(IssmDouble* doublearray,IssmDouble* independents_min,IssmDouble* independents_max,Inputs2*inputs2,IoModel* iomodel,int M,int N,IssmDouble scale,int input_enum,int id);

issm/trunk-jpl/src/c/classes/Radar.cpp

@@ -188 +188 @@
 
                 /*Add Attenuation rate results into inputs*/
-           element->AddInput(new PentaInput(RadarAttenuationMacGregorEnum,&attenuation_rate_macgregor[0],P1Enum));
-                element->AddInput(new PentaInput(RadarAttenuationWolffEnum,&attenuation_rate_wolff[0],P1Enum));
+           element->AddInput2(RadarAttenuationMacGregorEnum,&attenuation_rate_macgregor[0],P1Enum);
+                element->AddInput2(RadarAttenuationWolffEnum,&attenuation_rate_wolff[0],P1Enum);
 
                 /*Clean up*/
@@ -270 +270 @@
 
             /*Add power results into inputs*/
-                        element->AddInput(new PentaInput(RadarPowerMacGregorEnum,&power_M07[0],P1Enum));
-                        element->AddInput(new PentaInput(RadarPowerWolffEnum,&power_W97[0],P1Enum));
+                        element->AddInput(RadarPowerMacGregorEnum,&power_M07[0],P1Enum);
+                        element->AddInput(RadarPowerWolffEnum,&power_W97[0],P1Enum);
 
                 /*Clean up and return*/