Index: /issm/trunk-jpl/externalpackages/vim/addons/vimrc =================================================================== --- /issm/trunk-jpl/externalpackages/vim/addons/vimrc (revision 17229) +++ /issm/trunk-jpl/externalpackages/vim/addons/vimrc (revision 17230) @@ -100,13 +100,9 @@ " save & "make" the current file in all modes -map :w :make -map! :w :make +map :w :make +map! :w :make " make update: nice for longer documents -map :w :make update -map! :w :make update - -" switch between tabs -nmap :tabp -nmap :tabn +map :w :make update +map! :w :make update @@ -145,13 +141,4 @@ autocmd BufWritePost *.sh !chmod +x % - " Commenting blocks of code. - autocmd FileType c,cpp,java,scala let b:comment_leader = '// ' - autocmd FileType sh,ruby,python let b:comment_leader = '# ' - autocmd FileType conf,fstab let b:comment_leader = '# ' - autocmd FileType tex let b:comment_leader = '% ' - autocmd FileType mail let b:comment_leader = '> ' - autocmd FileType vim let b:comment_leader = '" ' - noremap ,cc :silent s/^/=escape(b:comment_leader,'\/')/:nohlsearch - noremap ,cu :silent s/^\V=escape(b:comment_leader,'\/')//e:nohlsearch endif " has("autocmd") " ----------------------------------------------------------------------}}} Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 17229) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 17230) @@ -285,6 +285,4 @@ ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h\ ./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp\ - ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h\ - ./modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp\ ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h\ ./modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp\ Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17229) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17230) @@ -33,5 +33,5 @@ iomodel->FetchDataToInput(elements,VxEnum); iomodel->FetchDataToInput(elements,VyEnum); - iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); + } /*}}}*/ @@ -67,12 +67,19 @@ bool save_results; + /* extrapolate */ + Analysis* analysis = new ExtrapolationAnalysis(); + femmodel->parameters->SetParam(VxEnum,ExtrapolationVariableEnum); + analysis->Core(femmodel); + delete analysis; + /*activate formulation: */ femmodel->SetCurrentConfiguration(LevelsetAnalysisEnum); + /*recover parameters: */ + femmodel->parameters->FindParam(&save_results,SaveResultsEnum); + if(VerboseSolution()) _printf0_("call computational core:\n"); solutionsequence_linear(femmodel); - /*recover parameters: */ - femmodel->parameters->FindParam(&save_results,SaveResultsEnum); if(save_results){ if(VerboseSolution()) _printf0_(" saving results\n"); @@ -321,56 +328,2 @@ }/*}}}*/ -/* Update of constraints */ -// void LevelsetAnalysis::UpdateNoIceConstraints(FemModel* femmodel){/*{{{*/ -// -// IssmDouble* mask_ice = GetMaskOfIce(femmodel->elements, femmodel->nodes); -// -// for (int i=0;inodes->Size();i++){ -// Node* node=dynamic_cast(femmodel->nodes->GetObjectByOffset(i)); -// if(node->InAnalysis(LevelsetAnalysisEnum)){ -// if(mask_ice[node->Sid()]==1.){//FIXME: what should be done with actual spcs to ice model? -// // node->DofInFSet(0); /*remove spc*/ -// } -// else{ -// IssmDouble defval=0.; -// node->ApplyConstraint(1,defval); /*apply spc*/ -// } -// } -// } -// }/*}}}*/ -// IssmDouble* LevelsetAnalysis::GetMaskOfIce(Elements* elements, Nodes* nodes){/*{{{*/ -// -// int i; -// IssmDouble* mask_ice = NULL; -// Vector* vec_mask_ice = NULL; -// Element* element = NULL; -// -// /*Initialize vector with number of vertices*/ -// IssmDouble numnodes=nodes->NumberOfNodes(LevelsetAnalysisEnum); -// vec_mask_ice=new Vector(numnodes); //nodes at ice front that have ice at next time step -// for(i=0;iSize();i++){ -// element=dynamic_cast(elements->GetObjectByOffset(i)); -// SetMaskOfIceElement(vec_mask_ice, element); -// } -// -// /*Assemble vector and serialize */ -// vec_mask_ice->Assemble(); -// mask_ice=vec_mask_ice->ToMPISerial(); -// delete vec_mask_ice; -// return mask_ice; -// -// }/*}}}*/ -// void LevelsetAnalysis::SetMaskOfIceElement(Vector* vec_mask_ice, Element* element){/*{{{*/ -// -// /* Intermediaries */ -// int numnodes = element->GetNumberOfNodes(); -// -// if(element->IsIceInElement()){ -// for(int i = 0;iSetValue(element->nodes[i]->Sid(),1.,INS_VAL); -// } -// } -// }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h (revision 17229) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h (revision 17230) @@ -32,8 +32,4 @@ void GetBprime(IssmDouble* Bprime,Element* element,IssmDouble* xyz_list,Gauss* gauss); - /* Updating constraints */ -// void UpdateNoIceConstraints(FemModel* femmodel); -// IssmDouble* GetMaskOfIce(Elements* elements, Nodes* nodes); -// void SetMaskOfIceElement(Vector* vec_mask_ice, Element* element); }; #endif Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17229) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17230) @@ -189,6 +189,4 @@ iomodel->FetchDataToInput(elements,LoadingforceYEnum); iomodel->FetchDataToInput(elements,DamageDEnum); - iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); - if(iomodel->meshtype==Mesh3DEnum){ @@ -1026,5 +1024,5 @@ }/*}}}*/ void StressbalanceAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ - SetActiveNodesLSMx(femmodel->elements); + /*Default, do nothing*/ return; }/*}}}*/ @@ -1145,8 +1143,4 @@ delete Ke1; delete Ke2; - - // FIXME: TESTING -// _printf0_("\n element ID: " << element->Id() << ";\n"); -// Ke->Echo(); return Ke; }/*}}}*/ @@ -1271,7 +1265,4 @@ newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); D_scalar=2.*newviscosity*thickness*gauss->weight*Jdet; - -// _printf0_("element, node, weight, Jdet: " << element->Id() << "; " << ig << "; " << gauss->weight << "; " << Jdet << "\n"); - for(int i=0;i<3;i++) D[i*3+i]=D_scalar; @@ -1324,8 +1315,4 @@ delete pe1; delete pe2; - -// _printf0_("\n element ID: " << element->Id() << ";\n"); -// pe->Echo(); - return pe; }/*}}}*/ @@ -1385,5 +1372,5 @@ /*If no front, return NULL*/ - if(!element->IsIcefront()) return NULL; + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL; /*Intermediaries*/ @@ -1408,10 +1395,6 @@ IssmDouble gravity = element->GetMaterialParameter(ConstantsGEnum); element->GetVerticesCoordinates(&xyz_list); - -// element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); - element->GetIcefrontCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); - + element->ZeroLevelsetCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum); element->NormalSection(&normal[0],xyz_list_front); -// element->GetNormalFromLSF(&normal[0]); /*Start looping on Gaussian points*/ @@ -1802,5 +1785,5 @@ /*If no front, return NULL*/ - if(!element->IsIcefront()) return NULL; + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL; /*Intermediaries*/ @@ -2225,5 +2208,5 @@ /*If no front, return NULL*/ - if(!element->IsIcefront()) return NULL; + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL; /*Intermediaries*/ @@ -2991,5 +2974,5 @@ /*If no front, return NULL*/ - if(!element->IsIcefront()) return NULL; + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL; /*Intermediaries*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 17229) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 17230) @@ -220,5 +220,4 @@ virtual int PressureInterpolation()=0; virtual bool IsZeroLevelset(int levelset_enum)=0; - virtual bool IsIcefront(void)=0; virtual void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0; virtual void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum)=0; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 17229) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 17230) @@ -114,5 +114,4 @@ int PressureInterpolation(); bool IsZeroLevelset(int levelset_enum); - bool IsIcefront(void){_error_("not implemented yet");}; void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum); void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 17229) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 17230) @@ -159,5 +159,4 @@ void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");}; bool IsZeroLevelset(int levelset_enum){_error_("not implemented");}; - bool IsIcefront(void){_error_("not implemented yet");}; void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented");}; void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17229) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17230) @@ -909,28 +909,12 @@ } } - _assert_(nrfrontnodes==2); - - /* arrange order of frontnodes such that they are oriented counterclockwise */ - if((NUMVERTICES+indicesfront[0]-indicesfront[1])%NUMVERTICES!=2){ - int index=indicesfront[0]; - indicesfront[0]=indicesfront[1]; - indicesfront[1]=index; - } + IssmDouble* xyz_front = xNew(3*nrfrontnodes); /* Return nodes */ for(i=0;i(indicesfront); }/*}}}*/ -void Tria::GetNormalFromLSF(IssmDouble *normal){/*{{{*/ +void Tria::GetNormalFromLSF(IssmDouble *pnormal){/*{{{*/ /* Intermediaries */ @@ -945,4 +929,5 @@ IssmDouble* xyz_list = NULL; IssmDouble dlevelset[dim], norm_dlevelset; + IssmDouble normal[dim]={0.}; /*Retrieve all inputs and parameters*/ @@ -951,6 +936,4 @@ counter=0; - for(i=0;iNewGauss(2); for(int ig=gauss->begin();igend();ig++){ @@ -964,5 +947,7 @@ } _assert_(counter>0); - for(i=0;iUpdateConstraints(this); - delete analysis; - + + // analysis->UpdateConstraints(); + /*Second, constraints might be time dependent: */ SpcNodesx(nodes,constraints,parameters,analysis_type); Index: /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 17229) +++ /issm/trunk-jpl/src/c/classes/Inputs/PentaInput.cpp (revision 17230) @@ -86,36 +86,35 @@ /*output*/ TriaInput* outinput=NULL; - - if(this->element_type==P0Enum){ - outinput=new TriaInput(this->enum_type,&this->values[0],P0Enum); - } - else{ - /*Assume P1 interpolation only for now*/ - IssmDouble newvalues[3]; - - /*Create array of indices depending on location (0=base 1=surface)*/ - int indices[3]; - switch(location){ - case 0: - indices[0] = 0; - indices[1] = 1; - indices[2] = 2; - break; - case 1: - indices[0] = 3; - indices[1] = 4; - indices[2] = 5; - break; - default: - _error_("case "<=0 && indices[i]<6); - newvalues[i]=this->values[indices[i]]; - } - outinput=new TriaInput(this->enum_type,&newvalues[0],P1Enum); - } + IssmDouble newvalues[3]; //Assume P1 interpolation only for now + + /*Create arrow of indices depending on location (0=base 1=surface)*/ + int indices[3]; + switch(location){ + case 0: + indices[0] = 0; + indices[1] = 1; + indices[2] = 2; + break; + case 1: + indices[0] = 3; + indices[1] = 4; + indices[2] = 5; + break; + default: + _error_("case "<=0 && indices[i]<6); + + /*Assign value to new input*/ + newvalues[i]=this->values[indices[i]]; + } + + /*Create new Tria input*/ + outinput=new TriaInput(this->enum_type,&newvalues[0],P1Enum); /*Assign output*/ Index: /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 17229) +++ /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 17230) @@ -100,19 +100,13 @@ /*output*/ SegInput* outinput=NULL; - - if(this->element_type==P0Enum){ - outinput=new SegInput(this->enum_type,&this->values[0],P0Enum); - } - else{ - /*Assume P1 interpolation only for now*/ - IssmDouble newvalues[2]; - - /*Create array of indices depending on location (0=base 1=surface)*/ - newvalues[0]=this->values[index1]; - newvalues[1]=this->values[index2]; - - /*Create new Seg input*/ - outinput=new SegInput(this->enum_type,&newvalues[0],P1Enum); - } + IssmDouble newvalues[2]; //Assume P1 interpolation only for now + + /*Create arrow of indices depending on location (0=base 1=surface)*/ + + newvalues[0]=this->values[index1]; + newvalues[1]=this->values[index2]; + + /*Create new Seg input*/ + outinput=new SegInput(this->enum_type,&newvalues[0],P1Enum); /*Assign output*/ Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17229) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17230) @@ -162,21 +162,7 @@ if(islevelset){ if(VerboseSolution()) _printf0_(" computing movement of ice boundaries\n"); - - /* extrapolate */ - Analysis* extanalysis = new ExtrapolationAnalysis(); - int vars[2] = {VxEnum, VyEnum}; - for(int iv=0; iv<2;iv++){ - femmodel->parameters->SetParam(vars[iv],ExtrapolationVariableEnum); - extanalysis->Core(femmodel); - } - delete extanalysis; - - LevelsetAnalysis* lsanalysis = new LevelsetAnalysis(); - /* solve level-set equation */ - lsanalysis->Core(femmodel); - delete lsanalysis; - - /* update vertices included for next calculation */ - GetMaskOfIceVerticesLSMx(femmodel); + analysis = new LevelsetAnalysis(); + analysis->Core(femmodel); + delete analysis; } Index: /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 17229) +++ /issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (revision 17230) @@ -119,17 +119,4 @@ //Kfs->AllocationInfo(); - // TESTING - IssmDouble* Kffd=Kff->ToSerial(); - Kff->GetSize(&M,&N); - _printf0_(" (Kff stiffness matrix size: "<