Changeset 23546 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

12/13/18 07:05:22 (6 years ago)

Author:

bdef

Message:

CHG:clean up of old hydro substeping and change in reset of inactive EPL

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (1 diff)

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

@@ -4821 +4821 @@
 }
 /*}}}*/
-void FemModel::InitTransientOutputx(int* stackedinput_enum,int numoutputs){ /*{{{*/
-
-  for(int i=0;i<numoutputs;i++){
-                if(stackedinput_enum[i]<0){
-                        _error_("Can't deal with non enum fields for result Stack");
-                }
-                else{
-                        for(int j=0;j<elements->Size();j++){
-                                TransientInput* transient_input = new TransientInput(stackedinput_enum[i]);
-                                /*Intermediaries*/
-                                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
-                                //transient_input->Configure(element->parameters);
-                                element->inputs->AddInput(transient_input);
-                        }
-                }
-        }
-}
-/*}}}*/
-void FemModel::StackTransientOutputx(int* input_enum,int* stackedinput_enum,IssmDouble hydrotime,int numoutputs){ /*{{{*/
-
-  for(int i=0;i<numoutputs;i++){
-                if(input_enum[i]<0){
-                        _error_("Can't deal with non enum fields for result Stack");
-                }
-                else{
-                        for(int j=0;j<elements->Size();j++){
-                                /*Intermediaries*/
-                                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
-                                TransientInput* stacking_input=NULL;
-                                Input* input=element->inputs->GetInput(stackedinput_enum[i]); _assert_(input); //this is the enum stack
-                                stacking_input=dynamic_cast<TransientInput*>(input);
-
-                                int  numvertices = element->GetNumberOfVertices();
-                                IssmDouble* N=xNew<IssmDouble>(numvertices);
-                                element->GetInputListOnVertices(&N[0],input_enum[i]);   //this is the enum to stack
-                                switch(element->ObjectEnum()){
-                                case TriaEnum:
-                                        stacking_input->AddTimeInput(new TriaInput(stackedinput_enum[i],&N[0],P1Enum),hydrotime);
-                                        break;
-                                case PentaEnum:
-                                        stacking_input->AddTimeInput(new PentaInput(stackedinput_enum[i],&N[0],P1Enum),hydrotime);
-                                        break;
-                                case TetraEnum:
-                                        stacking_input->AddTimeInput(new TetraInput(stackedinput_enum[i],&N[0],P1Enum),hydrotime);
-                                        break;
-                                default: _error_("Not implemented yet");
-                                }
-                                xDelete<IssmDouble>(N);
-                        }
-                }
-        }
-}
-/*}}}*/
-void FemModel::AverageTransientOutputx(int* stackedinput_enum,int* averagedinput_enum,IssmDouble init_time,int numoutputs){ /*{{{*/
-
-  for(int i=0;i<numoutputs;i++){
-                if(stackedinput_enum[i]<0){
-                        _error_("Can't deal with non enum fields for result Stack");
-                }
-                else{
-                        for(int j=0;j<elements->Size();j++){
-                                /*Intermediaries*/
-                                Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
-                                int  numvertices = element->GetNumberOfVertices();
-                                IssmDouble* time_averaged=NULL;
-
-                                Input* input=element->inputs->GetInput(stackedinput_enum[i]); _assert_(input);
-                                TransientInput* stacking_input=NULL;
-                                stacking_input=dynamic_cast<TransientInput*>(input);
-                                stacking_input->GetInputAverageOnTimes(&time_averaged,init_time);
-
-                                element->AddInput(averagedinput_enum[i],&time_averaged[0],P1Enum);
-                                xDelete<IssmDouble>(time_averaged);
-                        }
-                }
-        }
-}
-/*}}}*/
 void FemModel::InitMeanOutputx(int* stackedinput_enum,int numoutputs){ /*{{{*/