Index: /issm/trunk-jpl/test/NightlyRun/test2002.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2002.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2002.m (revision 25124) @@ -7,6 +7,6 @@ %parameterize slr solution: %slr loading: {{{ -md.slr.deltathickness=zeros(md.mesh.numberofelements,1); -md.slr.sealevel=zeros(md.mesh.numberofvertices,1); +md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,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); @@ -16,14 +16,15 @@ longe=sum(md.mesh.long(md.mesh.elements),2)/3; pos=find(late <-80); -md.slr.deltathickness(pos)=-100; +md.solidearth.surfaceload.icethicknesschange(pos)=-100; %greenland pos=find(late > 70 & late < 80 & longe>-60 & longe<-30); -md.slr.deltathickness(pos)=-100; +md.solidearth.surfaceload.icethicknesschange(pos)=-100; %elastic loading from love numbers: nlov=101; -md.slr.love_h = love_numbers('h','CM'); md.slr.love_h(nlov+1:end)=[]; -md.slr.love_k = love_numbers('k','CM'); md.slr.love_k(nlov+1:end)=[]; -md.slr.love_l = love_numbers('l','CM'); md.slr.love_l(nlov+1:end)=[]; +md.solidearth.love=loadinglove(); +md.solidearth.love.h = love_numbers('h','CM'); md.solidearth.love.h(nlov+1:end)=[]; +md.solidearth.love.k = love_numbers('k','CM'); md.solidearth.love.k(nlov+1:end)=[]; +md.solidearth.love.l = love_numbers('l','CM'); md.solidearth.love.l(nlov+1:end)=[]; %}}} @@ -37,13 +38,13 @@ %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: -pos=find(md.slr.deltathickness); +pos=find(md.solidearth.surfaceload.icethicknesschange); md.mask.ice_levelset(md.mesh.elements(pos,:))=-1; % }}} -md.slr.ocean_area_scaling=0; +md.solidearth.settings.ocean_area_scaling=0; %Geometry for the bed, arbitrary: @@ -53,7 +54,4 @@ md.materials=materials('hydro'); -%New stuff -md.slr.spcthickness = NaN(md.mesh.numberofvertices,1); -md.slr.hydro_rate = zeros(md.mesh.numberofvertices,1); %Miscellaneous @@ -61,28 +59,28 @@ %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; % max number of iteration reverted back to 10 (i.e., the original default value) -md.slr.maxiter=10; +md.solidearth.settings.maxiter=10; %eustatic run: -md.slr.rigid=0; md.slr.elastic=0;md.slr.rotation=0; +md.solidearth.settings.rigid=0; md.solidearth.settings.elastic=0;md.solidearth.settings.rotation=0; md=solve(md,'Sealevelrise'); Seustatic=md.results.SealevelriseSolution.Sealevel; %eustatic + rigid run: -md.slr.rigid=1; md.slr.elastic=0;md.slr.rotation=0; +md.solidearth.settings.rigid=1; md.solidearth.settings.elastic=0;md.solidearth.settings.rotation=0; md=solve(md,'Sealevelrise'); Srigid=md.results.SealevelriseSolution.Sealevel; %eustatic + rigid + elastic run: -md.slr.rigid=1; md.slr.elastic=1;md.slr.rotation=0; +md.solidearth.settings.rigid=1; md.solidearth.settings.elastic=1;md.solidearth.settings.rotation=0; md=solve(md,'Sealevelrise'); Selastic=md.results.SealevelriseSolution.Sealevel; %eustatic + rigid + elastic + rotation 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=solve(md,'Sealevelrise'); Srotation=md.results.SealevelriseSolution.Sealevel; Index: /issm/trunk-jpl/test/NightlyRun/test2003.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2003.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2003.m (revision 25124) @@ -3,10 +3,11 @@ %mesh earth: md=model; + md.mesh=gmshplanet('radius',6.371012*10^3,'resolution',1000.); %500 km resolution mesh %parameterize slr solution: %slr loading: {{{ -md.slr.deltathickness=zeros(md.mesh.numberofelements,1); -md.slr.sealevel=zeros(md.mesh.numberofvertices,1); +md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,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); @@ -17,11 +18,12 @@ longe=sum(md.mesh.long(md.mesh.elements),2)/3; pos=find(late <-75 & longe <0); -md.slr.deltathickness(pos)=-1; +md.solidearth.surfaceload.icethicknesschange(pos)=-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)=[]; + %}}} @@ -35,14 +37,14 @@ %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: -pos=find(md.slr.deltathickness); +pos=find(md.solidearth.surfaceload.icethicknesschange); md.mask.ice_levelset(md.mesh.elements(pos,:))=-1; % }}} % use model representation of ocea area (not the ture area) -md.slr.ocean_area_scaling = 0; +md.solidearth.settings.ocean_area_scaling = 0; %geometry @@ -61,15 +63,11 @@ md.miscellaneous.name='test2003'; -%New stuff -md.slr.spcthickness = NaN(md.mesh.numberofvertices,1); -md.slr.hydro_rate = zeros(md.mesh.numberofvertices,1); - %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; %eustatic + rigid + elastic run: -md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=0; +md.solidearth.settings.rigid=1; md.solidearth.settings.elastic=1; md.solidearth.settings.rotation=0; md.cluster=generic('name',oshostname(),'np',3); %md.verbose=verbose('111111111'); @@ -78,5 +76,5 @@ %eustatic + rigid + elastic + rotation 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); %md.verbose=verbose('111111111'); Index: /issm/trunk-jpl/test/NightlyRun/test2004.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2004.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2004.m (revision 25124) @@ -144,5 +144,5 @@ if bas.iscontinentany('antarctica'), if testagainst2002, - md.slr.deltathickness=zeros(md.mesh.numberofelements,1); + md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1); %antarctica late=sum(md.mesh.lat(md.mesh.elements),2)/3; @@ -151,5 +151,5 @@ ratio=0.225314032985172/0.193045366574523; %ratio= 1.276564103522540/.869956; - md.slr.deltathickness(pos)=-100*ratio; + md.solidearth.surfaceload.icethicknesschange(pos)=-100*ratio; else delH=textread('../Data/AIS_delH_trend.txt'); @@ -159,14 +159,12 @@ northpole=find_point(md.mesh.long,md.mesh.lat,0,90); delHAIS(northpole)=0; - md.slr.deltathickness=delHAIS(md.mesh.elements)*[1;1;1]/3/100; + md.solidearth.surfaceload.icethicknesschange=delHAIS(md.mesh.elements)*[1;1;1]/3/100; end - md.slr.sealevel=zeros(md.mesh.numberofvertices,1); - md.slr.spcthickness=NaN*ones(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.hydro_rate = zeros(md.mesh.numberofvertices,1); end %}}} @@ -243,5 +241,5 @@ if testagainst2002, % {{{ - md.slr.deltathickness=zeros(md.mesh.numberofelements,1); + md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1); %greenland late=sum(md.mesh.lat(md.mesh.elements),2)/3; @@ -249,5 +247,5 @@ pos=find(late > 70 & late < 80 & longe>-60 & longe<-30); ratio=.3823/.262344; - %md.slr.deltathickness(pos)=-100*ratio; + %md.solidearth.surfaceload.icethicknesschange(pos)=-100*ratio; %correct mask: @@ -256,5 +254,5 @@ else - md.slr.deltathickness=zeros(md.mesh.numberofelements,1); + md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1); delH=textread('../Data/GIS_delH_trend.txt'); @@ -271,10 +269,10 @@ pos=find(delHGISe); - md.slr.deltathickness(pos)=delHGISe(pos)/100; + md.solidearth.surfaceload.icethicknesschange(pos)=delHGISe(pos)/100; pos=find(delHGLAe); - md.slr.deltathickness(pos)=delHGLAe(pos)/100; + md.solidearth.surfaceload.icethicknesschange(pos)=delHGLAe(pos)/100; %adjust mask accordingly: - pos=find(md.slr.deltathickness); + pos=find(md.solidearth.surfaceload.icethicknesschange); flags=zeros(md.mesh.numberofvertices,1); flags(md.mesh.elements(pos,:))=1; @@ -284,12 +282,10 @@ end - md.slr.sealevel=zeros(md.mesh.numberofvertices,1); - md.slr.spcthickness=NaN*ones(md.mesh.numberofvertices,1); + md.solidearth.sealevel=zeros(md.mesh.numberofvertices,1); md.dsl.global_average_thermosteric_sea_level_change=[0;0]; - %md.slr.steric_rate=(1.1+.38)*ones(md.mesh.numberofvertices,1); %steric + water storage. + %md.dsl.steric_rate=(1.1+.38)*ones(md.mesh.numberofvertices,1); %steric + water storage. 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.hydro_rate = zeros(md.mesh.numberofvertices,1); %}}} @@ -331,8 +327,6 @@ sl.transfer('mesh.lat'); sl.transfer('mesh.long'); -sl.transfer('slr.deltathickness'); -sl.transfer('slr.spcthickness'); -sl.transfer('slr.hydro_rate'); -sl.transfer('slr.sealevel'); +sl.transfer('solidearth.surfaceload.icethicknesschange'); +sl.transfer('solidearth.sealevel'); sl.transfer('dsl.sea_surface_height_change_above_geoid'); sl.transfer('dsl.sea_water_pressure_change_at_sea_floor'); @@ -361,8 +355,8 @@ %elastic loading from love numbers: nlov=101; -md.slr.love_h = love_numbers('h','CM'); md.slr.love_h(nlov+1:end)=[]; -md.slr.love_k = love_numbers('k','CM'); md.slr.love_k(nlov+1:end)=[]; -md.slr.love_l = love_numbers('l','CM'); md.slr.love_l(nlov+1:end)=[]; -md.slr.ocean_area_scaling = 0; +md.solidearth.love.h = love_numbers('h','CM'); md.solidearth.love.h(nlov+1:end)=[]; +md.solidearth.love.k = love_numbers('k','CM'); md.solidearth.love.k(nlov+1:end)=[]; +md.solidearth.love.l = love_numbers('l','CM'); md.solidearth.love.l(nlov+1:end)=[]; +md.solidearth.settings.ocean_area_scaling = 0; %Miscellaneous @@ -373,16 +367,16 @@ %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; md.timestepping.time_step=1; % max number of iteration reverted back to 10 (i.e., the original default value) -md.slr.maxiter=10; +md.solidearth.settings.maxiter=10; %eustatic run: -md.slr.rigid=0; md.slr.elastic=0;md.slr.rotation=0; -md.slr.requested_outputs= {'default',... - 'SealevelriseDeltathickness','Sealevel','SealevelRSLRate','SealevelriseCumDeltathickness',... +md.solidearth.settings.rigid=0; md.solidearth.settings.elastic=0;md.solidearth.settings.rotation=0; +md.solidearth.requested_outputs= {'default',... + 'SurfaceloadIceThicknessChange','Sealevel','SealevelRSLRate','SealevelriseCumDeltathickness',... 'SealevelNEsaRate', 'SealevelUEsaRate', 'NGiaRate', 'UGiaRate','SealevelEustaticMask','SealevelEustaticOceanMask'}; md=solve(md,'Sealevelrise'); @@ -390,15 +384,15 @@ %eustatic + rigid run: -md.slr.rigid=1; md.slr.elastic=0;md.slr.rotation=0; +md.solidearth.settings.rigid=1; md.solidearth.settings.elastic=0;md.solidearth.settings.rotation=0; md=solve(md,'Sealevelrise'); Srigid=md.results.SealevelriseSolution.Sealevel; %eustatic + rigid + elastic run: -md.slr.rigid=1; md.slr.elastic=1;md.slr.rotation=0; +md.solidearth.settings.rigid=1; md.solidearth.settings.elastic=1;md.solidearth.settings.rotation=0; md=solve(md,'Sealevelrise'); Selastic=md.results.SealevelriseSolution.Sealevel; %eustatic + rigid + elastic + rotation 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=solve(md,'Sealevelrise'); Srotation=md.results.SealevelriseSolution.Sealevel; Index: /issm/trunk-jpl/test/NightlyRun/test2010.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2010.m (revision 25124) @@ -11,20 +11,20 @@ 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,10 +38,10 @@ %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,15 +63,12 @@ % }}} %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,6 +86,6 @@ %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)); % }}} Index: /issm/trunk-jpl/test/NightlyRun/test2111.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2111.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2111.m (revision 25124) @@ -47,7 +47,4 @@ % }}} -%New stuff -md.slr.spcthickness = NaN(md.mesh.numberofvertices,1); - %solve esa: {{{ md.esa.requested_outputs = {'EsaUmotion','EsaNmotion','EsaEmotion','EsaXmotion','EsaYmotion'}; Index: /issm/trunk-jpl/test/NightlyRun/test2112.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2112.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2112.m (revision 25124) @@ -47,7 +47,4 @@ % }}} -%New stuff -md.slr.spcthickness = NaN(md.mesh.numberofvertices,1); - %solve esa: {{{ md.esa.requested_outputs = {'EsaUmotion','EsaNmotion','EsaEmotion','EsaXmotion','EsaYmotion'}; Index: /issm/trunk-jpl/test/NightlyRun/test2113.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2113.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2113.m (revision 25124) @@ -48,7 +48,4 @@ % }}} -%New stuff -md.slr.spcthickness = NaN(md.mesh.numberofvertices,1); - %solve esa: {{{ md.esa.requested_outputs = {'EsaUmotion','EsaNmotion','EsaEmotion'}; Index: /issm/trunk-jpl/test/NightlyRun/test2424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2424.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2424.m (revision 25124) @@ -20,5 +20,5 @@ md.timestepping.time_step=.1; -md.slr.sealevel=newforcing(md.timestepping.start_time, md.timestepping.final_time, md.timestepping.time_step,-200,200,md.mesh.numberofvertices); +md.solidearth.sealevel=newforcing(md.timestepping.start_time, md.timestepping.final_time, md.timestepping.time_step,-200,200,md.mesh.numberofvertices); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test2425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2425.m (revision 25123) +++ /issm/trunk-jpl/test/NightlyRun/test2425.m (revision 25124) @@ -31,5 +31,5 @@ md.geometry.bed=md.geometry.bed+1000; md.geometry.surface=md.geometry.surface+1000; -md.slr.sealevel=1000*ones(md.mesh.numberofvertices,1); +md.solidearth.sealevel=1000*ones(md.mesh.numberofvertices,1); md=solve(md,'Transient','checkconsistency','no');