Changeset 22971

Timestamp:

07/18/18 14:28:01 (7 years ago)

Author:

erobo

Message:

CHG: switched drag cost function from being one point in time to the whole transient run

Location:

issm/trunk-jpl/src/c

Files:

• classes/Cfdragcoeffabsgrad.cpp (modified) (7 diffs)
• classes/Cfdragcoeffabsgrad.h (modified) (2 diffs)
• modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (4 diffs)

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

@@ -32 +32 @@
         this->misfit=0;
         this->lock=0;
-        this->datatime=0.;
         this->timepassedflag = false;
         this->last_time = 0.;
@@ -38 +37 @@
 }
 /*}}}*/
-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;
@@ -46 +45 @@
 
         this->weights_enum=in_weights_enum;
-        this->datatime=in_datatime;
         this->timepassedflag=in_timepassedflag;
         
@@ -61 +59 @@
 /*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;
@@ -74 +72 @@
         _printf_(" Cfdragcoeffabsgrad: " << name << " " << this->definitionenum << "\n");
         _printf_("    weights_enum: " << weights_enum << " " << EnumToStringx(weights_enum) << "\n");
-        _printf_("    datatime: " << datatime << "\n");
         _printf_("        timepassedflag: "<<timepassedflag<<"\n");
 }
@@ -107 +104 @@
          
          /*recover time parameters: */
-         femmodel->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;i<femmodel->elements->Size();i++){
                          Element* element=(Element*)femmodel->elements->GetObjectByOffset(i);
@@ -127 +119 @@
                  timepassedflag = true;
                  return J;
-        }
-         else return J;
  }
         /*}}}*/

issm/trunk-jpl/src/c/classes/Cfdragcoeffabsgrad.h

@@ -20 +20 @@
                 char*       name;
                 int         weights_enum;
-                IssmDouble      datatime;
                 bool                    timepassedflag;
                 IssmDouble      last_time;
@@ -29 +28 @@
                 /*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();
                 

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp

@@ -260 +260 @@
                                 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): */
@@ -267 +266 @@
                                 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;j<num_cfdragcoeffabsgrads;j++){
@@ -282 +280 @@
 
                                         /*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]),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.*/
@@ -311 +309 @@
                                 xDelete<int>(cfdragcoeffabsgrad_weights_N_s);
                                 xDelete<char*>(cfdragcoeffabsgrad_weights_string_s);
-                                xDelete<int>(cfdragcoeffabsgrad_datatime_s);
                                 /*}}}*/
                         }