Changeset 7097
- Timestamp:
- 01/14/11 10:11:53 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp
r7089 r7097 75 75 parameters->AddObject(new BoolParam(KffEnum,iomodel->kff)); 76 76 parameters->AddObject(new BoolParam(IoGatherEnum,iomodel->io_gather)); 77 parameters->AddObject(new BoolParam(GroundingLineMigrationEnum,iomodel->g rounding_line_migration));77 parameters->AddObject(new BoolParam(GroundingLineMigrationEnum,iomodel->gl_migration)); 78 78 79 79 /*Deal with more complex parameters*/ -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp
r7089 r7097 39 39 IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx"); 40 40 IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy"); 41 if(iomodel->g rounding_line_migration) IoModelFetchData(&iomodel->bathymetry,NULL,NULL,iomodel_handle,"bathymetry");41 if(iomodel->gl_migration) IoModelFetchData(&iomodel->bathymetry,NULL,NULL,iomodel_handle,"bathymetry"); 42 42 if (iomodel->dim==3){ 43 43 IoModelFetchData(&iomodel->elementonbed,NULL,NULL,iomodel_handle,"elementonbed"); -
issm/trunk/src/c/objects/Elements/Tria.cpp
r7091 r7097 3594 3594 this->inputs->AddInput(new TriaVertexInput(BedEnum,nodeinputs)); 3595 3595 } 3596 if(iomodel->g rounding_line_migration){3596 if(iomodel->gl_migration){ 3597 3597 for(i=0;i<3;i++)nodeinputs[i]=iomodel->bathymetry[tria_vertex_ids[i]-1]; 3598 3598 this->inputs->AddInput(new TriaVertexInput(BathymetryEnum,nodeinputs)); -
issm/trunk/src/c/objects/IoModel.cpp
r7089 r7097 193 193 IoModelFetchData(&this->waitonlock,iomodel_handle,"waitonlock"); 194 194 IoModelFetchData(&this->kff,iomodel_handle,"kff"); 195 IoModelFetchData(&this->g rounding_line_migration,iomodel_handle,"grounding_line_migration");195 IoModelFetchData(&this->gl_migration,iomodel_handle,"gl_migration"); 196 196 197 197 /*!Get thermal parameters: */ -
issm/trunk/src/c/objects/IoModel.h
r7089 r7097 192 192 193 193 /*grounding line migration: */ 194 int g rounding_line_migration;194 int gl_migration; 195 195 196 196 /*exterior partitioning data, to be carried around: */ -
issm/trunk/src/c/solutions/transient2d_core.cpp
r7089 r7097 22 22 bool time_adapt=false; 23 23 int output_frequency; 24 bool g rounding_line_migration;24 bool gl_migration; 25 25 26 26 /*intermediary: */ … … 36 36 femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum); 37 37 femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum); 38 femmodel->parameters->FindParam(&g rounding_line_migration,GroundingLineMigrationEnum);38 femmodel->parameters->FindParam(&gl_migration,GroundingLineMigrationEnum); 39 39 40 40 /*initialize: */ … … 61 61 prognostic_core(femmodel); 62 62 63 if (g rounding_line_migration){63 if (gl_migration){ 64 64 _printf_(VerboseSolution(),"%s\n"," computing new grounding line position"); 65 65 GroundingLineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); … … 75 75 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum,step,time); 76 76 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time); 77 if(g rounding_line_migration)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);77 if(gl_migration)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time); 78 78 79 79 /*unload results*/ -
issm/trunk/src/m/model/marshall.m
r7083 r7097 163 163 164 164 %grounding line migration: 165 WriteData(fid,md.gl_migration,'Integer','g rounding_line_migration');165 WriteData(fid,md.gl_migration,'Integer','gl_migration'); 166 166 if(md.gl_migration), 167 167 WriteData(fid,md.bathymetry,'Mat','bathymetry');
Note:
See TracChangeset
for help on using the changeset viewer.