Changeset 22280

Timestamp:

11/29/17 09:02:22 (7 years ago)

Author:

bdef

Message:

BUG: we should not copy if transient input is empty

File:

• issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

@@ -133 +133 @@
         outinput->enum_type=this->enum_type;
         outinput->numtimesteps=this->numtimesteps;
-        outinput->timesteps=xNew<IssmDouble>(this->numtimesteps);
-        xMemCpy(outinput->timesteps,this->timesteps,this->numtimesteps);
-        outinput->inputs=(Inputs*)this->inputs->SpawnSegInputs(index1,index2);
+        if(this->numtimesteps>0){
+                outinput->timesteps=xNew<IssmDouble>(this->numtimesteps);
+                xMemCpy(outinput->timesteps,this->timesteps,this->numtimesteps);
+                outinput->inputs=(Inputs*)this->inputs->SpawnSegInputs(index1,index2);
+        }
         outinput->parameters=this->parameters;
 
@@ -152 +154 @@
         outinput->enum_type=this->enum_type;
         outinput->numtimesteps=this->numtimesteps;
-        outinput->timesteps=xNew<IssmDouble>(this->numtimesteps);
-        xMemCpy(outinput->timesteps,this->timesteps,this->numtimesteps);
-        outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(index1,index2,index3);
+        if(this->numtimesteps>0){
+                outinput->timesteps=xNew<IssmDouble>(this->numtimesteps);
+                xMemCpy<IssmDouble>(outinput->timesteps,this->timesteps,this->numtimesteps);
+                outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(index1,index2,index3);
+        }
         outinput->parameters=this->parameters;
 
@@ -316 +320 @@
 
         values=xNew<IssmDouble>(3);
-
+        
         for(int i=0;i<this->numtimesteps;i++){
                 time                                             = this->timesteps[i];