Index: /issm/trunk/test/Validation/EISMINT/Diagnostic1/Square.par =================================================================== --- /issm/trunk/test/Validation/EISMINT/Diagnostic1/Square.par (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/Diagnostic1/Square.par (revision 4869) @@ -6,5 +6,5 @@ md.thickness=500*ones(md.numberofgrids,1); md.firn_layer=0*ones(md.numberofgrids,1); -md.bed=-di*md.thickness; +md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; @@ -15,5 +15,5 @@ pos=find(md.elementoniceshelf); md.drag_coefficient(md.elements(pos,:))=0; -md.drag-p=ones(md.numberofelements,1); +md.drag_p=ones(md.numberofelements,1); md.drag_q=ones(md.numberofelements,1); Index: /issm/trunk/test/Validation/EISMINT/Diagnostic1/runme.m =================================================================== --- /issm/trunk/test/Validation/EISMINT/Diagnostic1/runme.m (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/Diagnostic1/runme.m (revision 4869) @@ -8,8 +8,14 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d +md.verbose=10; %Compute solution for MacAyeal's model -md=solve(md,'analysis_type','diagnostic','package','ice'); +md=solve(md,'analysis_type',DiagnosticSolutionEnum); %plot results -plotmodel(md,'data','vx','data','vy','contourlevels',{0,20,40,-20,-40},'contourlevels',{-100,-200,-300,-400,-500,-600}) +vx=zeros(md.numberofgrids,1); +vx(md.results.DiagnosticSolution.Vx.index)=md.results.DiagnosticSolution.Vx.value; +vy=zeros(md.numberofgrids,1); +vy(md.results.DiagnosticSolution.Vy.index)=md.results.DiagnosticSolution.Vy.value; + +plotmodel(md,'data',vx,'data',vy,'contourlevels',{0,20,40,-20,-40},'contourlevels',{-100,-200,-300,-400,-500,-600}) Index: /issm/trunk/test/Validation/EISMINT/Diagnostic2/Square.par =================================================================== --- /issm/trunk/test/Validation/EISMINT/Diagnostic2/Square.par (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/Diagnostic2/Square.par (revision 4869) @@ -6,5 +6,5 @@ md.thickness=500*ones(md.numberofgrids,1); md.firn_layer=0*ones(md.numberofgrids,1); -md.bed=-di*md.thickness; +md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; @@ -32,3 +32,7 @@ md=SetMarineIceSheetBC(md,'Front.exp'); pos=find(md.y==max(md.y)); %grids on the upper boundary condition -md.dirichletvalues_diag(pos,2)=400*(((md.x(pos)-100000)/25000).^2-ones(size(pos,1),1)).*heaviside((1+eps)*ones(size(pos,1),1)-((md.x(pos)-100000)/25000).^2); +md.spcvelocity(pos,5)=400*(((md.x(pos)-100000)/25000).^2-ones(size(pos,1),1)).*heaviside((1+eps)*ones(size(pos,1),1)-((md.x(pos)-100000)/25000).^2); + +disp(' cluster properties'); +md.np=3; +md.cluster='wilkes'; Index: /issm/trunk/test/Validation/EISMINT/Diagnostic2/runme.m =================================================================== --- /issm/trunk/test/Validation/EISMINT/Diagnostic2/runme.m (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/Diagnostic2/runme.m (revision 4869) @@ -8,8 +8,13 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d +md.verbose=10; %Compute solution for MacAyeal's model -md=solve(md,'analysis_type','diagnostic','package','ice'); +md=solve(md,'analysis_type',DiagnosticSolutionEnum); %plot results -plotmodel(md,'data','vx','data','vy','contourlevels',{0,20,40,-20,-40,-60,60},'contourlevels',{-100,-200,-300,-400,-500,-600,-700,-800}) +vx=zeros(md.numberofgrids,1); +vx(md.results.DiagnosticSolution.Vx.index)=md.results.DiagnosticSolution.Vu.value; +vy=zeros(md.numberofgrids,1); +vy(md.results.DiagnosticSolution.Vy.index)=md.results.DiagnosticSolution.Vy.value; +plotmodel(md,'data',vx,'data',vy,'contourlevels',{0,20,40,-20,-40,-60,60},'contourlevels',{-100,-200,-300,-400,-500,-600,-700,-800}) Index: /issm/trunk/test/Validation/EISMINT/MassConservation/Square.par =================================================================== --- /issm/trunk/test/Validation/EISMINT/MassConservation/Square.par (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/MassConservation/Square.par (revision 4869) @@ -15,5 +15,5 @@ pos=find(md.elementoniceshelf); md.drag_coefficient(md.elements(pos,:))=0; -md.drag-p=ones(md.numberofelements,1); +md.drag_p=ones(md.numberofelements,1); md.drag_q=ones(md.numberofelements,1); @@ -48,2 +48,3 @@ md.spcthickness(pos,1)=1; md.spcthickness(pos,2)=500; +md.prognostic_DG=1; Index: /issm/trunk/test/Validation/EISMINT/MassConservation/runme.m =================================================================== --- /issm/trunk/test/Validation/EISMINT/MassConservation/runme.m (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/MassConservation/runme.m (revision 4869) @@ -28,8 +28,9 @@ i=i+1; time=time+md.dt; - md=solve(md,'analysis_type','prognostic2','package','ice'); - %thickness=full(sparse(reshape(md.elements',3*md.numberofelements,1),1,md.results.prognostic2.thickness)); - %md.thickness=thickness./connectivity; - md.thickness=md.results.prognostic2.thickness; + md=solve(md,'analysis_type',PrognosticSolutionEnum); + thickness =zeros(md.numberofgrids,1); + connectivity=sparse(md.results.PrognosticSolution.Thickness.index(:),1,1); + thickness =sparse(md.results.PrognosticSolution.Thickness.index(:),1,md.results.PrognosticSolution.Thickness.value(:)); + md.thickness=full(thickness./connectivity); md.thickness(pos)=500+100*sin(2*pi*time/200)*ones(size(pos,1),1); md.surface=md.bed+md.thickness; Index: /issm/trunk/test/Validation/EISMINT/MassConservation/runme2.m =================================================================== --- /issm/trunk/test/Validation/EISMINT/MassConservation/runme2.m (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/MassConservation/runme2.m (revision 4869) @@ -33,8 +33,9 @@ i=i+1; time=time+md.dt; - md=solve(md,'analysis_type','prognostic2','package','ice'); - %thickness=full(sparse(reshape(md.elements',3*md.numberofelements,1),1,md.results.prognostic2.thickness)); - %md.thickness=thickness./connectivity; - md.thickness=md.results.prognostic2.thickness; + md=solve(md,'analysis_type',PrognosticSolutionEnum); + thickness =zeros(md.numberofgrids,1); + connectivity=sparse(md.results.PrognosticSolution.Thickness.index(:),1,1); + thickness =sparse(md.results.PrognosticSolution.Thickness.index(:),1,md.results.PrognosticSolution.Thickness.value(:)); + md.thickness=full(thickness./connectivity); md.thickness(posLEFT)=500+100*sin((2*pi/200)*(time-sinus*md.y(posLEFT)/sqrt(md.vx(1)^2+md.vy(1)^2))); md.thickness(posDOWN)=500+100*sin((2*pi/200)*(time-cosinus*md.x(posDOWN)/sqrt(md.vx(1)^2+md.vy(1)^2))); Index: /issm/trunk/test/Validation/EISMINT/Transient/Square.par =================================================================== --- /issm/trunk/test/Validation/EISMINT/Transient/Square.par (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/Transient/Square.par (revision 4869) @@ -6,5 +6,5 @@ md.thickness=500*ones(md.numberofgrids,1); md.firn_layer=0*ones(md.numberofgrids,1); -md.bed=-di*md.thickness; +md.bed=-md.rho_ice/md.rho_water*md.thickness; md.surface=md.bed+md.thickness; @@ -26,20 +26,18 @@ disp(' creating accumulation rates'); -md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0.2m/a +md.accumulation_rate=200*ones(md.numberofgrids,1); %0.2m/a md.melting_rate=0*ones(md.numberofgrids,1); %0m/a disp(' boundary conditions '); md=SetMarineIceSheetBC(md,'Front.exp'); +pos=find(md.y==max(md.y)); %grids on the upper boundary condition +md.spcvelocity(pos,5)=400*(((md.x(pos)-100000)/25000).^2-ones(size(pos,1),1)).*heaviside((1+eps)*ones(size(pos,1),1)-((md.x(pos)-100000)/25000).^2); -disp(' boundary conditions for prognostic model: '); -md.gridondirichlet_prog=zeros(md.numberofgrids,1); -md.dirichletvalues_prog=zeros(md.numberofgrids,1); +disp(' cluster properties'); +md.np=3; +md.cluster='wilkes'; -pos=find(md.y==max(md.y)); %grids on the upper boundary condition -md.dirichletvalues_diag(pos,2)=400*(((md.x(pos)-100000)/25000).^2-ones(size(pos,1),1)).*heaviside((1+eps)*ones(size(pos,1),1)-((md.x(pos)-100000)/25000).^2); -md.neumannvalues_prog=zeros(size(md.segmentonneumann_prog,1),1); -md.neumannvalues_prog(:)=NaN; %free radiation - -pos=find(md.y==max(md.y)); %grids on the upper boundary condition -md.gridondirichlet_prog(pos)=1; -md.dirichletvalues_prog(pos)=500; +disp(' prognostic boundary conditions '); +pos=find(md.y==max(md.y)); +md.spcthickness(pos,1)=1; +md.spcthickness(pos,2)=md.thickness(pos); Index: /issm/trunk/test/Validation/EISMINT/Transient/runme.m =================================================================== --- /issm/trunk/test/Validation/EISMINT/Transient/runme.m (revision 4868) +++ /issm/trunk/test/Validation/EISMINT/Transient/runme.m (revision 4869) @@ -3,17 +3,27 @@ %Evolution of the ice shelf md=model; -md=mesh(md,'DomainOutline.exp',7100); +md=mesh(md,'DomainOutline.exp',5100); md=geography(md,'all',''); md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d +md.np=5; +md.cluster='wilkes'; +md.verbose=3; %Compute solution for MacAyeal's model -md=solve(md,'analysis_type','diagnostic','package','ice'); +md=solve(md,'analysis_type',DiagnosticSolutionEnum); %Launch transient solution -md.ndt=5000*md.yts; %time of evolution -md.dt=500*md.yts; %time vetween two iterations -md=solve(md,'analysis_type','transient'); +vx=zeros(md.numberofgrids,1); +vx(md.results.DiagnosticSolution.Vx.index)=md.results.DiagnosticSolution.Vx.value; +vy=zeros(md.numberofgrids,1); +vy(md.results.DiagnosticSolution.Vy.index)=md.results.DiagnosticSolution.Vy.value; +md.vx=vx; +md.vy=vy; + +md.ndt=1000*md.yts; %time of evolution +md.dt=20*md.yts; %time vetween two iterations +md=solve(md,'analysis_type',Transient2DSolutionEnum); %plot results -plotmodel(md,'data',md.results.transient(end).vx,'data',md.results.transient(end).vy,'data',md.results.transient(end).thickness) +plotmodel(md,'data',md.results.Transient2DSolution(end).Vx,'data',md.results.Transient2DSolution(end).Vy,'data',md.results.Transient2DSolution(end).Thickness)