Context Navigation

← Previous Change
Next Change →

Changeset 25836 for issm/trunk/test/NightlyRun/test2111.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

Files:

: 4 edited

. (modified) (1 prop)
test (modified) (1 prop)
test/NightlyRun (modified) (1 prop)
test/NightlyRun/test2111.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk

Property svn:mergeinfo changed

/issm/trunk-jpl

merged: 24687-24689,24691-25328,25330-25332,25334,25336-25346,25354-25357,25362-25478,25481-25493,25497-25525,25528-25533,25536,25539-25565,25567-25586,25590-25594,25597-25598,25608-25612,25616-25617,25619-25624,25626-25723,25725-25738,25741,25744-25775,25777-25829,25832-25833

issm/trunk/test

Property svn:mergeinfo changed

/issm/branches/trunk-larour-SLPS2020/test (added)	merged: 25526-25527,25595,25604,25606-25607
/issm/trunk-jpl/test	merged: 24687,24689,24691,24704,24711,24717,24720-24724,24735-24737,24739,24748-24750,24757-24758,24760,24763-24764,24772-24773,24775,24795,24809,24819,24821,24831,24833-24834,24836,24838-24840,24862-24863,24870-24872,24889-24891,24893,24905-24909,24911-24914,24919,24925,24927,24971,24990,24996-24997,25005,25007-25010,25015-25016,25022-25024,25029,25034,25044,25046-25047,25070-25071,25075-25077,25102-25104,25106-25107,25110,25112-25114,25124-25125,25129,25131-25135,25140,25147,25158-25159,25161,25163,25165-25166,25168-25169,25171-25172,25174,25176-25179,25181-25183,25201,25209,25216-25217,25238,25253-25254,25268,25290-25291,25298,25300-25303,25307,25309,25331,25342,25355-25356,25366,25370-25372,25374-25376,25385,25396-25399,25409,25416,25428-25429,25431-25433,25455,25461-25462,25470,25475,25499,25502-25504,25515-25517,25546,25565,25572-25573,25577,25590,25627,25640-25641,25651,25656-25657,25670,25688-25689,25698,25700,25708-25709,25719,25729-25730,25762-25763,25769,25806-25807,25823,25832

issm/trunk/test/NightlyRun

Property svn:ignore

old	new
18	18	run.old
19	19	run_matlab
	20	test218.qmu.in
	21	test218.qmu.out
	22	test218.qmu.err

issm/trunk/test/NightlyRun/test2111.m

-              r23189
+              r25836
 %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:{{{
+        nlov=10001;     % horizontal displacements do not work for low degree truncation, e.g., 101
+        md.esa.love_h = love_numbers('h','CF'); md.esa.love_h(nlov+1:end)=[];
+        md.esa.love_l = love_numbers('l','CF'); md.esa.love_l(nlov+1:end)=[];
+md.solidearth.lovenumbers=lovenumbers('maxdeg',10000,'referenceframe','CF');
 % }}}
 %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.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
+        pos=find(md.mask.ice_levelset<=0); md.mask.groundedice_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;
 % }}}
-%New stuff
-md.slr.spcthickness = NaN(md.mesh.numberofvertices,1);
-md.slr.Ngia = zeros(md.mesh.numberofvertices,1);
-md.slr.Ugia = zeros(md.mesh.numberofvertices,1);
 %solve esa: {{{

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: