Changeset 19073

Timestamp:

02/02/15 14:52:21 (10 years ago)

Author:

Eric.Larour

Message:

CHG: adding local to Misfit object.

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateOutputDefinitions.cpp (modified) (3 diffs)

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

@@ -66 +66 @@
                                 int*         misfit_observation_M_s    = NULL;
                                 int*         misfit_observation_N_s    = NULL;
+                                int*         misfit_local_s = NULL;
                                 char**       misfit_timeinterpolation_s = NULL;
                                 IssmDouble** misfit_weights_s           = NULL;
@@ -79 +80 @@
                                 iomodel->FetchMultipleData(&misfit_observation_enum_s,&nummisfits,MisfitObservationEnumEnum);
                                 iomodel->FetchMultipleData(&misfit_timeinterpolation_s,&nummisfits,MisfitTimeinterpolationEnum);
+                                iomodel->FetchMultipleData(&misfit_local_s,&nummisfits,MisfitLocalEnum);
                                 iomodel->FetchMultipleData(&misfit_weights_s,&misfit_weights_M_s,&misfit_weights_N_s,&nummisfits,MisfitWeightsEnum);
                                 iomodel->FetchMultipleData(&misfit_weights_enum_s,&nummisfits,MisfitWeightsEnumEnum);
@@ -85 +87 @@
 
                                         /*First create a misfit object for that specific enum (misfit_model_enum_s[j]):*/
-                                        output_definitions->AddObject(new Misfit(misfit_name_s[j],misfit_definitionenums_s[j],misfit_model_enum_s[j],misfit_observation_enum_s[j],misfit_timeinterpolation_s[j],misfit_weights_enum_s[j]));
+                                        output_definitions->AddObject(new Misfit(misfit_name_s[j],misfit_definitionenums_s[j],misfit_model_enum_s[j],misfit_observation_enum_s[j],misfit_timeinterpolation_s[j],(bool)misfit_local_s[j],misfit_weights_enum_s[j]));
 
                                         /*Now, for this particular misfit object, make sure we plug into the elements: the observation, and the weights.*/