Changeset 9232

Timestamp:

08/09/11 16:06:03 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added spc handling for prognostic DG

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• objects/Loads/Numericalflux.cpp (modified) (4 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

@@ -41 +41 @@
         IoModelToInputsx(elements,iomodel,iomodel_handle,VxEnum);
         IoModelToInputsx(elements,iomodel,iomodel_handle,VyEnum);
+
+        if(iomodel->prognostic_DG){
+                IoModelToInputsx(elements,iomodel,iomodel_handle,SpcthicknessEnum); //for DG, we need the spc in the element
+        }
         
         if (iomodel->dim==3){

issm/trunk/src/c/objects/Loads/Numericalflux.cpp

@@ -515 +515 @@
         GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES_BOUNDARY);
         parameters->FindParam(&dt,DtEnum);
-        Input* vxaverage_input=tria->inputs->GetInput(VxEnum);
-        Input* vyaverage_input=tria->inputs->GetInput(VyEnum);
+        Input* vxaverage_input=tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input);
+        Input* vyaverage_input=tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input);
         GetNormal(&normal[0],xyz_list);
 
@@ -793 +793 @@
         GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES_BOUNDARY);
         parameters->FindParam(&dt,DtEnum);
-        Input* vxaverage_input=tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input); 
-        Input* vyaverage_input=tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input);
-        Input* thickness_input=tria->inputs->GetInput(ThicknessEnum); _assert_(thickness_input);
+        Input* vxaverage_input   =tria->inputs->GetInput(VxEnum); _assert_(vxaverage_input); 
+        Input* vyaverage_input   =tria->inputs->GetInput(VyEnum); _assert_(vyaverage_input);
+        Input* spcthickness_input=tria->inputs->GetInput(SpcthicknessEnum); _assert_(spcthickness_input);
         GetNormal(&normal[0],xyz_list);
 
@@ -826 +826 @@
                 vxaverage_input->GetParameterValue(&vx,gauss);
                 vyaverage_input->GetParameterValue(&vy,gauss);
-                thickness_input->GetParameterValue(&thickness,gauss);
+                spcthickness_input->GetParameterValue(&thickness,gauss);
+                if(isnan(thickness)) _error_("Cannot weakly apply constraint because NaN was provided");
+
                 UdotN=vx*normal[0]+vy*normal[1];
                 tria->GetSegmentJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss);
@@ -917 +919 @@
                 vyaverage_input->GetParameterValue(&vy,gauss);
                 thickness_input->GetParameterValue(&thickness,gauss);
+
                 UdotN=vx*normal[0]+vy*normal[1];
                 tria->GetSegmentJacobianDeterminant(&Jdet,&xyz_list[0][0],gauss);