Changeset 16690

Timestamp:

11/08/13 14:32:29 (11 years ago)

Author:

bdef

Message:

BUG: adding isefficient test in L2ProjectionEPLAnalysis

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• analyses/L2ProjectionEPLAnalysis.cpp (modified) (2 diffs)
• classes/Elements/Penta.cpp (modified) (1 diff)

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

@@ -92 +92 @@
 }/*}}}*/
 void HydrologyDCEfficientAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-
-        /*Do we really want DC?*/
-        int  hydrology_model;
-        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
-        if(hydrology_model!=HydrologydcEnum) return;
-
-        /*Do we want an efficient layer*/
-        bool isefficientlayer;
-        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
-        if(!isefficientlayer) return;
-
         /*Nothing for now*/
 }/*}}}*/

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

@@ -12 +12 @@
 }/*}}}*/
 void L2ProjectionEPLAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+
+        bool   isefficientlayer;
+        int    hydrology_model;
+
+        /*Now, do we really want DC?*/
+        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
+        if(hydrology_model!=HydrologydcEnum) return;
+
+        /*Do we want an efficient layer*/
+        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+        if(!isefficientlayer) return;
 
         /*Update elements: */
@@ -30 +41 @@
 }/*}}}*/
 void L2ProjectionEPLAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
+        /*Now, do we really want DC?*/
+        int  hydrology_model;
+        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
+        if(hydrology_model!=HydrologydcEnum) return;
+
+        /*Do we want an efficient layer*/
+        bool isefficientlayer;
+        iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+        if(!isefficientlayer) return;
 
         if(iomodel->meshtype==Mesh3DEnum){

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

@@ -10819 +10819 @@
                                 thickness[i] = old_thickness[i]*(1+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*pow(EPLgrad,2.0)-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
                                 thickness[i+numdof2d]=thickness[i];
-                                printf("N, %e - thick term2, %e \n",EPL_N,-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
-                                printf("old thick, %e - thick , %e \n",old_thickness[i],thickness[i]);
                         }
                 }