Changeset 539

Timestamp:

05/20/09 12:03:38 (16 years ago)

Author:

Mathieu Morlighem

Message:

get doflist missing

File:

• issm/trunk/src/c/objects/Pengrid.cpp (modified) (5 diffs)

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

@@ -404 +404 @@
         /*Get dof list: */
         GetDofList(&doflist[0],&numberofdofspernode);
-        
-                //First recover pressure
-                found=inputs->Recover("pressure",&pressure,1,dofs1,numgrids,(void**)&node);
-                if(!found)throw ErrorException(__FUNCT__," could not find pressure in inputs!");
-
-                //Compute pressure melting point
-                meltingpoint=matpar->GetMeltingPoint();
-                beta=matpar->GetBeta();
-                t_pmp=meltingpoint-beta*pressure;
-
-                //Add penalty load
-                P_terms[0]=kmax*pow(10,penalty_offset)*t_pmp;
-
-                /*Add P_terms to global vector pg: */
-                VecSetValues(pg,numdof,doflist,(const double*)P_terms,ADD_VALUES);
+
+        //First recover pressure
+        found=inputs->Recover("pressure",&pressure,1,dofs1,numgrids,(void**)&node);
+        if(!found)throw ErrorException(__FUNCT__," could not find pressure in inputs!");
+
+        //Compute pressure melting point
+        meltingpoint=matpar->GetMeltingPoint();
+        beta=matpar->GetBeta();
+        t_pmp=meltingpoint-beta*pressure;
+
+        //Add penalty load
+        P_terms[0]=kmax*pow(10,penalty_offset)*t_pmp;
+
+        /*Add P_terms to global vector pg: */
+        VecSetValues(pg,numdof,doflist,(const double*)P_terms,ADD_VALUES);
 }
 
@@ -426 +426 @@
         const int NDOF1=1;
         const int numdof=numgrids*NDOF1;
-        int       doflist[numdof];
-        double  P_terms[numdof]={0.0};
-        int numberofdofspernode;
+        int    doflist[numdof];
+        double P_terms[numdof]={0.0};
+        int    numberofdofspernode;
         int    found=0;
-        int dofs1[1]={0};
+        int    dofs1[1]={0};
         double pressure;
         double temperature;
@@ -445 +445 @@
         inputs=(ParameterInputs*)vinputs;
 
+        /*Get dof list: */
+        GetDofList(&doflist[0],&numberofdofspernode);
+
         //First recover pressure,melting offset and temperature vectors
         found=inputs->Recover("pressure",&pressure,1,dofs1,numgrids,(void**)&node);
@@ -457 +460 @@
         found=inputs->Recover("dt",&dt);
         if((!found) && (sub_analysis_type==TransientAnalysisEnum()))throw ErrorException(__FUNCT__," could not find dt in inputs!");
-
 
         meltingpoint=matpar->GetMeltingPoint();
@@ -482 +484 @@
                 }
         }
+
         /*Add P_terms to global vector pg: */
         VecSetValues(pg,numdof,doflist,(const double*)P_terms,ADD_VALUES);