Index: /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp (revision 27680) +++ /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.cpp (revision 27681) @@ -29,9 +29,7 @@ this->definitionenum = -1; this->name = NULL; - this->weights_enum = UNDEF; - this->timepassedflag = false; } /*}}}*/ -Cfdragcoeffabsgrad::Cfdragcoeffabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, bool in_timepassedflag){/*{{{*/ +Cfdragcoeffabsgrad::Cfdragcoeffabsgrad(char* in_name, int in_definitionenum){/*{{{*/ this->definitionenum=in_definitionenum; @@ -39,7 +37,4 @@ this->name = xNew(strlen(in_name)+1); xMemCpy(this->name,in_name,strlen(in_name)+1); - - this->weights_enum=in_weights_enum; - this->timepassedflag=in_timepassedflag; } /*}}}*/ @@ -50,5 +45,5 @@ /*Object virtual function resolutoin: */ Object* Cfdragcoeffabsgrad::copy() {/*{{{*/ - Cfdragcoeffabsgrad* mf = new Cfdragcoeffabsgrad(this->name,this->definitionenum, this->weights_enum,this->timepassedflag); + Cfdragcoeffabsgrad* mf = new Cfdragcoeffabsgrad(this->name,this->definitionenum); return (Object*) mf; } @@ -60,6 +55,4 @@ void Cfdragcoeffabsgrad::Echo(void){/*{{{*/ _printf_(" Cfdragcoeffabsgrad: " << name << " " << this->definitionenum << "\n"); - _printf_(" weights_enum: " << weights_enum << " " << EnumToStringx(weights_enum) << "\n"); - _printf_(" timepassedflag: "<call(this->definitionenum); marshallhandle->call(this->name); - marshallhandle->call(this->weights_enum); - marshallhandle->call(this->timepassedflag); } /*}}}*/ @@ -104,5 +95,5 @@ for(Object* & object : femmodel->elements->objects){ Element* element=xDynamicCast(object); - J+=this->Cfdragcoeffabsgrad_Calculation(element,weights_enum); + J+=this->Cfdragcoeffabsgrad_Calculation(element); } @@ -111,8 +102,7 @@ J=J_sum; - timepassedflag = true; return J; }/*}}}*/ -IssmDouble Cfdragcoeffabsgrad::Cfdragcoeffabsgrad_Calculation(Element* element, int weights_enum){/*{{{*/ +IssmDouble Cfdragcoeffabsgrad::Cfdragcoeffabsgrad_Calculation(Element* element){/*{{{*/ int domaintype,numcomponents,frictionlaw; Index: /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h (revision 27680) +++ /issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h (revision 27681) @@ -16,27 +16,25 @@ public: - int definitionenum; - char* name; - int weights_enum; - bool timepassedflag; + int definitionenum; + char *name; /*Cfdragcoeffabsgrad constructors, destructors :*/ Cfdragcoeffabsgrad(); - Cfdragcoeffabsgrad(char* in_name, int in_definitionenum, int in_weights_enum, bool timepassedflag); + Cfdragcoeffabsgrad(char* in_name, int in_definitionenum); ~Cfdragcoeffabsgrad(); /*Object virtual function resolutoin: */ - Object* copy(); - void DeepEcho(void); - void Echo(void); - int Id(void); - void Marshall(MarshallHandle* marshallhandle); - int ObjectEnum(void); + Object *copy(); + void DeepEcho(void); + void Echo(void); + int Id(void); + void Marshall(MarshallHandle *marshallhandle); + int ObjectEnum(void); /*Definition virtual function resolutoin: */ - int DefinitionEnum(); - char* Name(); - IssmDouble Response(FemModel* femmodel); - IssmDouble Cfdragcoeffabsgrad_Calculation(Element* element, int weights_enum); + int DefinitionEnum(); + char *Name(); + IssmDouble Response(FemModel *femmodel); + IssmDouble Cfdragcoeffabsgrad_Calculation(Element *element); }; #endif /* _CFDRAGCOEFFABSGRAD_H_ */ Index: /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.cpp (revision 27680) +++ /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.cpp (revision 27681) @@ -30,11 +30,9 @@ this->name = NULL; this->model_enum = UNDEF; - this->observation_enum = UNDEF; - this->weights_enum = UNDEF; this->datatime=0.; this->timepassedflag = false; } /*}}}*/ -Cflevelsetmisfit::Cflevelsetmisfit(char* in_name, int in_definitionenum, int in_model_enum, int in_observation_enum, int in_weights_enum, IssmDouble in_datatime, bool in_timepassedflag){/*{{{*/ +Cflevelsetmisfit::Cflevelsetmisfit(char* in_name, int in_definitionenum, int in_model_enum, IssmDouble in_datatime, bool in_timepassedflag){/*{{{*/ this->definitionenum=in_definitionenum; @@ -44,6 +42,4 @@ this->model_enum=in_model_enum; - this->observation_enum=in_observation_enum; - this->weights_enum=in_weights_enum; this->datatime=in_datatime; this->timepassedflag=in_timepassedflag; @@ -56,5 +52,5 @@ /*Object virtual function resolutoin: */ Object* Cflevelsetmisfit::copy() {/*{{{*/ - Cflevelsetmisfit* mf = new Cflevelsetmisfit(this->name,this->definitionenum, this->model_enum,this->observation_enum,this->weights_enum,this->datatime,this->timepassedflag); + Cflevelsetmisfit* mf = new Cflevelsetmisfit(this->name,this->definitionenum, this->model_enum,this->datatime,this->timepassedflag); return (Object*) mf; } @@ -67,6 +63,4 @@ _printf_(" Cflevelsetmisfit: " << name << " " << this->definitionenum << "\n"); _printf_(" model_enum: " << model_enum << " " << EnumToStringx(model_enum) << "\n"); - _printf_(" observation_enum: " << observation_enum << " " << EnumToStringx(observation_enum) << "\n"); - _printf_(" weights_enum: " << weights_enum << " " << EnumToStringx(weights_enum) << "\n"); _printf_(" datatime: " << datatime << "\n"); _printf_(" timepassedflag: "<call(this->model_enum); marshallhandle->call(this->name); - marshallhandle->call(this->observation_enum); - marshallhandle->call(this->weights_enum); marshallhandle->call(this->datatime); marshallhandle->call(this->timepassedflag); @@ -121,5 +113,5 @@ for(Object* & object : femmodel->elements->objects){ Element* element=xDynamicCast(object); - J+=this->Cflevelsetmisfit_Calculation(element,model_enum,observation_enum,weights_enum); + J+=this->Cflevelsetmisfit_Calculation(element,model_enum); } @@ -128,5 +120,5 @@ J=J_sum; - timepassedflag = true; + this->timepassedflag = true; return J; } @@ -134,5 +126,5 @@ } /*}}}*/ -IssmDouble Cflevelsetmisfit::Cflevelsetmisfit_Calculation(Element* element, int model_enum, int observation_enum, int weights_enum){/*{{{*/ +IssmDouble Cflevelsetmisfit::Cflevelsetmisfit_Calculation(Element* element, int model_enum){/*{{{*/ int domaintype,numcomponents; Index: /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.h (revision 27680) +++ /issm/trunk-jpl/src/c/classes/Cflevelsetmisfit.h (revision 27681) @@ -18,13 +18,11 @@ int definitionenum; int model_enum; - char* name; - int observation_enum; - int weights_enum; - IssmDouble datatime; - bool timepassedflag; + char *name; + IssmDouble datatime; + bool timepassedflag; /*Cflevelsetmisfit constructors, destructors :*/ Cflevelsetmisfit(); - Cflevelsetmisfit(char* in_name, int in_definitionenum, int in_model_enum, int in_observation_enum, int in_weights_enum, IssmDouble in_datatime, bool timepassedflag); + Cflevelsetmisfit(char* in_name, int in_definitionenum, int in_model_enum, IssmDouble in_datatime, bool timepassedflag); ~Cflevelsetmisfit(); @@ -41,5 +39,5 @@ char* Name(); IssmDouble Response(FemModel* femmodel); - IssmDouble Cflevelsetmisfit_Calculation(Element* element, int model_enum, int observation_enum, int weights_enum); + IssmDouble Cflevelsetmisfit_Calculation(Element* element, int model_enum); IssmDouble Heaviside(IssmDouble x); }; Index: /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h (revision 27680) +++ /issm/trunk-jpl/src/c/classes/Cfsurfacelogvel.h (revision 27681) @@ -27,10 +27,10 @@ /*Object virtual function resolutoin: */ - Object* copy(); - void DeepEcho(void); - void Echo(void); - int Id(void); - void Marshall(MarshallHandle* marshallhandle); - int ObjectEnum(void); + Object *copy(); + void DeepEcho(void); + void Echo(void); + int Id(void); + void Marshall(MarshallHandle *marshallhandle); + int ObjectEnum(void); /*Definition virtual function resolutoin: */ Index: /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp (revision 27680) +++ /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp (revision 27681) @@ -30,11 +30,9 @@ this->name = NULL; this->model_enum = UNDEF; - this->observation_enum = UNDEF; - this->weights_enum = UNDEF; this->datatime = 0.; this->timepassedflag = false; } /*}}}*/ -Cfsurfacesquare::Cfsurfacesquare(char* in_name, int in_definitionenum, int in_model_enum, int in_observation_enum, int in_weights_enum, IssmDouble in_datatime, bool in_timepassedflag){/*{{{*/ +Cfsurfacesquare::Cfsurfacesquare(char* in_name, int in_definitionenum, int in_model_enum, IssmDouble in_datatime, bool in_timepassedflag){/*{{{*/ this->definitionenum=in_definitionenum; @@ -44,6 +42,4 @@ this->model_enum=in_model_enum; - this->observation_enum=in_observation_enum; - this->weights_enum=in_weights_enum; this->datatime=in_datatime; this->timepassedflag=in_timepassedflag; @@ -57,5 +53,5 @@ /*Object virtual function resolutoin: */ Object* Cfsurfacesquare::copy() {/*{{{*/ - Cfsurfacesquare* mf = new Cfsurfacesquare(this->name,this->definitionenum, this->model_enum,this->observation_enum,this->weights_enum,this->datatime,this->timepassedflag); + Cfsurfacesquare* mf = new Cfsurfacesquare(this->name,this->definitionenum, this->model_enum,this->datatime,this->timepassedflag); return (Object*) mf; } @@ -68,6 +64,4 @@ _printf_(" Cfsurfacesquare: " << name << " " << this->definitionenum << "\n"); _printf_(" model_enum: " << model_enum << " " << EnumToStringx(model_enum) << "\n"); - _printf_(" observation_enum: " << observation_enum << " " << EnumToStringx(observation_enum) << "\n"); - _printf_(" weights_enum: " << weights_enum << " " << EnumToStringx(weights_enum) << "\n"); _printf_(" datatime: " << datatime << "\n"); _printf_(" timepassedflag: "<call(this->definitionenum); - marshallhandle->call(this->local); marshallhandle->call(this->model_enum); marshallhandle->call(this->name); - marshallhandle->call(this->observation_enum); - marshallhandle->call(this->weights_enum); marshallhandle->call(this->datatime); marshallhandle->call(this->timepassedflag); @@ -124,5 +115,5 @@ for(Object* & object : femmodel->elements->objects){ Element* element=xDynamicCast(object); - J+=this->Cfsurfacesquare_Calculation(element,model_enum,observation_enum,weights_enum); + J+=this->Cfsurfacesquare_Calculation(element,model_enum); } @@ -138,5 +129,5 @@ } /*}}}*/ -IssmDouble Cfsurfacesquare::Cfsurfacesquare_Calculation(Element* element, int model_enum, int observation_enum, int weights_enum){/*{{{*/ +IssmDouble Cfsurfacesquare::Cfsurfacesquare_Calculation(Element* element, int model_enum){/*{{{*/ int domaintype,numcomponents; Index: /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h (revision 27680) +++ /issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h (revision 27681) @@ -17,30 +17,27 @@ int definitionenum; - int local; int model_enum; - char* name; - int observation_enum; - int weights_enum; - IssmDouble datatime; - bool timepassedflag; + char *name; + IssmDouble datatime; + bool timepassedflag; /*Cfsurfacesquare constructors, destructors :*/ Cfsurfacesquare(); - Cfsurfacesquare(char* in_name, int in_definitionenum, int in_model_enum, int in_observation_enum, int in_weights_enum, IssmDouble in_datatime, bool timepassedflag); + Cfsurfacesquare(char* in_name, int in_definitionenum, int in_model_enum, IssmDouble in_datatime, bool timepassedflag); ~Cfsurfacesquare(); /*Object virtual function resolutoin: */ - Object* copy(); - void DeepEcho(void); - void Echo(void); - int Id(void); - void Marshall(MarshallHandle* marshallhandle); - int ObjectEnum(void); + Object *copy(); + void DeepEcho(void); + void Echo(void); + int Id(void); + void Marshall(MarshallHandle *marshallhandle); + int ObjectEnum(void); /*Definition virtual function resolutoin: */ - int DefinitionEnum(); - char* Name(); - IssmDouble Response(FemModel* femmodel); - IssmDouble Cfsurfacesquare_Calculation(Element* element, int model_enum, int observation_enum, int weights_enum); + int DefinitionEnum(); + char *Name(); + IssmDouble Response(FemModel *femmodel); + IssmDouble Cfsurfacesquare_Calculation(Element *element, int model_enum); }; #endif /* _CFSURFACESQUARE_H_ */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 27680) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (revision 27681) @@ -205,5 +205,5 @@ /*First create a cfsurfacesquare object for that specific string (cfsurfacesquare_model_string_s[j]):*/ - output_definitions->AddObject(new Cfsurfacesquare(cfsurfacesquare_name_s[j],StringToEnumx(cfsurfacesquare_definitionstring_s[j]),StringToEnumx(cfsurfacesquare_model_string_s[j]),StringToEnumx(cfsurfacesquare_observation_string_s[j]),StringToEnumx(cfsurfacesquare_weights_string_s[j]),cfsurfacesquare_datatime_s[j],false)); + output_definitions->AddObject(new Cfsurfacesquare(cfsurfacesquare_name_s[j],StringToEnumx(cfsurfacesquare_definitionstring_s[j]),StringToEnumx(cfsurfacesquare_model_string_s[j]),cfsurfacesquare_datatime_s[j],false)); /*Now, for this particular cfsurfacesquare object, make sure we plug into the elements: the observation, and the weights.*/ @@ -275,5 +275,5 @@ /*First create a cfdragcoeffabsgrad object for that specific string (cfdragcoeffabsgrad_model_string_s[j]):*/ - output_definitions->AddObject(new Cfdragcoeffabsgrad(cfdragcoeffabsgrad_name_s[j],StringToEnumx(cfdragcoeffabsgrad_definitionstring_s[j]),StringToEnumx(cfdragcoeffabsgrad_weights_string_s[j]),false)); + output_definitions->AddObject(new Cfdragcoeffabsgrad(cfdragcoeffabsgrad_name_s[j],StringToEnumx(cfdragcoeffabsgrad_definitionstring_s[j]))); /*Now, for this particular cfdragcoeffabsgrad object, make sure we plug into the elements: the observation, and the weights.*/ @@ -453,5 +453,5 @@ /*First create a cflevelsetmisfit object for that specific string (cflevelsetmisfit_model_string_s[j]):*/ - output_definitions->AddObject(new Cflevelsetmisfit(cflevelsetmisfit_name_s[j],StringToEnumx(cflevelsetmisfit_definitionstring_s[j]),StringToEnumx(cflevelsetmisfit_model_string_s[j]),StringToEnumx(cflevelsetmisfit_observation_string_s[j]),StringToEnumx(cflevelsetmisfit_weights_string_s[j]),cflevelsetmisfit_datatime_s[j],false)); + output_definitions->AddObject(new Cflevelsetmisfit(cflevelsetmisfit_name_s[j],StringToEnumx(cflevelsetmisfit_definitionstring_s[j]),StringToEnumx(cflevelsetmisfit_model_string_s[j]),cflevelsetmisfit_datatime_s[j],false)); /*Now, for this particular cflevelsetmisfit object, make sure we plug into the elements: the observation, and the weights.*/