Changeset 7097

Timestamp:

01/14/11 10:11:53 (14 years ago)

Author:

Mathieu Morlighem

Message:

use only gl_migration: more consistent. Tis fixes Serial runs

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)
• c/objects/Elements/Tria.cpp (modified) (1 diff)
• c/objects/IoModel.cpp (modified) (1 diff)
• c/objects/IoModel.h (modified) (1 diff)
• c/solutions/transient2d_core.cpp (modified) (4 diffs)
• m/model/marshall.m (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -75 +75 @@
         parameters->AddObject(new BoolParam(KffEnum,iomodel->kff));
         parameters->AddObject(new BoolParam(IoGatherEnum,iomodel->io_gather));
-        parameters->AddObject(new BoolParam(GroundingLineMigrationEnum,iomodel->grounding_line_migration));
+        parameters->AddObject(new BoolParam(GroundingLineMigrationEnum,iomodel->gl_migration));
 
         /*Deal with more complex parameters*/

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -39 +39 @@
         IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
         IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
-        if(iomodel->grounding_line_migration) IoModelFetchData(&iomodel->bathymetry,NULL,NULL,iomodel_handle,"bathymetry");
+        if(iomodel->gl_migration) IoModelFetchData(&iomodel->bathymetry,NULL,NULL,iomodel_handle,"bathymetry");
         if (iomodel->dim==3){
                 IoModelFetchData(&iomodel->elementonbed,NULL,NULL,iomodel_handle,"elementonbed");

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -3594 +3594 @@
                 this->inputs->AddInput(new TriaVertexInput(BedEnum,nodeinputs));
         }
-        if(iomodel->grounding_line_migration){
+        if(iomodel->gl_migration){
                 for(i=0;i<3;i++)nodeinputs[i]=iomodel->bathymetry[tria_vertex_ids[i]-1];
                 this->inputs->AddInput(new TriaVertexInput(BathymetryEnum,nodeinputs));

issm/trunk/src/c/objects/IoModel.cpp

@@ -193 +193 @@
         IoModelFetchData(&this->waitonlock,iomodel_handle,"waitonlock");
         IoModelFetchData(&this->kff,iomodel_handle,"kff");
-        IoModelFetchData(&this->grounding_line_migration,iomodel_handle,"grounding_line_migration");
+        IoModelFetchData(&this->gl_migration,iomodel_handle,"gl_migration");
 
         /*!Get thermal parameters: */

issm/trunk/src/c/objects/IoModel.h

@@ -192 +192 @@
 
                 /*grounding line migration: */
-                int      grounding_line_migration;
+                int      gl_migration;
 
                 /*exterior partitioning data, to be carried around: */

issm/trunk/src/c/solutions/transient2d_core.cpp

@@ -22 +22 @@
         bool   time_adapt=false;
         int    output_frequency;
-        bool   grounding_line_migration;
+        bool   gl_migration;
 
         /*intermediary: */
@@ -36 +36 @@
         femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum);
         femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum);
-        femmodel->parameters->FindParam(&grounding_line_migration,GroundingLineMigrationEnum);
+        femmodel->parameters->FindParam(&gl_migration,GroundingLineMigrationEnum);
 
         /*initialize: */
@@ -61 +61 @@
                 prognostic_core(femmodel);
 
-                if (grounding_line_migration){
+                if (gl_migration){
                         _printf_(VerboseSolution(),"%s\n","   computing new grounding line position");
                         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);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
-                        if(grounding_line_migration)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
+                        if(gl_migration)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
 
                         /*unload results*/

issm/trunk/src/m/model/marshall.m

@@ -163 +163 @@
 
 %grounding line migration: 
-WriteData(fid,md.gl_migration,'Integer','grounding_line_migration');
+WriteData(fid,md.gl_migration,'Integer','gl_migration');
 if(md.gl_migration),
         WriteData(fid,md.bathymetry,'Mat','bathymetry');