Index: /issm/trunk-jpl/src/c/CMakeLists.txt =================================================================== --- /issm/trunk-jpl/src/c/CMakeLists.txt (revision 16484) +++ /issm/trunk-jpl/src/c/CMakeLists.txt (revision 16485) @@ -73,5 +73,4 @@ $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,5 +218,4 @@ ./modules/VecMergex/VecMergex.cpp ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp - ./modules/InputToResultx/InputToResultx.cpp ./analyses/ProcessArguments.cpp ./analyses/ResetBoundaryConditions.cpp Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 16484) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 16485) @@ -337,6 +337,4 @@ ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp\ ./modules/Mergesolutionfromftogx/Mergesolutionfromftogx.h\ - ./modules/InputToResultx/InputToResultx.cpp\ - ./modules/InputToResultx/InputToResultx.h\ ./analyses/ProcessArguments.cpp\ ./analyses/ResetBoundaryConditions.cpp\ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 16484) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 16485) @@ -64,8 +64,6 @@ 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; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16484) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16485) @@ -2113,27 +2113,4 @@ } /*}}}*/ -/*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,54 +2908,4 @@ /*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; - } - } - } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 16484) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 16485) @@ -98,6 +98,4 @@ 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); Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 16484) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 16485) @@ -110,10 +110,8 @@ 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");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16484) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16485) @@ -1635,28 +1635,4 @@ } /*}}}*/ -/*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,32 +2587,4 @@ } - -} -/*}}}*/ -/*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; - } - } } Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16484) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16485) @@ -101,10 +101,8 @@ 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); Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 16484) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 16485) @@ -478,52 +478,4 @@ } /*}}}*/ -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;iAddObject(new GenericExternalResult(results->Size()+1,IceVolumeEnum,reCast(output_value),step,time)); - } - else if (strcmp(output_string,"IceVolumeAboveFloatation")==0){ - Responsex(&output_value,output_string); - results->AddObject(new GenericExternalResult(results->Size()+1,IceVolumeAboveFloatationEnum,reCast(output_value),step,time)); - } - else if (strcmp(output_string,"TotalSmb")==0){ - Responsex(&output_value,output_string); - results->AddObject(new GenericExternalResult(results->Size()+1,TotalSmbEnum,reCast(output_value),step,time)); - } - else if (strcmp(output_string,"MaxVel")==0){ - Responsex(&output_value,output_string); - results->AddObject(new GenericExternalResult(results->Size()+1,MaxVelEnum,reCast(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(results->Size()+1,output_string,reCast(output_value),step,time)); - } - else{ - /*create this output in the element inputs, and then transfer to results:*/ - for(int j=0;jSize();j++){ - Element* element=(Element*)elements->GetObjectByOffset(j); - element->RequestedOutput(StringToEnumx(output_string),step,time); - } - } - } - } -} -/*}}}*/ void FemModel::RequestedOutputsx(Results **presults,char** requested_outputs, int numoutputs){/*{{{*/ Index: /issm/trunk-jpl/src/c/classes/FemModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.h (revision 16484) +++ /issm/trunk-jpl/src/c/classes/FemModel.h (revision 16485) @@ -84,5 +84,4 @@ 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); Index: /issm/trunk-jpl/src/c/modules/modules.h =================================================================== --- /issm/trunk-jpl/src/c/modules/modules.h (revision 16484) +++ /issm/trunk-jpl/src/c/modules/modules.h (revision 16485) @@ -44,5 +44,4 @@ #include "./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h" #include "./InterpFromMeshToGridx/InterpFromMeshToGridx.h" -#include "./InputToResultx/InputToResultx.h" #include "./InputUpdateFromConstantx/InputUpdateFromConstantx.h" #include "./InputUpdateFromSolutionx/InputUpdateFromSolutionx.h"