Changeset 17463

Timestamp:

03/18/14 15:31:50 (11 years ago)

Author:

jbondzio

Message:

minor: cleanup code

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• analyses/ExtrapolationAnalysis.cpp (modified) (4 diffs)
• analyses/LevelsetAnalysis.cpp (modified) (5 diffs)
• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• analyses/StressbalanceSIAAnalysis.cpp (modified) (1 diff)
• analyses/ThermalAnalysis.cpp (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• cores/transient_core.cpp (modified) (1 diff)
• modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (2 diffs)

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

@@ -853 +853 @@
         femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
         if(islevelset){
-                _printf0_("   Updating active and non-active nodes for ThermalAnalysis \n");
                 SetActiveNodesLSMx(femmodel);
         }

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

@@ -12 +12 @@
 void ExtrapolationAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
         //do nothing for now
+        return;
 }
 /*}}}*/
@@ -44 +45 @@
 void ExtrapolationAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
         // do nothing for now
+        return;
 }
 /*}}}*/
 void ExtrapolationAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-//      do nothing for now
+        //      do nothing for now
+        return;
 }/*}}}*/
 
@@ -70 +73 @@
                 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);
         }
-
 }/*}}}*/
 ElementVector* ExtrapolationAnalysis::CreateDVector(Element* element){/*{{{*/
@@ -348 +350 @@
                 this->SetConstraintsOnIce(element);
         }
-
-}/*}}}*/
+}/*}}}*/

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

@@ -11 +11 @@
 /*}}}*/
 void LevelsetAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
-        // parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsSIAEnum));
+        return;
 }
 /*}}}*/
@@ -34 +34 @@
         iomodel->FetchDataToInput(elements,VyEnum);
         iomodel->FetchDataToInput(elements,MasstransportCalvingrateEnum);
-        
-        if(iomodel->meshtype==Mesh3DEnum){
-                iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
-                iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
-        }
 }
 /*}}}*/
@@ -49 +44 @@
 /*}}}*/
 void LevelsetAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
-
-        /*Intermediary*/
-
-        /*Fetch parameters: */
-
+        return;
 }
 /*}}}*/
 void LevelsetAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-        
-        /*Intermediary*/
-
-        /*Fetch parameters: */
-
+        return;
 }/*}}}*/
 
@@ -73 +60 @@
         /*parameters: */
         bool save_results;
-        
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
 
@@ -525 +511 @@
         return fabs(a[0]*b[1]-a[1]*b[0])/norm_b;
 }/*}}}*/
-

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

@@ -755 +755 @@
         femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
         if(islevelset){
-                _printf0_("   Updating active and non-active nodes for MasstransportAnalysis \n");
                 SetActiveNodesLSMx(femmodel);
         }

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

@@ -1038 +1038 @@
         femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
         if(islevelset){
-                _printf0_("   Updating active and non-active nodes for StressbalanceAnalysis \n");
                 SetActiveNodesLSMx(femmodel);
         }

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

@@ -580 +580 @@
         femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
         if(islevelset){
-                _printf0_("   Updating active and non-active nodes for StressbalanceSIAAnalysis \n");
                 SetActiveNodesLSMx(femmodel);
         }

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

@@ -717 +717 @@
         femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
         if(islevelset){
-                _printf0_("   Updating active and non-active nodes for ThermalAnalysis \n");
                 SetActiveNodesLSMx(femmodel);
         }

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2912 +2912 @@
         /*If the level set has always same sign, there is no ice front here*/
         iszerols = false;
-        if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){
-                iszerols = true;
+        if(IsIceInElement()){
+                if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){
+                        iszerols = true;
+                }
         }
         return iszerols;

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2347 +2347 @@
         /*If the level set is awlays <0, there is no ice front here*/
         iszerols= false;
-        if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){
-                iszerols = true;
+        if(IsIceInElement()){
+                if(ls[0]*ls[1]<0. || ls[0]*ls[2]<0. || (ls[0]*ls[1]*ls[2]==0. && ls[0]*ls[1]+ls[0]*ls[2]+ls[1]*ls[2]<=0.)){
+                        iszerols = true;
+                }
         }
 

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -407 +407 @@
 
         /*start module: */
-        if(VerboseModule()) _printf0_("   Updating constraints for time: " << time << "\n");
+        if(VerboseModule()) _printf0_("   Updating constraints and active domain of analysis " << EnumToStringx(analysis_type)  << " for time: " << time << "\n");
 
         Analysis* analysis= EnumToAnalysis(analysis_type);

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

@@ -93 +93 @@
         }
 
-//      if(islevelset){
-//              /* set distance on elements intersected by zero level set */
-//              LevelsetAnalysis* lsfanalysis = new LevelsetAnalysis();
-//              lsfanalysis->SetDistanceOnIntersectedElements(femmodel);
-//              delete lsfanalysis;
-//      }
-        
         while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime.
 

issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp

@@ -49 +49 @@
                 }
 
+                /* if solving 2d problem on vertically extende mesh, solve on basal layer only*/
                 if(meshtype!=Mesh2DhorizontalEnum){
                         femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
@@ -97 +98 @@
         /* Intermediaries */
         int i;
+
         /*Initialize vector with number of vertices*/
         int numvertices=femmodel->vertices->NumberOfVertices();