Changeset 27065

Timestamp:

06/16/22 15:45:38 (3 years ago)

Author:

Eric.Larour

Message:

CHG: big segfault fix where the times vector was coming into the transient input initialization without being allocated!
Was going fine on pleiades, my macosx caught it, big deal! The times were all garbage.

File:

• issm/branches/trunk-larour-SLPS2022/src/c/classes/IoModel.cpp (modified) (4 diffs)

issm/branches/trunk-larour-SLPS2022/src/c/classes/IoModel.cpp

@@ -1838 +1838 @@
                                 matrix=array[i];
 
+                                //initialize times:
+                                if(M==this->numberofvertices || M==(this->numberofvertices+1)){
+                                        times=xNew<IssmDouble>(N);
+                                        if(M==this->numberofvertices) times[0] = matrix[M-1];
+                                        if(M==this->numberofvertices+1) for(int t=0;t<N;t++) times[t] = matrix[(M-1)*N+t];
+                                }
+                                else if(M==this->numberofelements || M==(this->numberofelements+1)){
+                                        times=xNew<IssmDouble>(N);
+                                        if(M==this->numberofelements) times[0] = matrix[M-1];
+                                        if(M==this->numberofelements+1) for(int t=0;t<N;t++) times[t] = matrix[(M-1)*N+t];
+                                }
+                                else if(M==2 || M==1){
+                                        times=xNew<IssmDouble>(N);
+                                        if(M==1) times[0] = 0;
+                                        if(M==2) for(int t=0;t<N;t++) times[t] = matrix[(M-1)*N+t];
+                                }
+                                else _error_("FetchDataToInput error message: row size of MatArray elements should be either numberofelements (+1) or numberofvertices (+1)");
+
                                 //initialize transient input dataset:
                                 TransientInput* transientinput=inputs->SetDatasetTransientInput(input_enum,i, times,N);
@@ -1858 +1876 @@
 
                                         if(M==this->numberofvertices || M==(this->numberofvertices+1)){
-
-                                                //recover time vector: 
-                                                times=xNew<IssmDouble>(N);
-                                                if(M==this->numberofvertices) times[0] = matrix[M-1];
-                                                if(M==this->numberofvertices+1) for(int t=0;t<N;t++) times[t] = matrix[(M-1)*N+t];
 
                                                 IssmDouble* values=xNew<IssmDouble>(numvertices);
@@ -1880 +1893 @@
 
                                                 IssmDouble value;
-
-                                                //recover time vector: 
-                                                times=xNew<IssmDouble>(N);
-                                                if(M==this->numberofelements) times[0] = matrix[M-1];
-                                                if(M==this->numberofelements+1) for(int t=0;t<N;t++) times[t] = matrix[(M-1)*N+t];
 
                                                 for(int t=0;t<N;t++){ 
@@ -1898 +1906 @@
                                         else if(M==2 || M==1){
                                                 IssmDouble value;
-
-                                                //recover time vector: 
-                                                times=xNew<IssmDouble>(N);
-                                                if(M==1) times[0] = 0;
-                                                if(M==2) for(int t=0;t<N;t++) times[t] = matrix[(M-1)*N+t];
 
                                                 for(int t=0;t<N;t++){