Changeset 8371


Ignore:
Timestamp:
05/20/11 08:12:44 (14 years ago)
Author:
Mathieu Morlighem
Message:

trunk: fixed marshall/demarshall of TriaVertecForcing

Location:
issm/trunk/src/c
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/Container/DataSet.cpp

    r8224 r8371  
    228228                                dataset->AddObject(triavertexinput);}
    229229                                break;
     230                        case TriaVertexForcingEnum:{
     231                                TriaVertexForcing* triavertexforcing=NULL;
     232                                triavertexforcing=new TriaVertexForcing();
     233                                triavertexforcing->Demarshall(&marshalled_dataset);
     234                                dataset->AddObject(triavertexforcing);}
     235                                break;
    230236                        case PentaVertexInputEnum:{
    231237                                PentaVertexInput* pentavertexinput=NULL;
     
    355361                                break;
    356362                        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));
    358364                }
    359 
    360365        }
    361366
  • issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp

    r8224 r8371  
    2323                case VyObsEnum : return "vy_obs";
    2424                case GroundingLineMigrationEnum : return "gl_migration";
     25                case AccumulationRateEnum: return "accumulation_rate";
     26                case MeltingRateEnum: return "melting_rate";
    2527                default : _error_("No model field is associated to enum %s",EnumToStringx(en));
    2628        }
  • issm/trunk/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

    r8365 r8371  
    2424
    2525        /*if no forcings, bail out: */
    26         printf("numforcings: %i\n",iomodel->numforcings);
    2726        if(!iomodel->numforcings)return;
    2827
     
    3736
    3837                forcingenum=iomodel->forcingtypes[i];
    39                 printf("forcing enum: %g\n",iomodel->forcingtypes[i]);
    4038               
    4139                sprintf(&fetchstring[0],"forcing_%s_num_time_steps",EnumToStringx(forcingenum));
  • issm/trunk/src/c/objects/Inputs/TriaVertexForcing.cpp

    r8363 r8371  
    180180       
    181181        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);
    183183
    184184        /*return: */
Note: See TracChangeset for help on using the changeset viewer.