Changeset 8371

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:

• Container/DataSet.cpp (modified) (2 diffs)
• EnumDefinitions/EnumToModelField.cpp (modified) (1 diff)
• modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (2 diffs)
• objects/Inputs/TriaVertexForcing.cpp (modified) (1 diff)

issm/trunk/src/c/Container/DataSet.cpp

@@ -228 +228 @@
                                 dataset->AddObject(triavertexinput);}
                                 break;
+                        case TriaVertexForcingEnum:{
+                                TriaVertexForcing* triavertexforcing=NULL;
+                                triavertexforcing=new TriaVertexForcing();
+                                triavertexforcing->Demarshall(&marshalled_dataset);
+                                dataset->AddObject(triavertexforcing);}
+                                break;
                         case PentaVertexInputEnum:{
                                 PentaVertexInput* pentavertexinput=NULL;
@@ -355 +361 @@
                                 break;
                         default:
-                                _error_("could not recognize enum type: %i (%s)",enum_type,EnumToStringx(enum_type));
+                                _error_("could not recognize enum type: %s",EnumToStringx(enum_type));
                 }
-
         }
 

issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp

@@ -23 +23 @@
                 case VyObsEnum : return "vy_obs";
                 case GroundingLineMigrationEnum : return "gl_migration";
+                case AccumulationRateEnum: return "accumulation_rate";
+                case MeltingRateEnum: return "melting_rate";
                 default : _error_("No model field is associated to enum %s",EnumToStringx(en));
         }

issm/trunk/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

@@ -24 +24 @@
 
         /*if no forcings, bail out: */
-        printf("numforcings: %i\n",iomodel->numforcings);
         if(!iomodel->numforcings)return;
 
@@ -37 +36 @@
 
                 forcingenum=iomodel->forcingtypes[i];
-                printf("forcing enum: %g\n",iomodel->forcingtypes[i]);
                 
                 sprintf(&fetchstring[0],"forcing_%s_num_time_steps",EnumToStringx(forcingenum));

issm/trunk/src/c/objects/Inputs/TriaVertexForcing.cpp

@@ -180 +180 @@
         
         memcpy(values,marshalled_dataset,3*numtimesteps*sizeof(double));marshalled_dataset+=3*numtimesteps*sizeof(double);
-        memcpy(timesteps,marshalled_dataset,3*numtimesteps*sizeof(double));marshalled_dataset+=3*numtimesteps*sizeof(double);
+        memcpy(timesteps,marshalled_dataset,numtimesteps*sizeof(double));marshalled_dataset+=numtimesteps*sizeof(double);
 
         /*return: */