Changeset 13323
- Timestamp:
- 09/11/12 12:55:56 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/classes/objects/Inputs/TransientInput.cpp
r13216 r13323 46 46 /*FUNCTION TransientInput::~TransientInput{{{*/ 47 47 TransientInput::~TransientInput(){ 48 xDelete <IssmDouble>(this->timesteps);48 xDelete(this->timesteps); 49 49 this->timesteps=NULL; 50 50 this->numtimesteps=0; … … 101 101 output->numtimesteps=this->numtimesteps; 102 102 output->timesteps=xNew<IssmDouble>(this->numtimesteps); 103 memcpy(output->timesteps,this->timesteps,this->numtimesteps*sizeof(IssmDouble));103 xMemCpy(output->timesteps,this->timesteps,this->numtimesteps); 104 104 output->inputs=(Inputs*)this->inputs->Copy(); 105 105 output->parameters=this->parameters; … … 129 129 outinput->numtimesteps=this->numtimesteps; 130 130 outinput->timesteps=xNew<IssmDouble>(this->numtimesteps); 131 memcpy(outinput->timesteps,this->timesteps,this->numtimesteps*sizeof(IssmDouble));131 xMemCpy(outinput->timesteps,this->timesteps,this->numtimesteps); 132 132 outinput->inputs=(Inputs*)this->inputs->SpawnTriaInputs(indices); 133 133 outinput->parameters=this->parameters; … … 266 266 if (this->numtimesteps > 0){ 267 267 old_timesteps=xNew<IssmDouble>(this->numtimesteps); 268 memcpy(old_timesteps,this->timesteps,this->numtimesteps*sizeof(IssmDouble));269 xDelete <IssmDouble>(this->timesteps);268 xMemCpy(old_timesteps,this->timesteps,this->numtimesteps); 269 xDelete(this->timesteps); 270 270 } 271 271 … … 274 274 275 275 if (this->numtimesteps > 1){ 276 memcpy(this->timesteps,old_timesteps,(this->numtimesteps-1)*sizeof(IssmDouble));277 xDelete <IssmDouble>(old_timesteps);276 xMemCpy(this->timesteps,old_timesteps,this->numtimesteps-1); 277 xDelete(old_timesteps); 278 278 } 279 279
Note:
See TracChangeset
for help on using the changeset viewer.