Changeset 24284

Timestamp:

10/28/19 15:55:28 (5 years ago)

Author:

jdquinn

Message:

CHG: Zero-filled md.slr.hydro_rate

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test2002.m (modified) (7 diffs)
• test2002.py (modified) (1 diff)
• test2003.m (modified) (8 diffs)
• test2003.py (modified) (1 diff)
• test2010.m (modified) (6 diffs)
• test2010.py (modified) (1 diff)

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

@@ -1 +1 @@
 %Test Name: EarthSlr
 
-%mesh earth: 
-md=model; 
+%mesh earth:
+md=model;
 md.mesh=gmshplanet('radius',6.371012*10^3,'resolution',700.); %500 km resolution mesh
 
@@ -15 +15 @@
 pos=find(late <-80);
 md.slr.deltathickness(pos)=-100;
-%greenland 
+%greenland
 pos=find(late > 70 &  late < 80 & longe>-60 & longe<-30);
 md.slr.deltathickness(pos)=-100;
 
-%elastic loading from love numbers: 
+%elastic loading from love numbers:
 nlov=101;
 md.slr.love_h = love_numbers('h','CM'); md.slr.love_h(nlov+1:end)=[];
@@ -27 +27 @@
 %}}}
 %mask:  {{{
-md.mask=maskpsl(); % use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset 
-mask=gmtmask(md.mesh.lat,md.mesh.long); 
+md.mask=maskpsl(); % use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset
+mask=gmtmask(md.mesh.lat,md.mesh.long);
 
 icemask=ones(md.mesh.numberofvertices,1);
@@ -39 +39 @@
 %make sure that the ice level set is all inclusive:
 md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
-md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); 
+md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
 
 %make sure that the elements that have loads are fully grounded:
@@ -45 +45 @@
 md.mask.groundedice_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); 
+%make sure wherever there is an ice load, that the mask is set to ice:
+pos=find(md.slr.deltathickness);
 md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
 % }}}
 
-md.slr.ocean_area_scaling=0; 
+md.slr.ocean_area_scaling=0;
 
 %geometry
@@ -68 +68 @@
 md.slr.Ngia = zeros(md.mesh.numberofvertices,1);
 md.slr.Ugia = zeros(md.mesh.numberofvertices,1);
+md.slr.hydro_rate = zeros(md.mesh.numberofvertices,1);
 
 %Miscellaneous
@@ -78 +79 @@
 
 % max number of iteration reverted back to 10 (i.e., the original default value)
-md.slr.maxiter=10; 
+md.slr.maxiter=10;
 
-%eustatic run: 
+%eustatic run:
 md.slr.rigid=0; md.slr.elastic=0;md.slr.rotation=0;
 md=solve(md,'Sealevelrise');
 Seustatic=md.results.SealevelriseSolution.Sealevel;
 
-%eustatic + rigid run: 
+%eustatic + rigid run:
 md.slr.rigid=1; md.slr.elastic=0;md.slr.rotation=0;
 md=solve(md,'Sealevelrise');
 Srigid=md.results.SealevelriseSolution.Sealevel;
 
-%eustatic + rigid + elastic run: 
+%eustatic + rigid + elastic run:
 md.slr.rigid=1; md.slr.elastic=1;md.slr.rotation=0;
 md=solve(md,'Sealevelrise');
 Selastic=md.results.SealevelriseSolution.Sealevel;
 
-%eustatic + rigid + elastic + rotation run: 
+%eustatic + rigid + elastic + rotation run:
 md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=1;
 md=solve(md,'Sealevelrise');

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

@@ -79 +79 @@
 md.slr.Ngia = np.zeros((md.mesh.numberofvertices, ))
 md.slr.Ugia = np.zeros((md.mesh.numberofvertices, ))
+md.slr.hydro_rate = np.zeros((md.mesh.numberofvertices, ))
 
 #Miscellaneous

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

@@ -1 +1 @@
 %Test Name: EarthSlr_rotationalFeedback
 
-%mesh earth: 
-md=model; 
+%mesh earth:
+md=model;
 md.mesh=gmshplanet('radius',6.371012*10^3,'resolution',1000.); %500 km resolution mesh
 
@@ -16 +16 @@
 md.slr.deltathickness(pos)=-1;
 
-%elastic loading from love numbers: 
+%elastic loading from love numbers:
 nlov=1001;
 md.slr.love_h = love_numbers('h'); md.slr.love_h(nlov+1:end)=[];
@@ -24 +24 @@
 %}}}
 %mask:  {{{
-md.mask=maskpsl(); % use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset 
-mask=gmtmask(md.mesh.lat,md.mesh.long); 
+md.mask=maskpsl(); % use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset
+mask=gmtmask(md.mesh.lat,md.mesh.long);
 
 icemask=ones(md.mesh.numberofvertices,1);
@@ -36 +36 @@
 %make sure that the ice level set is all inclusive:
 md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
-md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); 
+md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
 
 %make sure that the elements that have loads are fully grounded:
@@ -42 +42 @@
 md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1;
 
-%make sure wherever there is an ice load, that the mask is set to ice: 
+%make sure wherever there is an ice load, that the mask is set to ice:
 pos=find(md.slr.deltathickness); 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; 
+% use model representation of ocea area (not the ture area)
+md.slr.ocean_area_scaling = 0;
 
 %geometry
@@ -68 +68 @@
 md.slr.Ngia = zeros(md.mesh.numberofvertices,1);
 md.slr.Ugia = zeros(md.mesh.numberofvertices,1);
+md.slr.hydro_rate = zeros(md.mesh.numberofvertices,1);
 
 %Solution parameters
@@ -74 +75 @@
 md.slr.geodetic=1;
 
-%eustatic + rigid + elastic run: 
-md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=0; 
+%eustatic + rigid + elastic run:
+md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=0;
 md.cluster=generic('name',oshostname(),'np',3);
 %md.verbose=verbose('111111111');
@@ -81 +82 @@
 SnoRotation=md.results.SealevelriseSolution.Sealevel;
 
-%eustatic + rigid + elastic + rotation run: 
+%eustatic + rigid + elastic + rotation run:
 md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=1;
 md.cluster=generic('name',oshostname(),'np',3);

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

@@ -88 +88 @@
 md.slr.Ngia = np.zeros((md.mesh.numberofvertices, ))
 md.slr.Ugia = np.zeros((md.mesh.numberofvertices, ))
+md.slr.hydro_rate = np.zeros((md.mesh.numberofvertices, ))
 
 #Solution parameters

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

@@ -1 +1 @@
 %Test Name: MomentOfIntertia
 
-%mesh earth: 
-md=model; 
+%mesh earth:
+md=model;
 rad_e = 6.371012*10^3; % mean radius of Earth, km
-md.mesh=gmshplanet('radius',rad_e,'resolution',1000.0);  % km resolution 
+md.mesh=gmshplanet('radius',rad_e,'resolution',1000.0);  % km resolution
 
 %parameterize slr solution:
@@ -17 +17 @@
 md.slr.sealevel=zeros(md.mesh.numberofvertices,1);
 md.slr.steric_rate=zeros(md.mesh.numberofvertices,1);
-md.slr.ocean_area_scaling = 1; 
+md.slr.ocean_area_scaling = 1;
 
-%elastic loading from love numbers: 
+%elastic loading from love numbers:
 nlov=1001;
 md.slr.love_h = love_numbers('h'); md.slr.love_h(nlov+1:end)=[];
@@ -27 +27 @@
 %}}}
 %mask:  {{{
-md.mask=maskpsl(); % use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset 
-mask=gmtmask(md.mesh.lat,md.mesh.long); 
+md.mask=maskpsl(); % use maskpsl class (instead of mask) to store the ocean function as a ocean_levelset
+mask=gmtmask(md.mesh.lat,md.mesh.long);
 
 icemask=ones(md.mesh.numberofvertices,1);
@@ -39 +39 @@
 %make sure that the ice level set is all inclusive:
 md.mask.land_levelset=zeros(md.mesh.numberofvertices,1);
-md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); 
+md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
 
 %make sure that the elements that have loads are fully grounded:
@@ -45 +45 @@
 md.mask.groundedice_levelset(md.mesh.elements(pos,:))=1;
 
-%make sure wherever there is an ice load, that the mask is set to ice: 
+%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.slr.deltathickness);
 md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
 % }}}
@@ -75 +75 @@
 md.slr.Ngia = zeros(md.mesh.numberofvertices,1);
 md.slr.Ugia = zeros(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; 
+%eustatic + rigid + elastic run:
+md.slr.rigid=1; md.slr.elastic=1; md.slr.rotation=1;
 md.cluster=generic('name',oshostname(),'np',3);
 
-% uncomment following 2 lines for 
+% uncomment following 2 lines for
 md=solve(md,'Sealevelrise');
 eus=md.results.SealevelriseSolution.SealevelRSLEustatic;
 slr=md.results.SealevelriseSolution.Sealevel;
-moixz=md.results.SealevelriseSolution.SealevelInertiaTensorXZ; 
-moiyz=md.results.SealevelriseSolution.SealevelInertiaTensorYZ; 
-moizz=md.results.SealevelriseSolution.SealevelInertiaTensorZZ; 
+moixz=md.results.SealevelriseSolution.SealevelInertiaTensorXZ;
+moiyz=md.results.SealevelriseSolution.SealevelInertiaTensorYZ;
+moizz=md.results.SealevelriseSolution.SealevelInertiaTensorZZ;
 
 % analytical moi => just checking FOR ICE only!!! {{{
-% ...have to mute ** slr induced MOI in Tria.cpp ** prior to the comparison 
-%rad_e = rad_e*1e3; % now in meters 
+% ...have to mute ** slr induced MOI in Tria.cpp ** prior to the comparison
+%rad_e = rad_e*1e3; % now in meters
 %areas=GetAreasSphericalTria(md.mesh.elements,md.mesh.lat,md.mesh.long,rad_e);
-%lat=late*pi/180; lon=longe*pi/180; 
+%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));

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

@@ -90 +90 @@
 md.slr.Ngia = np.zeros((md.mesh.numberofvertices, ))
 md.slr.Ugia = np.zeros((md.mesh.numberofvertices, ))
+md.slr.hydro_rate = np.zeros((md.mesh.numberofvertices, ))
 
 #eustatic + rigid + elastic run: