Changeset 22385

Timestamp:

02/02/18 13:12:59 (7 years ago)

Author:

erobo

Message:

CHG: better check of misfit input data

File:

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

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

@@ -96 +96 @@
 
                                         int obs_vector_type=0;
-                                        if ((misfit_observation_M_s[j]==iomodel->numberofvertices) || (misfit_observation_M_s[j]==iomodel->numberofvertices+1))obs_vector_type=1;
-                                        if ((misfit_observation_M_s[j]==iomodel->numberofelements) || (misfit_observation_M_s[j]==iomodel->numberofelements+1))obs_vector_type=2;
+                                        if ((misfit_observation_M_s[j]==iomodel->numberofvertices) || (misfit_observation_M_s[j]==iomodel->numberofvertices+1)){
+                                                obs_vector_type=1;
+                                        }
+                                        else if ((misfit_observation_M_s[j]==iomodel->numberofelements) || (misfit_observation_M_s[j]==iomodel->numberofelements+1)){
+                                                obs_vector_type=2;
+                                        }
+                                        else
+                                         _error_("misfit observation size not supported yet");
+
                                         int weight_vector_type=0;
-                                        if ((misfit_weights_M_s[j]==iomodel->numberofvertices) || (misfit_weights_M_s[j]==iomodel->numberofvertices+1))weight_vector_type=1;
-                                        if ((misfit_weights_M_s[j]==iomodel->numberofelements) || (misfit_weights_M_s[j]==iomodel->numberofelements+1))weight_vector_type=2;
+                                        if ((misfit_weights_M_s[j]==iomodel->numberofvertices) || (misfit_weights_M_s[j]==iomodel->numberofvertices+1)){
+                                                weight_vector_type=1;
+                                        }
+                                        else if ((misfit_weights_M_s[j]==iomodel->numberofelements) || (misfit_weights_M_s[j]==iomodel->numberofelements+1)){
+                                                weight_vector_type=2;
+                                        }
+                                        else
+                                         _error_("misfit weight size not supported yet");