Index: /issm/trunk-jpl/externalpackages/ipython/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/ipython/install.sh (revision 17209) +++ /issm/trunk-jpl/externalpackages/ipython/install.sh (revision 17210) @@ -7,6 +7,8 @@ mkdir src -#Download from ISSM server -$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz' +if [ ! -f ipython-1.0.0.tar.gz ]; then + #Download from ISSM server + $ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/ipython-1.0.0.tar.gz' 'ipython-1.0.0.tar.gz' +fi #Untar Index: /issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh (revision 17209) +++ /issm/trunk-jpl/externalpackages/matplotlib/install-linux64.sh (revision 17210) @@ -8,6 +8,8 @@ export FFLAGS=-ff2c -git clone https://github.com/matplotlib/matplotlib -mv matplotlib src +if [ ! -d src ]; then + git clone https://github.com/matplotlib/matplotlib + mv matplotlib src +fi cd src python setup.py build Index: /issm/trunk-jpl/externalpackages/vim/addons/vimrc =================================================================== --- /issm/trunk-jpl/externalpackages/vim/addons/vimrc (revision 17209) +++ /issm/trunk-jpl/externalpackages/vim/addons/vimrc (revision 17210) @@ -100,9 +100,13 @@ " 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 +map :w :make update +map! :w :make update + +" switch between tabs +nmap :tabp +nmap :tabn @@ -141,4 +145,13 @@ 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/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17209) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17210) @@ -826,5 +826,5 @@ int solution_type, i; bool computebasalmeltingrates=true; - bool isdrainage=true; + bool isdrainage=false; bool updatebasalconstraints=true; Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17209) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17210) @@ -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"); @@ -317,56 +324,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 17209) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.h (revision 17210) @@ -31,8 +31,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 17209) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17210) @@ -1368,5 +1368,5 @@ /*If no front, return NULL*/ - if(!element->IsIcefront()) return NULL; + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL; /*Intermediaries*/ @@ -1391,10 +1391,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*/ @@ -1785,5 +1781,5 @@ /*If no front, return NULL*/ - if(!element->IsIcefront()) return NULL; + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL; /*Intermediaries*/ @@ -2208,5 +2204,5 @@ /*If no front, return NULL*/ - if(!element->IsIcefront()) return NULL; + if(!element->IsZeroLevelset(MaskIceLevelsetEnum)) return NULL; /*Intermediaries*/ @@ -2974,5 +2970,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 17209) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.h (revision 17210) @@ -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 17209) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 17210) @@ -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 17209) +++ /issm/trunk-jpl/src/c/classes/Elements/Seg.h (revision 17210) @@ -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 17209) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17210) @@ -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(); + /*Second, constraints might be time dependent: */ SpcNodesx(nodes,constraints,parameters,analysis_type); Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17209) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17210) @@ -162,20 +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; i<2;i++){ - femmodel->parameters->SetParam(vars[i],ExtrapolationVariableEnum); - extanalysis->Core(femmodel); - } - delete extanalysis; - - LevelsetAnalysis* lsanalysis = new LevelsetAnalysis(); - /* solve level-set equation */ - lsanalysis->Core(femmodel); - /* update spc boundary conditions for ice model */ -// lsanalysis->UpdateNoIceConstraints(femmodel); - delete lsanalysis; + analysis = new LevelsetAnalysis(); + analysis->Core(femmodel); + delete analysis; } Index: /issm/trunk-jpl/test/NightlyRun/test336.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test336.py (revision 17209) +++ /issm/trunk-jpl/test/NightlyRun/test336.py (revision 17210) @@ -8,5 +8,5 @@ from MatlabFuncs import * -md=triangle(model(),'../Exp/Square.exp',100000.) +md=triangle(model(),'../Exp/Square.exp',150000.) md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') @@ -20,5 +20,5 @@ md.transient.isgroundingline=False md.transient.isgia=False -md.transient.islevelset=False +md.transient.islevelset=True # init levelset function @@ -27,28 +27,9 @@ xmin=min(md.mesh.x) xmax=max(md.mesh.x) -xmed=(xmax+xmin)/2. -ymed=(ymax+ymin)/2. -md.mask.ice_levelset=numpy.sqrt(numpy.power(md.mesh.x-xmed,2.)+numpy.power(md.mesh.y-ymed,2.)) - (xmax-xmin)/3. - -# set spcs -mask=1.*numpy.ones((md.mesh.numberofvertices,1)) -nrverts=md.mesh.elements.shape[1] -for i in range(0,md.mesh.numberofelements): - elt=numpy.copy(md.mesh.elements[i]) - elt-=1 - isiceinelement=False - for iv in range(0,nrverts): - if(md.mask.ice_levelset[elt[iv]]<=0.): - isiceinelement=True - if(isiceinelement): - for iv in range(0,nrverts): - mask[elt[iv]]=2. - -v=0. -for i in range(0,md.mesh.numberofvertices): - if(mask[i]==1.): - md.stressbalance.spcvx[i]=v - md.stressbalance.spcvy[i]=v - md.stressbalance.spcvz[i]=v +xmed=(xmax+xmin)/2 +ymed=(ymax+ymin)/2 +distx=numpy.absolute(md.mesh.x.reshape(-1,1)-xmed) +disty=numpy.absolute(md.mesh.y.reshape(-1,1)-ymed) +md.mask.ice_levelset=numpy.maximum(distx,disty)-1.e5 md=solve(md,TransientSolutionEnum()) @@ -56,5 +37,5 @@ #Fields and tolerances to track changes field_names =['Vx','Vy','Vel','Pressure','MaskIceLevelset'] -field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]#,1e-13,1e-13] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] field_values=[\ md.results.TransientSolution[0].Vx,\ @@ -62,9 +43,9 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ -# md.results.TransientSolution[0].MaskIceLevelset,\ + md.results.TransientSolution[0].MaskIceLevelset,\ md.results.TransientSolution[1].Vx,\ md.results.TransientSolution[1].Vy,\ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ -# md.results.TransientSolution[1].MaskIceLevelset,\ + md.results.TransientSolution[1].MaskIceLevelset,\ ]