Changeset 8371
- Timestamp:
- 05/20/11 08:12:44 (14 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Container/DataSet.cpp
r8224 r8371 228 228 dataset->AddObject(triavertexinput);} 229 229 break; 230 case TriaVertexForcingEnum:{ 231 TriaVertexForcing* triavertexforcing=NULL; 232 triavertexforcing=new TriaVertexForcing(); 233 triavertexforcing->Demarshall(&marshalled_dataset); 234 dataset->AddObject(triavertexforcing);} 235 break; 230 236 case PentaVertexInputEnum:{ 231 237 PentaVertexInput* pentavertexinput=NULL; … … 355 361 break; 356 362 default: 357 _error_("could not recognize enum type: % i (%s)",enum_type,EnumToStringx(enum_type));363 _error_("could not recognize enum type: %s",EnumToStringx(enum_type)); 358 364 } 359 360 365 } 361 366 -
issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp
r8224 r8371 23 23 case VyObsEnum : return "vy_obs"; 24 24 case GroundingLineMigrationEnum : return "gl_migration"; 25 case AccumulationRateEnum: return "accumulation_rate"; 26 case MeltingRateEnum: return "melting_rate"; 25 27 default : _error_("No model field is associated to enum %s",EnumToStringx(en)); 26 28 } -
issm/trunk/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp
r8365 r8371 24 24 25 25 /*if no forcings, bail out: */ 26 printf("numforcings: %i\n",iomodel->numforcings);27 26 if(!iomodel->numforcings)return; 28 27 … … 37 36 38 37 forcingenum=iomodel->forcingtypes[i]; 39 printf("forcing enum: %g\n",iomodel->forcingtypes[i]);40 38 41 39 sprintf(&fetchstring[0],"forcing_%s_num_time_steps",EnumToStringx(forcingenum)); -
issm/trunk/src/c/objects/Inputs/TriaVertexForcing.cpp
r8363 r8371 180 180 181 181 memcpy(values,marshalled_dataset,3*numtimesteps*sizeof(double));marshalled_dataset+=3*numtimesteps*sizeof(double); 182 memcpy(timesteps,marshalled_dataset, 3*numtimesteps*sizeof(double));marshalled_dataset+=3*numtimesteps*sizeof(double);182 memcpy(timesteps,marshalled_dataset,numtimesteps*sizeof(double));marshalled_dataset+=numtimesteps*sizeof(double); 183 183 184 184 /*return: */
Note:
See TracChangeset
for help on using the changeset viewer.