Changeset 23189 for issm/trunk/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp

Timestamp:

08/28/18 09:45:51 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 23187

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (16 diffs)

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

@@ -11 +11 @@
 
         int i,j;
-        
+
         DataSet*     output_definitions      = NULL;
         int*         output_definition_enums = NULL;
@@ -65 +65 @@
                         else if (output_definition_enums[i]==MisfitEnum){
                                 /*Deal with misfits: {{{*/
-                        
+
                                 /*misfit variables: */
                                 int          nummisfits;
@@ -115 +115 @@
                                          _error_("misfit weight size not supported yet");
 
-
                                         /*First create a misfit object for that specific string (misfit_model_string_s[j]):*/
                                         output_definitions->AddObject(new Misfit(misfit_name_s[j],StringToEnumx(misfit_definitionstring_s[j]),StringToEnumx(misfit_model_string_s[j]),StringToEnumx(misfit_observation_string_s[j]),misfit_timeinterpolation_s[j],misfit_local_s[j],StringToEnumx(misfit_weights_string_s[j])));
@@ -159 +158 @@
                         else if (output_definition_enums[i]==CfsurfacesquareEnum){
                                 /*Deal with cfsurfacesquare: {{{*/
-                                
+
                                 /*cfsurfacesquare variables: */
                                 int          num_cfsurfacesquares;
@@ -214 +213 @@
 
                                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(k));
-                                                
+
                                                 element->DatasetInputAdd(StringToEnumx(cfsurfacesquare_definitionstring_s[j]),cfsurfacesquare_observation_s[j], iomodel,cfsurfacesquare_observation_M_s[j],cfsurfacesquare_observation_N_s[j],obs_vector_type,StringToEnumx(cfsurfacesquare_observation_string_s[j]),7,SurfaceObservationEnum);
                                                 element->DatasetInputAdd(StringToEnumx(cfsurfacesquare_definitionstring_s[j]),cfsurfacesquare_weights_s[j], iomodel,cfsurfacesquare_weights_M_s[j],cfsurfacesquare_weights_N_s[j],weight_vector_type,StringToEnumx(cfsurfacesquare_weights_string_s[j]),7,WeightsSurfaceObservationEnum);
@@ -251 +250 @@
                         else if (output_definition_enums[i]==CfdragcoeffabsgradEnum){
                                 /*Deal with cfdragcoeffabsgrad: {{{*/
-                                
+
                                 /*cfdragcoeffabsgrad variables: */
                                 int          num_cfdragcoeffabsgrads;
@@ -260 +259 @@
                                 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 +265 @@
                                 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 +279 @@
 
                                         /*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.*/
@@ -288 +285 @@
 
                                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(k));
-                                                
+
                                                 element->DatasetInputAdd(StringToEnumx(cfdragcoeffabsgrad_definitionstring_s[j]),cfdragcoeffabsgrad_weights_s[j], iomodel,cfdragcoeffabsgrad_weights_M_s[j],cfdragcoeffabsgrad_weights_N_s[j],weight_vector_type,StringToEnumx(cfdragcoeffabsgrad_weights_string_s[j]),7,WeightsSurfaceObservationEnum);
 
@@ -311 +308 @@
                                 xDelete<int>(cfdragcoeffabsgrad_weights_N_s);
                                 xDelete<char*>(cfdragcoeffabsgrad_weights_string_s);
-                                xDelete<int>(cfdragcoeffabsgrad_datatime_s);
                                 /*}}}*/
                         }
                         else if (output_definition_enums[i]==CfsurfacelogvelEnum){
                                 /*Deal with cfsurfacelogvel: {{{*/
-                                
+
                                 /*cfsurfacelogvel variables: */
                                 int          num_cfsurfacelogvels;
@@ -372 +368 @@
 
                                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(k));
-                                                
+
                                                 element->DatasetInputAdd(StringToEnumx(cfsurfacelogvel_definitionstring[j]),cfsurfacelogvel_vxobs[j], iomodel,cfsurfacelogvel_observation_M[j],cfsurfacelogvel_observation_N[j],obs_vector_type,StringToEnumx(cfsurfacelogvel_vxobs_string[j]),7,VxObsEnum);
                                                         element->DatasetInputAdd(StringToEnumx(cfsurfacelogvel_definitionstring[j]),cfsurfacelogvel_vyobs[j], iomodel,cfsurfacelogvel_observation_M[j],cfsurfacelogvel_observation_N[j],obs_vector_type,StringToEnumx(cfsurfacelogvel_vyobs_string[j]),7,VyObsEnum);
@@ -412 +408 @@
                         else if (output_definition_enums[i]==NodalvalueEnum){
                                 /*Deal with nodal values: {{{*/
-                                
+
                                 /*nodal value variables: */
                                 int          numnodalvalues;
@@ -431 +427 @@
                                         output_definitions->AddObject(new Nodalvalue(nodalvalue_name_s[j],StringToEnumx(nodalvalue_definitionstrings[j]),StringToEnumx(nodalvalue_modelstrings[j]),nodalvalue_node_s[j]-1)); //-1 because matlab to c indexing.
                                 }
-                                        
+
                                 /*Free ressources:*/
                                 for(j=0;j<numnodalvalues;j++){
@@ -485 +481 @@
                         else if (output_definition_enums[i]==MassconaxpbyEnum){
                                 /*Deal with masscon combinations: {{{*/
-                                
+
                                 /*masscon variables: */
                                 char**       masscon_name_s             = NULL;    
@@ -620 +616 @@
                                         output_definitions->AddObject(new Numberedcostfunction(ncf_name_s[j],StringToEnumx(ncf_definitionstring_s[j]),num_cost_functions,cost_function_enums));
                                 }
-                                
+
                                 /*Free data: */
                                 iomodel->DeleteData(2,"md.numberedcostfunction.name","md.numberedcostfunction.definitionstring");