Changeset 3707

Timestamp:

05/11/10 09:12:34 (15 years ago)

Author:

seroussi

Message:

dhdt and not dt

Location:

issm/trunk/src/c/objects/Elements

Files:

• Beam.cpp (modified) (1 diff)
• Penta.cpp (modified) (2 diffs)
• Sing.cpp (modified) (1 diff)
• Tria.cpp (modified) (3 diffs)

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

@@ -142 +142 @@
         }       
         if (iomodel->gridonbed) this->inputs->AddInput(new BoolInput(ElementOnBedEnum,(IssmBool)iomodel->gridonbed[index]));
-        if (iomodel->dt) this->inputs->AddInput(new DoubleInput(DtEnum,iomodel->dt));
 
         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.

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

@@ -126 +126 @@
                 this->inputs->AddInput(new PentaVertexInput(TemperatureEnum,nodeinputs));
         }
+        if (iomodel->dhdt) {
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->dhdt[penta_node_ids[i]-1];
+                this->inputs->AddInput(new PentaVertexInput(DhdtEnum,nodeinputs));
+        }
 
         /*vx,vy and vz: */
@@ -161 +165 @@
         if (iomodel->elementonwater) this->inputs->AddInput(new BoolInput(ElementOnWaterEnum,(IssmBool)iomodel->elementonwater[index]));
         if (iomodel->elementonsurface) this->inputs->AddInput(new BoolInput(ElementOnSurfaceEnum,(IssmBool)iomodel->elementonsurface[index]));
-        if (iomodel->dt) this->inputs->AddInput(new DoubleInput(DtEnum,iomodel->dt));
 
         //elements of type 3 are macayeal type penta. we collapse the formulation on their base.

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

@@ -94 +94 @@
         if (iomodel->vz_obs) this->inputs->AddInput(new SingVertexInput(VzEnum,iomodel->vz_obs[i]));
         if (iomodel->weights) this->inputs->AddInput(new SingVertexInput(WeightsEnum,iomodel->weights[i]));
-
-        if (iomodel->dt) this->inputs->AddInput(new DoubleInput(DtEnum,iomodel->dt));
 
         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.

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

@@ -117 +117 @@
                 if (iomodel->drag_q) this->inputs->AddInput(new DoubleInput(DragQEnum,iomodel->drag_q[index]));
                 this->inputs->AddInput(new IntInput(DragTypeEnum,iomodel->drag_type));
-
+s
         }
         if (iomodel->melting_rate) {
@@ -130 +130 @@
                 for(i=0;i<3;i++)nodeinputs[i]=iomodel->geothermalflux[tria_node_ids[i]-1];
                 this->inputs->AddInput(new TriaVertexInput(GeothermalFluxEnum,nodeinputs));
+        }
+        if (iomodel->dhdt) {
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->dhdt[tria_node_ids[i]-1];
+                this->inputs->AddInput(new TriaVertexInput(DhDtEnum,nodeinputs));
         }
         if (iomodel->pressure) {
@@ -174 +178 @@
         if (iomodel->elementonwater) this->inputs->AddInput(new BoolInput(ElementOnWaterEnum,(IssmBool)iomodel->elementonwater[index]));
         if (iomodel->elementonsurface) this->inputs->AddInput(new BoolInput(ElementOnSurfaceEnum,(IssmBool)iomodel->elementonsurface[index]));
-        if (iomodel->dt) this->inputs->AddInput(new DoubleInput(DtEnum,iomodel->dt));
 
         //this->parameters: we still can't point to it, it may not even exist. Configure will handle this.