Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 16689) +++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 16690) @@ -91,17 +91,6 @@ }/*}}}*/ 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*/ }/*}}}*/ Index: ../trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 16689) +++ ../trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 16690) @@ -12,6 +12,17 @@ }/*}}}*/ 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: */ int counter=0; for(int i=0;inumberofelements;i++){ @@ -29,7 +40,16 @@ } }/*}}}*/ 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){ iomodel->FetchData(1,MeshVertexonbedEnum); } Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16689) +++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 16690) @@ -10818,8 +10818,6 @@ /*And proceed to the real thing*/ 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]); } } penta=this;