Changeset 17333

Timestamp:

02/21/14 09:43:55 (11 years ago)

Author:

seroussi

Message:

NEW: finished implementation of mass transport in 2d flowband

Location:

issm/trunk-jpl/src/c

Files:

• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• cores/masstransport_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -298 +298 @@
         }
         else{
-                vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input);
-                if(dim==2) vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input);
+                if(dim==1){
+                        vxaverage_input=element->GetInput(VxEnum); _assert_(vxaverage_input);
+                }
+                if(dim==2){
+                        vxaverage_input=element->GetInput(VxAverageEnum); _assert_(vxaverage_input);
+                        vyaverage_input=element->GetInput(VyAverageEnum); _assert_(vyaverage_input);
+                }
 
         }

issm/trunk-jpl/src/c/cores/masstransport_core.cpp

@@ -62 +62 @@
                 if(VerboseSolution()) _printf0_("   call computational core\n");
                 solutionsequence_linear(femmodel);
+                if(meshtype!=Mesh2DhorizontalEnum){
+                        femmodel->parameters->SetParam(ThicknessEnum,InputToExtrudeEnum);
+                        extrudefrombase_core(femmodel);
+                        femmodel->parameters->SetParam(BedEnum,InputToExtrudeEnum);
+                        extrudefrombase_core(femmodel);
+                        femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum);
+                        extrudefrombase_core(femmodel);
+                }
         }