Changeset 26077

Timestamp:

03/11/21 15:32:23 (4 years ago)

Author:

caronlam

Message:

update of slc tests to new structure: loads are now in masstransport.spcthickness, solution is now Transient, added configuration in solidearth.settings, initialsealevel now in initialization.sealevel

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test2002.m (modified) (7 diffs)
• test2003.m (modified) (7 diffs)
• test2004.m (modified) (14 diffs)

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

@@ -7 +7 @@
 %parameterize solidearth solution:
 %solidearth loading:  {{{
-md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1);
-md.solidearth.initialsealevel=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.masstransport.spcthickness=zeros(md.mesh.numberofelements+1,1);
+md.initialization.sealevel=zeros(md.mesh.numberofvertices,1);
+md.dsl.global_average_thermosteric_sea_level=[0;0];
+md.dsl.sea_surface_height_above_geoid=zeros(md.mesh.numberofvertices+1,1);
+md.dsl.sea_water_pressure_at_sea_floor=zeros(md.mesh.numberofvertices+1,1);
 %antarctica
 late=sum(md.mesh.lat(md.mesh.elements),2)/3;
 longe=sum(md.mesh.long(md.mesh.elements),2)/3;
 pos=find(late < -80);
-md.solidearth.surfaceload.icethicknesschange(pos)=-100;
+md.masstransport.spcthickness(pos)=-100;
 %greenland
 pos=find(late>70 & late<80 & longe>-60 & longe<-30);
-md.solidearth.surfaceload.icethicknesschange(pos)=-100;
+md.masstransport.spcthickness(pos)=-100;
 
 %elastic loading from love numbers:
@@ -36 +36 @@
 
 %make sure that the elements that have loads are fully grounded:
-pos=find(md.solidearth.surfaceload.icethicknesschange);
+pos=find(md.masstransport.spcthickness);
 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.solidearth.surfaceload.icethicknesschange);
+pos=find(md.masstransport.spcthickness);
 md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
 % }}}
 
-md.solidearth.settings.ocean_area_scaling=0;
-
 %Geometry for the bed, arbitrary: 
 md.geometry.bed=-ones(md.mesh.numberofvertices,1);
+md.geometry.thickness=zeros(md.mesh.numberofvertices,1);
+md.geometry.surface=zeros(md.mesh.numberofvertices,1);
+md.geometry.base=zeros(md.mesh.numberofvertices,1);
+
+
+md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
+md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
+md.initialization.vx=zeros(md.mesh.numberofvertices,1);
+md.initialization.vy=zeros(md.mesh.numberofvertices,1);
 
 %Materials: 
@@ -60 +67 @@
 md.solidearth.settings.abstol=1e-3;
 md.solidearth.settings.computesealevelchange=1;
+md.solidearth.settings.isgrd=1;
+md.solidearth.settings.ocean_area_scaling=0;
+md.solidearth.settings.grdmodel=1;
+
+%Physics: 
+md.transient.issmb=0; 
+md.transient.isstressbalance=0;
+md.transient.isthermal=0;
+md.transient.ismasstransport=1;
+md.transient.isslc=1;
+
 
 % max number of iteration reverted back to 10 (i.e., the original default value)
@@ -68 +86 @@
 md.solidearth.settings.elastic=0;
 md.solidearth.settings.rotation=0;
-md=solve(md,'Sealevelchange');
-Seustatic=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'Transient');
+Seustatic=md.results.TransientSolution.Sealevel;
 
 %eustatic + rigid run:
@@ -75 +93 @@
 md.solidearth.settings.elastic=0;
 md.solidearth.settings.rotation=0;
-md=solve(md,'Sealevelchange');
-Srigid=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'tr');
+Srigid=md.results.TransientSolution.Sealevel;
 
 %eustatic + rigid + elastic run:
@@ -82 +100 @@
 md.solidearth.settings.elastic=1;
 md.solidearth.settings.rotation=0;
-md=solve(md,'Sealevelchange');
-Selastic=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'tr');
+Selastic=md.results.TransientSolution.Sealevel;
 
 %eustatic + rigid + elastic + rotation run:
@@ -89 +107 @@
 md.solidearth.settings.elastic=1;
 md.solidearth.settings.rotation=1;
-md=solve(md,'Sealevelchange');
-Srotation=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'tr');
+Srotation=md.results.TransientSolution.Sealevel;
 
 %Fields and tolerances to track changes

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

@@ -7 +7 @@
 %parameterize slc solution:
 %solidearth loading:  {{{
-md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1);
-md.solidearth.initialsealevel=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.masstransport.spcthickness=zeros(md.mesh.numberofelements,1);
+md.initialization.sealevel=zeros(md.mesh.numberofvertices,1);
+md.dsl.global_average_thermosteric_sea_level=[0;0];
+md.dsl.sea_surface_height_above_geoid=zeros(md.mesh.numberofvertices+1,1);
+md.dsl.sea_water_pressure_at_sea_floor=zeros(md.mesh.numberofvertices+1,1);
 
 %antarctica
@@ -17 +17 @@
 longe=sum(md.mesh.long(md.mesh.elements),2)/3;
 pos=find(late <-75 & longe <0);
-md.solidearth.surfaceload.icethicknesschange(pos)=-1;
+md.masstransport.spcthickness(pos)=-1;
 
 %elastic loading from love numbers:
@@ -34 +34 @@
 
 %make sure that the elements that have loads are fully grounded:
-pos=find(md.solidearth.surfaceload.icethicknesschange);
+pos=find(md.masstransport.spcthickness);
 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.solidearth.surfaceload.icethicknesschange);
+pos=find(md.masstransport.spcthickness);
 md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
 % }}}
@@ -57 +57 @@
 md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
 
+md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
+md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
+md.initialization.vx=zeros(md.mesh.numberofvertices,1);
+md.initialization.vy=zeros(md.mesh.numberofvertices,1);
+
 %Miscellaneous
 md.miscellaneous.name='test2003';
@@ -64 +69 @@
 md.solidearth.settings.abstol=1e-3;
 md.solidearth.settings.computesealevelchange=1;
+md.solidearth.settings.isgrd=1;
+md.solidearth.settings.ocean_area_scaling=0;
+md.solidearth.settings.grdmodel=1;
+
+%Physics: 
+md.transient.issmb=0; 
+md.transient.isstressbalance=0;
+md.transient.isthermal=0;
+md.transient.ismasstransport=1;
+md.transient.isslc=1;
+
 
 %eustatic + rigid + elastic run:
@@ -71 +87 @@
 md.cluster=generic('name',oshostname(),'np',3);
 %md.verbose=verbose('111111111');
-md=solve(md,'Sealevelchange');
-SnoRotation=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'Transient');
+SnoRotation=md.results.TransientSolution.Sealevel;
 
 %eustatic + rigid + elastic + rotation run:
@@ -80 +96 @@
 md.cluster=generic('name',oshostname(),'np',3);
 %md.verbose=verbose('111111111');
-md=solve(md,'Sealevelchange');
-SRotation=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'Transient');
+SRotation=md.results.TransientSolution.Sealevel;
 
 %Fields and tolerances to track changes

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

@@ -138 +138 @@
         if bas.iscontinentany('antarctica'),
                 if testagainst2002,
-                        % TODO: Check if the following works as expected: 'pos' is empty, so nothing is assigned to 'md.solidearth.surfaceload.icethicknesschange(pos)'
-                        md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1);
+                        % TODO: Check if the following works as expected: 'pos' is empty, so nothing is assigned to 'md.masstransport.spcthickness(pos)'
+                        md.masstransport.spcthickness=zeros(md.mesh.numberofelements,1);
                         %antarctica
                         late=sum(md.mesh.lat(md.mesh.elements),2)/3;
@@ -146 +146 @@
                         ratio=0.225314032985172/0.193045366574523;
                         %ratio=   1.276564103522540/.869956;
-                        md.solidearth.surfaceload.icethicknesschange(pos)=-100*ratio;
+                        md.masstransport.spcthickness(pos)=-100*ratio;
                 else
                         in_fileID=fopen('../Data/AIS_delH_trend.txt', 'r');
@@ -164 +164 @@
                         northpole=find_point(md.mesh.long,md.mesh.lat,0,90);
                         delHAIS(northpole)=0;
-                        md.solidearth.surfaceload.icethicknesschange=mean(delHAIS(md.mesh.elements),2)/100;
+                        md.masstransport.spcthickness=mean(delHAIS(md.mesh.elements),2)/100;
                 end
 
@@ -245 +245 @@
         %}}}
         %slc loading/calibration:  {{{
-        md.solidearth.surfaceload.icethicknesschange=zeros(md.mesh.numberofelements,1);
+        md.masstransport.spcthickness=zeros(md.mesh.numberofelements,1);
 
         if testagainst2002, 
@@ -254 +254 @@
                 pos=find(late > 70 &  late < 80 & longe>-60 & longe<-30);
                 ratio=.3823/.262344;
-                %md.solidearth.surfaceload.icethicknesschange(pos)=-100*ratio;
+                %md.masstransport.spcthickness(pos)=-100*ratio;
 
                 %correct mask: 
@@ -289 +289 @@
 
                 pos=find(delHGISe);
-                md.solidearth.surfaceload.icethicknesschange(pos)=delHGISe(pos)/100;
+                md.masstransport.spcthickness(pos)=delHGISe(pos)/100;
                 pos=find(delHGLAe);
-                md.solidearth.surfaceload.icethicknesschange(pos)=delHGLAe(pos)/100;
+                md.masstransport.spcthickness(pos)=delHGLAe(pos)/100;
 
                 %adjust mask accordingly: 
-                pos=find(md.solidearth.surfaceload.icethicknesschange); 
+                pos=find(md.masstransport.spcthickness); 
                 flags=zeros(md.mesh.numberofvertices,1); 
                 flags(md.mesh.elements(pos,:))=1;
@@ -302 +302 @@
         end
 
-        md.solidearth.initialsealevel=zeros(md.mesh.numberofvertices,1);
-
-        md.dsl.global_average_thermosteric_sea_level_change=[0;0];
+        md.initialization.sealevel=zeros(md.mesh.numberofvertices,1);
+
+        md.dsl.global_average_thermosteric_sea_level=[0;0];
         %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.dsl.sea_surface_height_above_geoid=zeros(md.mesh.numberofvertices+1,1);
+        md.dsl.sea_water_pressure_at_sea_floor=zeros(md.mesh.numberofvertices+1,1);
 
         %}}}
@@ -348 +348 @@
 sl.transfer('mesh.lat');
 sl.transfer('mesh.long');
-sl.transfer('solidearth.surfaceload.icethicknesschange');
-sl.transfer('solidearth.initialsealevel');
-sl.transfer('dsl.sea_surface_height_change_above_geoid');
-sl.transfer('dsl.sea_water_pressure_change_at_sea_floor');
+sl.transfer('masstransport.spcthickness');
+sl.transfer('initialization.sealevel');
+sl.transfer('dsl.sea_surface_height_above_geoid');
+sl.transfer('dsl.sea_water_pressure_at_sea_floor');
 
 %radius: 
@@ -382 +382 @@
 
 %New stuff
-md.dsl.global_average_thermosteric_sea_level_change=[1.1+.38;0]; %steric + water storage AR5.
+md.dsl.global_average_thermosteric_sea_level=[1.1+.38;0]; %steric + water storage AR5.
 
 %Solution parameters
@@ -388 +388 @@
 md.solidearth.settings.abstol=1e-3;
 md.solidearth.settings.computesealevelchange=1;
+md.solidearth.settings.isgrd=1;
+md.solidearth.settings.ocean_area_scaling=0;
+md.solidearth.settings.grdmodel=1;
 md.timestepping.time_step=1;
+
+%Physics: 
+md.transient.issmb=0; 
+md.transient.isstressbalance=0;
+md.transient.isthermal=0;
+md.transient.ismasstransport=1;
+md.transient.isslc=1;
+
 
 %max number of iterations reverted back to 10 (i.e. the original default value)
@@ -400 +411 @@
         'SurfaceloadIceThicknessChange','Sealevel','SealevelRSLRate','SealevelchangeCumDeltathickness',...
         'SealevelNEsaRate', 'SealevelUEsaRate','SealevelStaticBarystaticMask','SealevelBarystaticOceanMask'};
-md=solve(md,'Sealevelchange');
-Seustatic=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'Transient');
+Seustatic=md.results.TransientSolution.Sealevel;
 
 %eustatic + rigid run:
@@ -407 +418 @@
 md.solidearth.settings.elastic=0;
 md.solidearth.settings.rotation=0;
-md=solve(md,'Sealevelchange');
-Srigid=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'Transient');
+Srigid=md.results.TransientSolution.Sealevel;
 
 %eustatic + rigid + elastic run:
@@ -414 +425 @@
 md.solidearth.settings.elastic=1;
 md.solidearth.settings.rotation=0;
-md=solve(md,'Sealevelchange');
-Selastic=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'Transient');
+Selastic=md.results.TransientSolution.Sealevel;
 
 %eustatic + rigid + elastic + rotation run:
@@ -421 +432 @@
 md.solidearth.settings.elastic=1;
 md.solidearth.settings.rotation=1;
-md=solve(md,'Sealevelchange');
-Srotation=md.results.SealevelchangeSolution.Sealevel;
+md=solve(md,'Transient');
+Srotation=md.results.TransientSolution.Sealevel;
 %}}}