Changeset 27940

Timestamp:

10/05/23 05:04:24 (18 months ago)

Author:

Mathieu Morlighem

Message:

CHG: better error messages

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1903 +1903 @@
                 /*Are we in transient or static? */
                 if(M==1){
+                        if(N!=1) _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
                         _assert_(N==1);
                         this->SetElementInput(inputs,vector_enum,vector[0]);
@@ -1908 +1909 @@
 
                 else if(M==iomodel->numberofvertices){
-                        _assert_(N==1);
+                        if(N!=1) _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
                         for(int i=0;i<NUM_VERTICES;i++) values[i]=vector[vertexids[i]-1];
                         this->SetElementInput(inputs,NUM_VERTICES,vertexlids,values,vector_enum);
@@ -1947 +1948 @@
                         }
                         else{
-                                _error_("Patch interpolation not supported yet");
+                                _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
                         }
                         xDelete<IssmDouble>(evalues);
@@ -1953 +1954 @@
                 }
                 else{
-                        _error_("nodal vector is either numberofvertices or numberofvertices+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
+                        _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
                 }
         }
@@ -1960 +1961 @@
                 /*Are we in transient or static? */
                 if(M==1){
-                        _assert_(N==1);
+                        if(N!=1) _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
                         this->SetElementInput(inputs,vector_enum,vector[0]);
                 }
@@ -1982 +1983 @@
                 }
                 else if(M==iomodel->numberofelements){
-                        _assert_(N==1);
+                        if(N!=1) _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
                         if (code==5){ //boolean
                                 this->SetBoolInput(inputs,vector_enum,reCast<bool>(vector[this->Sid()]));
@@ -2011 +2012 @@
                 }
 
-                else _error_("element vector is either numberofelements or numberofelements+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
+                else{
+                        _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
+                }
         }
         else if(vector_type==3){ //Double array matrix
@@ -2022 +2025 @@
                         xDelete<IssmDouble>(layers);
                 }
-                else _error_("element vector is either numberofelements or numberofelements+1 long. Field provided (" << EnumToStringx(vector_enum) << ") is " << M << " long");
-        }
-        else _error_("Cannot add input for vector type " << vector_type << " (not supported)");
+                else{
+                        _error_("Size of Input "<<EnumToStringx(vector_enum)<<" "<<M<<"x"<<N<<" not supported");
+                }
+        }
+        else{
+                _error_("Cannot add input for vector type " << vector_type << " (not supported)");
+        }
 }
 /*}}}*/