Changeset 17645

Timestamp:

04/03/14 22:08:05 (11 years ago)

Author:

cborstad

Message:

CHG: forgot to remove print statement from debugging

File:

• issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (modified) (3 diffs)

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

@@ -27 +27 @@
         iomodel->FetchData(&requestedoutputs,&numoutputs,DamageEvolutionRequestedOutputsEnum);
         parameters->AddObject(new IntParam(DamageEvolutionNumRequestedOutputsEnum,numoutputs));
-        _printf0_("numoutputs = " << numoutputs << ", requestedoutputs = " << requestedoutputs);
         if(numoutputs)parameters->AddObject(new StringArrayParam(DamageEvolutionRequestedOutputsEnum,requestedoutputs,numoutputs));
         iomodel->DeleteData(&requestedoutputs,numoutputs,DamageEvolutionRequestedOutputsEnum);
@@ -80 +79 @@
 void DamageEvolutionAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
 
-        int stabilization;
+        int stabilization,finitelelement;
         iomodel->Constant(&stabilization,DamageStabilizationEnum);
 
@@ -209 +208 @@
                         if(dim==1){
                                 vel=fabs(vx)+1.e-8;
-                                D[0]=h/(2*vel)*vx*vx;
+                                D[0]=h/(2.0*vel)*vx*vx;
                         }
                         else{
                                 /*Streamline upwinding*/
                                 vel=sqrt(vx*vx+vy*vy)+1.e-8;
-                                D[0*dim+0]=h/(2*vel)*vx*vx;
-                                D[1*dim+0]=h/(2*vel)*vy*vx;
-                                D[0*dim+1]=h/(2*vel)*vx*vy;
-                                D[1*dim+1]=h/(2*vel)*vy*vy;
+                                D[0*dim+0]=h/(2.0*vel)*vx*vx;
+                                D[1*dim+0]=h/(2.0*vel)*vy*vx;
+                                D[0*dim+1]=h/(2.0*vel)*vx*vy;
+                                D[1*dim+1]=h/(2.0*vel)*vy*vy;
                         }
                 }