Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 15642) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 15643) @@ -133,5 +133,5 @@ virtual void HydrologyEPLGetActive(Vector* active)=0; #endif - + #ifdef _HAVE_GROUNDINGLINE_ virtual void MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15643) @@ -794,5 +794,4 @@ area_init=fabs(xyz_list[1][0]*xyz_list[2][1] - xyz_list[1][1]*xyz_list[2][0] + xyz_list[0][0]*xyz_list[1][1] - xyz_list[0][1]*xyz_list[1][0] + xyz_list[2][0]*xyz_list[0][1] - xyz_list[2][1]*xyz_list[0][0])/2.; - /*Initialize xyz_list with original xyz_list of triangle coordinates*/ for(j=0;j<3;j++){ @@ -2342,9 +2341,9 @@ /*Add input to the element: */ this->inputs->AddInput(new PentaInput(name,values,P1Enum)); - + /*Free ressources:*/ xDelete(doflist); return; - + default: _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet"); @@ -2422,5 +2421,5 @@ name==HydrologydcMaskEplactiveEnum || name==WaterTransferEnum - + ) { return true; @@ -7325,5 +7324,5 @@ /*Transform Coordinate System*/ TransformStiffnessMatrixCoord(Ke,nodes,NUMVERTICES,XYZPEnum); - + /*Clean up and return*/ delete gauss; @@ -8173,5 +8172,4 @@ _error_("Finite element" << fe_FS << " not supported yet"); } - /*clean-up and return*/ @@ -9985,5 +9983,5 @@ if (!IsOnBed()) return; - + Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. tria->GetHydrologyDCInefficientHmax(ph_max,innode); @@ -9995,5 +9993,5 @@ if (!IsOnBed()) return; - + Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. tria->GetHydrologyTransfer(transfer); @@ -10036,5 +10034,5 @@ if (!IsOnBed())return; - + Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. tria->HydrologyEPLGetActive(active_vec); @@ -10047,9 +10045,9 @@ if (!IsOnBed())return; - + Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. tria->HydrologyEPLGetMask(vec_mask); delete tria->material; delete tria; - + } /*}}}*/ @@ -10087,7 +10085,7 @@ this->parameters->FindParam(&kmax,HydrologySedimentKmaxEnum); this->parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); - + kappa=kmax*pow(10.,penalty_factor); - + Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. for(int i=0;i* transfer); Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 15643) @@ -1457,5 +1457,4 @@ } - } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15643) @@ -24,5 +24,5 @@ /*FUNCTION Tria::Tria(){{{*/ Tria::Tria(){ - + int i; @@ -3483,5 +3483,4 @@ xDelete(values); xDelete(doflist); - } @@ -4541,5 +4540,4 @@ pow(log((fabs(vx)+epsvel)/(fabs(vxobs)+epsvel)),2) + pow(log((fabs(vy)+epsvel)/(fabs(vyobs)+epsvel)),2) ); - /*Add to cost function*/ @@ -5628,12 +5626,12 @@ /*FUNCTION Tria::AllActive{{{*/ bool Tria::AllActive(void){ - + /*Intermediaries*/ const int numnodes = NUMVERTICES; - + for(int i=0;inodes[i]->IsActive()) return false; } - + return true; } @@ -5641,12 +5639,12 @@ /*FUNCTION Tria::AnyActive{{{*/ bool Tria::AnyActive(void){ - + /*Intermediaries*/ const int numnodes = NUMVERTICES; - + for(int i=0;inodes[i]->IsActive()) return true; } - + return false; }/*}}}*/ @@ -6096,5 +6094,5 @@ } delete gauss; - + /* Add residual if necessary*/ gauss=new GaussTria(); @@ -6113,5 +6111,5 @@ /*FUNCTION Tria::GetSolutionFromInputsOneDof{{{*/ void Tria::GetSolutionFromInputsOneDof(Vector* solution, int enum_type){ - + const int numdof=NDOF1*NUMVERTICES; @@ -6200,7 +6198,7 @@ this->parameters->FindParam(&kmax,HydrologySedimentKmaxEnum); this->parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); - + kappa=kmax*pow(10.,penalty_factor); - + for(int i=0;iGetHydrologyDCInefficientHmax(&h_max,nodes[i]); @@ -6272,8 +6270,8 @@ GetDofList(&doflist,NoneApproximationEnum,GsetEnum); - + /*Get the flag to know if the efficient layer is present*/ this->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); - + if(isefficientlayer){ /*Also get the flag to the transfer method*/ @@ -6290,10 +6288,10 @@ GetInputListOnVertices(&sed_head[0],SedimentHeadEnum); GetInputListOnVertices(&epl_head[0],EplHeadEnum); - + this->parameters->FindParam(&leakage,HydrologydcLeakageFactorEnum); sed_trans = matpar->GetSedimentTransmitivity(); sed_thick = matpar->GetSedimentThickness(); - + for(int i=0;iGetEplStoring(); sedstoring[i]=matpar->GetSedimentStoring(); - + /*EPL head higher than sediment head, transfer from the epl to the sediment*/ if(epl_head[i]>sed_head[i]){ wh_trans=eplstoring[i]*sed_trans*(epl_head[i]-sed_head[i])/(leakage*sed_thick); - + /*No transfer if the sediment head is allready at the maximum*/ this->GetHydrologyDCInefficientHmax(&h_max,nodes[i]); @@ -6337,9 +6335,9 @@ IssmDouble flag = 0.; IssmDouble active[numnodes]; - + GetInputListOnVertices(&active[0],HydrologydcMaskEplactiveEnum); for(int i=0;i0.){ for(int i=0;i0 */ @@ -6380,5 +6378,5 @@ vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL); } - + /*If mask was alread one, keep one*/ else if(old_active[i]>0.){ Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 15643) @@ -345,5 +345,5 @@ _printf0_("Core solution number of flops : " << solution_flops << " Flops\n"); _printf0_("Core solution memory used : " << solution_memory << " Bytes\n"); - + /*Add to results: */ results->AddObject(new GenericExternalResult(results->Size()+1, ProfilingSolutionTimeEnum, solution_time, 1, 0)); @@ -359,5 +359,4 @@ _printf0_("AD Solution number of flops : " << solution_flops << " Flops\n"); _printf0_("AD Solution memory used : " << solution_memory << " Bytes\n"); - #endif @@ -884,5 +883,5 @@ element->CreateKMatrix(Kff,Kfs); } - + for (i=0;iloads->Size();i++){ load=dynamic_cast(this->loads->GetObjectByOffset(i)); Index: /issm/trunk-jpl/src/c/classes/IndependentObject.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IndependentObject.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/classes/IndependentObject.cpp (revision 15643) @@ -181,5 +181,5 @@ iomodel->data[name]=matrix; iomodel->independents[name]=true; - + //Finally, record the number of independents created: this->numberofindependents=M*N; Index: /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 15643) @@ -288,5 +288,4 @@ _assert_(this->NumberofNodes()==6); //Check Tria too - /*Here, we are computing the strain rate of (vx,0)*/ for(i=0;iNumberofNodes()==6); //Check Tria too - /*Here, we are computing the strain rate of (0,vy)*/ Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp (revision 15643) @@ -62,6 +62,4 @@ if (yposting<0) yflip=1; else yflip=0; - - /*Get extreme coordinates of the grid*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateLoadsHydrologyDCInefficient.cpp (revision 15643) @@ -16,5 +16,5 @@ iomodel->Constant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; - + iomodel->FetchData(1,MeshVertexonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/NodesPartitioning.cpp (revision 15643) @@ -43,5 +43,4 @@ * continuous galerkin, but the nodes partitioning involves faces, which * messes up sorting of ids. */ - /*Intermediaries*/ Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15642) +++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15643) @@ -19,8 +19,8 @@ Vector* uf_epl_sub_iter=NULL; Vector* ug_epl_main_iter=NULL; - + Vector* ys=NULL; Vector* dug=NULL; - + Matrix* Kff=NULL; Matrix* Kfs=NULL; @@ -51,5 +51,5 @@ //femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum); GetSolutionFromInputsx(&ug_sed, femmodel->elements, femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); - + if(isefficientlayer) { femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum); @@ -137,5 +137,5 @@ ConstraintsStatex(&constraints_converged,&num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); femmodel->HydrologyEPLupdateDomainx(); - + if (!eplconverged){ if(VerboseConvergence()) _printf0_(" # EPL unstable constraints = " << num_unstable_constraints << "\n"); @@ -206,5 +206,5 @@ if(hydroconverged)break; } - + InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_sed); if(isefficientlayer)InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug_epl); Index: /issm/trunk-jpl/src/m/classes/model/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model/model.m (revision 15642) +++ /issm/trunk-jpl/src/m/classes/model/model.m (revision 15643) @@ -1207,11 +1207,10 @@ eval(['delete ' id]); - end % }}} function md=download(md) % {{{ - + %the goal of this routine is to download the internals of the current model from a server, because %this model is empty, except for the settings which tell us where to go and find this model! - + %Download the file: issmscpin(md.settings.upload_server, md.settings.upload_login, md.settings.upload_port, md.settings.upload_path, {md.settings.upload_filename}); Index: /issm/trunk-jpl/src/m/classes/settings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/settings.m (revision 15642) +++ /issm/trunk-jpl/src/m/classes/settings.m (revision 15643) @@ -46,5 +46,5 @@ %0 to deactivate obj.waitonlock=Inf; - + %upload options: upload_port = 0; Index: /issm/trunk-jpl/src/m/coordsystems/lambert2xy.m =================================================================== --- /issm/trunk-jpl/src/m/coordsystems/lambert2xy.m (revision 15642) +++ /issm/trunk-jpl/src/m/coordsystems/lambert2xy.m (revision 15643) @@ -67,3 +67,2 @@ y=(B/D)*((cos(b0)*sin(b))-(sin(b0)*cos(b)*cos(lam-lam0))); end - Index: /issm/trunk-jpl/src/m/coordsystems/xy2lambert.m =================================================================== --- /issm/trunk-jpl/src/m/coordsystems/xy2lambert.m (revision 15642) +++ /issm/trunk-jpl/src/m/coordsystems/xy2lambert.m (revision 15643) @@ -67,3 +67,2 @@ lon=lon_rad*180/pi; end - Index: /issm/trunk-jpl/src/m/plot/plot_icefront.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_icefront.m (revision 15642) +++ /issm/trunk-jpl/src/m/plot/plot_icefront.m (revision 15643) @@ -35,5 +35,4 @@ %Plot zero icelevelset line - else