Changeset 16485

Timestamp:

10/21/13 15:41:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

DEL: removing InputToResult, not used anymore

Location:

issm/trunk-jpl/src/c

Files:

• CMakeLists.txt (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (2 diffs)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• classes/Elements/Tria.h (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/FemModel.h (modified) (1 diff)
• modules/InputToResultx (deleted)
• modules/modules.h (modified) (1 diff)

issm/trunk-jpl/src/c/CMakeLists.txt ¶

@@ -73 +73 @@
                           $ENV{ISSM_DIR}/src/c/modules/VecMergex 
                           $ENV{ISSM_DIR}/src/c/modules/Mergesolutionfromftogx 
-                          $ENV{ISSM_DIR}/src/c/modules/InputToResultx 
                           $ENV{ISSM_DIR}/src/c/analyses 
                           $ENV{ISSM_DIR}/src/c/solutionsequences 
@@ -219 +218 @@
                                         ./modules/VecMergex/VecMergex.cpp
                                         ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp
-                                        ./modules/InputToResultx/InputToResultx.cpp
                                         ./analyses/ProcessArguments.cpp
                                         ./analyses/ResetBoundaryConditions.cpp

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -337 +337 @@
                                         ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\
                                         ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\
-                                        ./modules/InputToResultx/InputToResultx.cpp\
-                                        ./modules/InputToResultx/InputToResultx.h\
                                         ./analyses/ProcessArguments.cpp\
                                         ./analyses/ResetBoundaryConditions.cpp\

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

@@ -64 +64 @@
                 virtual void   DeleteResults(void)=0;
                 virtual void   Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finite_element)=0;
-                virtual void   InputToResult(int enum_type,int step,IssmDouble time)=0;
                 virtual void   InputDuplicate(int original_enum,int new_enum)=0;
                 virtual void   InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code)=0;
-                virtual void   RequestedOutput(int output_enum,int step,IssmDouble time)=0;
 
                 virtual int    NodalValue(IssmDouble* pvalue, int index, int natureofdataenum)=0;

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

@@ -2113 +2113 @@
 }
 /*}}}*/
-/*FUNCTION Penta::InputToResult{{{*/
-void  Penta::InputToResult(int enum_type,int step,IssmDouble time){
-
-        Input *input = NULL;
-
-        /*Go through all the input objects, and find the one corresponding to enum_type, if it exists: */
-        if (enum_type==MaterialsRheologyBbarEnum) input=this->material->inputs->GetInput(MaterialsRheologyBEnum);
-        else if (enum_type==DamageDbarEnum) input=this->material->inputs->GetInput(DamageDEnum);
-        else input=this->inputs->GetInput(enum_type);
-        //if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found in penta->inputs"); why error out? if the requested input does not exist, we should still 
-        //try and output whatever we can instead of just failing.
-        if(!input)return;
-
-        /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 
-         * object out of the input, with the additional step and time information: */
-        this->results->AddResult(input->SpawnResult(step,time));
-        #ifdef _HAVE_CONTROL_
-        if(input->ObjectEnum()==ControlInputEnum){
-                if(((ControlInput*)input)->gradient!=NULL) this->results->AddResult(((ControlInput*)input)->SpawnGradient(step,time));
-        }
-        #endif
-}
-/*}}}*/
 /*FUNCTION Penta::InputUpdateFromConstant(bool value, int name);{{{*/
 void  Penta::InputUpdateFromConstant(bool constant, int name){
@@ -2931 +2908 @@
         /*clean-up*/
         delete gauss;
-}
-/*}}}*/
-/*FUNCTION Penta::RequestedOutput{{{*/
-void Penta::RequestedOutput(int output_enum,int step,IssmDouble time){
-        if(IsInput(output_enum)){
-                /*just transfer this input to results, and we are done: */
-                InputToResult(output_enum,step,time);
-        }
-        else{
-                /*this input does not exist, compute it, and then transfer to results: */
-                switch(output_enum){
-                        case BasalFrictionEnum:
-
-                                /*create input: */
-                                BasalFrictionCreateInput();
-
-                                /*transfer to results :*/
-                                InputToResult(output_enum,step,time);
-
-                                /*erase input: */
-                                inputs->DeleteInput(output_enum);
-                                break;
-                        case ViscousHeatingEnum:
-
-                                /*create input: */
-                                ViscousHeatingCreateInput();
-
-                                /*transfer to results :*/
-                                InputToResult(output_enum,step,time);
-
-                                /*erase input: */
-                                inputs->DeleteInput(output_enum);
-                                break;
-
-                        case StressTensorEnum: 
-                                this->ComputeStressTensor();
-                                InputToResult(StressTensorxxEnum,step,time);
-                                InputToResult(StressTensorxyEnum,step,time);
-                                InputToResult(StressTensorxzEnum,step,time);
-                                InputToResult(StressTensoryyEnum,step,time);
-                                InputToResult(StressTensoryzEnum,step,time);
-                                InputToResult(StressTensorzzEnum,step,time);
-                                break;
-
-                        default:
-                                /*do nothing, no need to derail the computation because one of the outputs requested cannot be found: */
-                                break;
-                }
-        }
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h ¶

@@ -98 +98 @@
                 void   InputScale(int enum_type,IssmDouble scale_factor);
 
-                void   InputToResult(int enum_type,int step,IssmDouble time);
-                void   RequestedOutput(int output_enum,int step,IssmDouble time);
                 void   ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results);
                 void   ResultInterpolation(int* pinterpolation,int output_enum);

issm/trunk-jpl/src/c/classes/Elements/Seg.h ¶

@@ -110 +110 @@
                 void        InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");};
                 void        InputScale(int enum_type,IssmDouble scale_factor){_error_("not implemented yet");};
-                void        InputToResult(int enum_type,int step,IssmDouble time){_error_("not implemented yet");};
                 void        DeleteResults(void){_error_("not implemented yet");};
                 void        MaterialUpdateFromTemperature(void){_error_("not implemented yet");};
                 int         NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){_error_("not implemented yet");};
                 void        PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm){_error_("not implemented yet");};
-                void        RequestedOutput(int output_enum,int step,IssmDouble time){_error_("not implemented yet");};
                 void        ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results){_error_("not implemented yet");};
                 void        ResultInterpolation(int* pinterpolation,int output_enum){_error_("not implemented");};

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

@@ -1635 +1635 @@
 }
 /*}}}*/
-/*FUNCTION Tria::InputToResult{{{*/
-void  Tria::InputToResult(int enum_type,int step,IssmDouble time){
-
-        Input *input = NULL;    
-
-        /*Go through all the input objects, and find the one corresponding to enum_type, if it exists: */
-        if (enum_type==MaterialsRheologyBbarEnum || enum_type==DamageDbarEnum)
-         input=this->material->inputs->GetInput(enum_type);
-        else
-         input=this->inputs->GetInput(enum_type);
-        //if (!input) _error_("Input " << EnumToStringx(enum_type) << " not found in tria->inputs");
-        if(!input)return;
-
-        /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result 
-         * object out of the input, with the additional step and time information: */
-        this->results->AddResult(input->SpawnResult(step,time));
-
-        #ifdef _HAVE_CONTROL_
-        if(input->ObjectEnum()==ControlInputEnum){
-                if(((ControlInput*)input)->gradient!=NULL) this->results->AddResult(((ControlInput*)input)->SpawnGradient(step,time));
-        }
-        #endif
-}
-/*}}}*/
 /*FUNCTION Tria::InputUpdateFromConstant(int value, int name);{{{*/
 void  Tria::InputUpdateFromConstant(int constant, int name){
@@ -2611 +2587 @@
         }
 
-
-}
-/*}}}*/
-/*FUNCTION Tria::RequestedOutput{{{*/
-void Tria::RequestedOutput(int output_enum,int step,IssmDouble time){
-
-        if(IsInput(output_enum)){
-                /*just transfer this input to results, and we are done: */
-                InputToResult(output_enum,step,time);
-        }
-        else{
-                /*this input does not exist, compute it, and then transfer to results: */
-                switch(output_enum){
-                        case StressTensorEnum: 
-                                this->ComputeStressTensor();
-                                InputToResult(StressTensorxxEnum,step,time);
-                                InputToResult(StressTensorxyEnum,step,time);
-                                InputToResult(StressTensorxzEnum,step,time);
-                                InputToResult(StressTensoryyEnum,step,time);
-                                InputToResult(StressTensoryzEnum,step,time);
-                                InputToResult(StressTensorzzEnum,step,time);
-                                break;
-
-                        default:
-                                /*do nothing, no need to derail the computation because one of the outputs requested cannot be found: */
-                                break;
-                }
-        }
 
 }

issm/trunk-jpl/src/c/classes/Elements/Tria.h ¶

@@ -101 +101 @@
                 void        InputDuplicate(int original_enum,int new_enum);
                 void        InputScale(int enum_type,IssmDouble scale_factor);
-                void        InputToResult(int enum_type,int step,IssmDouble time);
                 void        DeleteResults(void);
                 void        MaterialUpdateFromTemperature(void){_error_("not implemented yet");};
                 int         NodalValue(IssmDouble* pvalue, int index, int natureofdataenum);
                 void        PositiveDegreeDay(IssmDouble* pdds,IssmDouble* pds,IssmDouble signorm);
-                void        RequestedOutput(int output_enum,int step,IssmDouble time);
                 void        ListResultsInfo(int** results_enums,int** results_size,IssmDouble** results_times,int** results_steps,int* num_results);
                 void        ResultInterpolation(int* pinterpolation,int output_enum);

issm/trunk-jpl/src/c/classes/FemModel.cpp ¶

@@ -478 +478 @@
 }
 /*}}}*/
-void FemModel::RequestedOutputsx(char** requested_outputs, int numoutputs){/*{{{*/
-
-        char       *output_string;
-        int         step;
-        IssmDouble  time;
-        IssmDouble  output_value;
-
-        /*Get time and step*/
-        parameters->FindParam(&step,StepEnum);
-        parameters->FindParam(&time,TimeEnum);
-
-        /*retrieve Inputs*/
-        if(numoutputs){
-                for(int i=0;i<numoutputs;i++){
-                        output_string=requested_outputs[i];
-
-                        if (strcmp(output_string,"IceVolume")==0){
-                                Responsex(&output_value,output_string);
-                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeEnum,reCast<IssmPDouble>(output_value),step,time));
-                        }
-                        else if (strcmp(output_string,"IceVolumeAboveFloatation")==0){
-                                Responsex(&output_value,output_string);
-                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeAboveFloatationEnum,reCast<IssmPDouble>(output_value),step,time));
-                        }
-                        else if (strcmp(output_string,"TotalSmb")==0){
-                                Responsex(&output_value,output_string);
-                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,TotalSmbEnum,reCast<IssmPDouble>(output_value),step,time));
-                        }
-                        else if (strcmp(output_string,"MaxVel")==0){
-                                Responsex(&output_value,output_string);
-                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,MaxVelEnum,reCast<IssmPDouble>(output_value),step,time));
-                        }
-                        else if (StringToEnumx(output_string,false)==-1){
-                                /*This response can only be computed by going into the output definitions: */
-                                output_value=OutputDefinitionsResponsex(this,output_string);
-                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,output_string,reCast<IssmPDouble>(output_value),step,time));
-                        }
-                        else{
-                                /*create this output in the element inputs, and then transfer to results:*/
-                                for(int j=0;j<elements->Size();j++){
-                                        Element* element=(Element*)elements->GetObjectByOffset(j);
-                                        element->RequestedOutput(StringToEnumx(output_string),step,time);
-                                }
-                        }
-                }
-        }
-}
-/*}}}*/
 void FemModel::RequestedOutputsx(Results **presults,char** requested_outputs, int numoutputs){/*{{{*/
 

issm/trunk-jpl/src/c/classes/FemModel.h ¶

@@ -84 +84 @@
                 void RequestedOutputsx(Results **presults,int* requested_outputs,int numoutputs);
                 void RequestedOutputsx(Results **presults,char** requested_outputs, int numoutputs);
-                void RequestedOutputsx(char** requested_outputs, int numoutputs);
                 void RequestedDependentsx(void);
                 void Responsex(IssmDouble* presponse,int response_descriptor_enum);

issm/trunk-jpl/src/c/modules/modules.h ¶

@@ -44 +44 @@
 #include "./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h"
 #include "./InterpFromMeshToGridx/InterpFromMeshToGridx.h"
-#include "./InputToResultx/InputToResultx.h"
 #include "./InputUpdateFromConstantx/InputUpdateFromConstantx.h"
 #include "./InputUpdateFromSolutionx/InputUpdateFromSolutionx.h"