Changeset 25183 for issm/trunk-jpl/test/NightlyRun/test2111.m

Timestamp:

06/29/20 16:10:31 (5 years ago)

Author:

jdquinn

Message:

BUG: Corrected remaining tests (Love number retrieval)

File:

• issm/trunk-jpl/test/NightlyRun/test2111.m (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test2111.m

@@ -3 +3 @@
 
 %mesh ais: {{{
-        md=model();
-        md=triangle(md,'../Exp/Ais.exp',200000); % max element size
+md=model();
+md=triangle(md,'../Exp/Ais.exp',200000); % max element size
 % }}}
 %define load: {{{
-        md.esa.deltathickness=zeros(md.mesh.numberofelements,1);
-        disc_radius=500; % km
-        index=md.mesh.elements;
-        x_element=mean(md.mesh.x(index),2)-1.0e6;
-        y_element=mean(md.mesh.y(index),2)-1.0e6;
-        rad_dist=sqrt(x_element.^2+y_element.^2)/1000;  % radial distance in km
-        md.esa.deltathickness(rad_dist<=disc_radius)=-1;   % 1 m water withdrawl
+md.esa.deltathickness=zeros(md.mesh.numberofelements,1);
+disc_radius=500; % km
+index=md.mesh.elements;
+x_element=mean(md.mesh.x(index),2)-1.0e6;
+y_element=mean(md.mesh.y(index),2)-1.0e6;
+rad_dist=sqrt(x_element.^2+y_element.^2)/1000;  % radial distance in km
+pos=find(rad_dist<=disc_radius);
+md.esa.deltathickness(pos)=-1;   % 1 m water withdrawl
 % }}}
 %read in love numbers:{{{
@@ -19 +20 @@
 % }}}
 %mask:  {{{
-        %make sure wherever there is an ice load, that the mask is set to ice: 
-        md.mask.ice_levelset=ones(md.mesh.numberofvertices,1);
-        pos=find(md.esa.deltathickness); md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
+%make sure wherever there is an ice load, that the mask is set to ice: 
+md.mask.ice_levelset=ones(md.mesh.numberofvertices,1);
+pos=find(md.esa.deltathickness);
+md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
 
-        %is ice grounded? 
-        md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
-        pos=find(md.mask.ice_levelset<=0); md.mask.ocean_levelset(pos)=1; 
+%is ice grounded? 
+md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
+pos=find(md.mask.ice_levelset<=0);
+md.mask.ocean_levelset(pos)=1;
 % }}}
 %geometry:  {{{
-        di=md.materials.rho_ice/md.materials.rho_water;
-        md.geometry.thickness=ones(md.mesh.numberofvertices,1);
-        md.geometry.surface=(1-di)*zeros(md.mesh.numberofvertices,1);
-        md.geometry.base=md.geometry.surface-md.geometry.thickness;
-        md.geometry.bed=md.geometry.base;
+di=md.materials.rho_ice/md.materials.rho_water;
+md.geometry.thickness=ones(md.mesh.numberofvertices,1);
+md.geometry.surface=(1-di)*zeros(md.mesh.numberofvertices,1);
+md.geometry.base=md.geometry.surface-md.geometry.thickness;
+md.geometry.bed=md.geometry.base;
 % }}}
 %materials:  {{{
-        md.initialization.temperature=273.25*ones(md.mesh.numberofvertices,1);
-        md.materials.rheology_B=paterson(md.initialization.temperature);
-        md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
+md.initialization.temperature=273.25*ones(md.mesh.numberofvertices,1);
+md.materials.rheology_B=paterson(md.initialization.temperature);
+md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
 % }}}
 %additional parameters, miscellaneous: {{{
-        md.miscellaneous.name='test2111';
-        md.esa.degacc=0.01;
-        md.esa.hemisphere = -1; 
+md.miscellaneous.name='test2111';
+md.esa.degacc=0.01;
+md.esa.hemisphere = -1; 
 % }}}