Changeset 25124 for issm/trunk-jpl/test/NightlyRun/test2010.m

Timestamp:

06/23/20 10:52:05 (5 years ago)

Author:

Eric.Larour

Message:

CHG: fixed bugs due to change from slr to solidearth class.

File:

• issm/trunk-jpl/test/NightlyRun/test2010.m (modified) (4 diffs)

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

@@ -11 +11 @@
 longe=sum(md.mesh.long(md.mesh.elements),2)/3;
 
-md.slr.deltathickness=zeros(md.mesh.numberofelements,1);
+md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1);
 pos=find(late <-75 & longe >0);
-md.slr.deltathickness(pos(6:7))=-1;
+md.solidearth.surfaceload.icethicknesschange(pos(6:7))=-1;
 
-md.slr.sealevel=zeros(md.mesh.numberofvertices,1);
+md.solidearth.sealevel=zeros(md.mesh.numberofvertices,1);
 md.dsl.global_average_thermosteric_sea_level_change=[0;0];
 md.dsl.sea_surface_height_change_above_geoid=zeros(md.mesh.numberofvertices+1,1);
 md.dsl.sea_water_pressure_change_at_sea_floor=zeros(md.mesh.numberofvertices+1,1);
 
-md.slr.ocean_area_scaling = 1;
+md.solidearth.settings.ocean_area_scaling = 1;
 
 %elastic loading from love numbers:
 nlov=1001;
-md.slr.love_h = love_numbers('h'); md.slr.love_h(nlov+1:end)=[];
-md.slr.love_k = love_numbers('k'); md.slr.love_k(nlov+1:end)=[];
-md.slr.love_l = love_numbers('l'); md.slr.love_l(nlov+1:end)=[];
+md.solidearth.love.h = love_numbers('h'); md.solidearth.love.h(nlov+1:end)=[];
+md.solidearth.love.k = love_numbers('k'); md.solidearth.love.k(nlov+1:end)=[];
+md.solidearth.love.l = love_numbers('l'); md.solidearth.love.l(nlov+1:end)=[];
 
 %}}}
@@ -38 +38 @@
 
 %make sure that the elements that have loads are fully grounded:
-pos=find(md.slr.deltathickness);
+pos=find(md.solidearth.surfaceload.icethicknesschange);
 md.mask.ocean_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.slr.deltathickness);
+pos=find(md.solidearth.surfaceload.icethicknesschange);
 md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
 % }}}
@@ -63 +63 @@
 % }}}
 %Solution parameters {{{
-md.slr.reltol=NaN;
-md.slr.abstol=1e-3;
-md.slr.geodetic=1;
+md.solidearth.settings.reltol=NaN;
+md.solidearth.settings.abstol=1e-3;
+md.solidearth.settings.computesealevelchange=1;
 % }}}
 
-%New stuff
-md.slr.spcthickness = NaN(md.mesh.numberofvertices,1);
-md.slr.hydro_rate = zeros(md.mesh.numberofvertices,1);
 
 %eustatic + rigid + elastic run:
-md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=1;
+md.solidearth.settings.rigid=1; md.solidearth.settings.elastic=1; md.solidearth.settings.rotation=1;
 md.cluster=generic('name',oshostname(),'np',3);
 
@@ -89 +86 @@
 %areas=GetAreasSphericalTria(md.mesh.elements,md.mesh.lat,md.mesh.long,rad_e);
 %lat=late*pi/180; lon=longe*pi/180;
-%moi_xz = sum(-md.materials.rho_freshwater.*md.slr.deltathickness.*areas.*rad_e^2.*sin(lat).*cos(lat).*cos(lon));
-%moi_yz = sum(-md.materials.rho_freshwater.*md.slr.deltathickness.*areas.*rad_e^2.*sin(lat).*cos(lat).*sin(lon));
+%moi_xz = sum(-md.materials.rho_freshwater.*md.solidearth.surfaceload.icethicknesschange.*areas.*rad_e^2.*sin(lat).*cos(lat).*cos(lon));
+%moi_yz = sum(-md.materials.rho_freshwater.*md.solidearth.surfaceload.icethicknesschange.*areas.*rad_e^2.*sin(lat).*cos(lat).*sin(lon));
 % }}}