Index: ../trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h =================================================================== --- ../trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h (revision 22970) +++ ../trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h (revision 22971) @@ -19,7 +19,6 @@ int definitionenum; char* name; int weights_enum; - IssmDouble datatime; bool timepassedflag; IssmDouble last_time; @@ -28,7 +27,7 @@ /*Cfdragcoeffabsgrad constructors, destructors :*/ Cfdragcoeffabsgrad(); - Cfdragcoeffabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, IssmDouble in_datatime, bool timepassedflag); + Cfdragcoeffabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, bool timepassedflag); ~Cfdragcoeffabsgrad(); /*Object virtual function resolutoin: */ Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp =================================================================== --- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 22970) +++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 22971) @@ -259,7 +259,6 @@ int* cfdragcoeffabsgrad_weights_M_s = NULL; int* cfdragcoeffabsgrad_weights_N_s = NULL; char** cfdragcoeffabsgrad_weights_string_s = NULL; - int* cfdragcoeffabsgrad_datatime_s = NULL; /*Fetch name, model_string, observation, observation_string, etc ... (see src/m/classes/cfdragcoeffabsgrad.m): */ iomodel->FetchMultipleData(&cfdragcoeffabsgrad_name_s,&num_cfdragcoeffabsgrads, "md.cfdragcoeffabsgrad.name"); @@ -266,7 +265,6 @@ iomodel->FetchMultipleData(&cfdragcoeffabsgrad_definitionstring_s,&num_cfdragcoeffabsgrads, "md.cfdragcoeffabsgrad.definitionstring"); iomodel->FetchMultipleData(&cfdragcoeffabsgrad_weights_s,&cfdragcoeffabsgrad_weights_M_s,&cfdragcoeffabsgrad_weights_N_s,&num_cfdragcoeffabsgrads, "md.cfdragcoeffabsgrad.weights"); iomodel->FetchMultipleData(&cfdragcoeffabsgrad_weights_string_s,&num_cfdragcoeffabsgrads, "md.cfdragcoeffabsgrad.weights_string"); - iomodel->FetchMultipleData(&cfdragcoeffabsgrad_datatime_s,&num_cfdragcoeffabsgrads, "md.cfdragcoeffabsgrad.datatime"); for(j=0;jAddObject(new Cfdragcoeffabsgrad(cfdragcoeffabsgrad_name_s[j],StringToEnumx(cfdragcoeffabsgrad_definitionstring_s[j]),StringToEnumx(cfdragcoeffabsgrad_weights_string_s[j]),cfdragcoeffabsgrad_datatime_s[j],false)); + output_definitions->AddObject(new Cfdragcoeffabsgrad(cfdragcoeffabsgrad_name_s[j],StringToEnumx(cfdragcoeffabsgrad_definitionstring_s[j]),StringToEnumx(cfdragcoeffabsgrad_weights_string_s[j]),false)); /*Now, for this particular cfdragcoeffabsgrad object, make sure we plug into the elements: the observation, and the weights.*/ for(int k=0;kSize();k++){ @@ -310,7 +308,6 @@ xDelete(cfdragcoeffabsgrad_weights_M_s); xDelete(cfdragcoeffabsgrad_weights_N_s); xDelete(cfdragcoeffabsgrad_weights_string_s); - xDelete(cfdragcoeffabsgrad_datatime_s); /*}}}*/ } else if (output_definition_enums[i]==CfsurfacelogvelEnum){ Index: ../trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp (revision 22970) +++ ../trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp (revision 22971) @@ -31,13 +31,12 @@ this->weights_enum = UNDEF; this->misfit=0; this->lock=0; - this->datatime=0.; this->timepassedflag = false; this->last_time = 0.; } /*}}}*/ -Cfdragcoeffabsgrad::Cfdragcoeffabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, IssmDouble in_datatime, bool in_timepassedflag){/*{{{*/ +Cfdragcoeffabsgrad::Cfdragcoeffabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, bool in_timepassedflag){/*{{{*/ this->definitionenum=in_definitionenum; @@ -45,7 +44,6 @@ xMemCpy(this->name,in_name,strlen(in_name)+1); this->weights_enum=in_weights_enum; - this->datatime=in_datatime; this->timepassedflag=in_timepassedflag; this->misfit=0; @@ -60,7 +58,7 @@ /*}}}*/ /*Object virtual function resolutoin: */ Object* Cfdragcoeffabsgrad::copy() {/*{{{*/ - Cfdragcoeffabsgrad* mf = new Cfdragcoeffabsgrad(this->name,this->definitionenum, this->weights_enum,this->datatime,this->timepassedflag); + Cfdragcoeffabsgrad* mf = new Cfdragcoeffabsgrad(this->name,this->definitionenum, this->weights_enum,this->timepassedflag); mf->misfit=this->misfit; mf->lock=this->lock; return (Object*) mf; @@ -73,7 +71,6 @@ void Cfdragcoeffabsgrad::Echo(void){/*{{{*/ _printf_(" Cfdragcoeffabsgrad: " << name << " " << this->definitionenum << "\n"); _printf_(" weights_enum: " << weights_enum << " " << EnumToStringx(weights_enum) << "\n"); - _printf_(" datatime: " << datatime << "\n"); _printf_(" timepassedflag: "<parameters->FindParam(&time,TimeEnum); - if(time < last_time) timepassedflag = false; - last_time = time; - int i; IssmDouble J=0.; IssmDouble J_sum=0.; - if(datatime<=time && !timepassedflag){ for(i=0;ielements->Size();i++){ Element* element=(Element*)femmodel->elements->GetObjectByOffset(i); J+=this->Cfdragcoeffabsgrad_Calculation(element,weights_enum); @@ -126,8 +118,6 @@ timepassedflag = true; return J; - } - else return J; } /*}}}*/ IssmDouble Cfdragcoeffabsgrad::Cfdragcoeffabsgrad_Calculation(Element* element, int weights_enum){/*{{{*/