Changeset 17590


Ignore:
Timestamp:
03/28/14 09:15:19 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: WARNING: md.geometry.bed is now md.geometry.base and bathymetry is bed

Location:
issm/trunk-jpl
Files:
81 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/m/classes/geometry.m

    r17555 r17590  
    88                surface           = NaN;
    99                thickness         = NaN;
     10                base              = NaN;
    1011                bed               = NaN;
    11                 bathymetry        = NaN;
    1212                hydrostatic_ratio = NaN;
     13        end
     14        methods (Static)
     15                function obj = loadobj(obj) % {{{
     16                        % This function is directly called by matlab when a model object is
     17                        % loaded. Update old properties here
     18
     19                        %2014 March 26th
     20                        if isstruct(obj),
     21                                disp('WARNING: updating geometry');
     22                                disp('         md.geometry.bed        is now md.geometry.base');
     23                                disp('         md.geometry.bathymetry is now md.geometry.bed');
     24                                obj2=obj;
     25                                obj=geometry();
     26                                obj.surface    = obj2.surface;
     27                                obj.thickness  = obj2.thickness;
     28                                obj.base       = obj2.bed;
     29                                obj.bed        = obj2.bathymetry;
     30                        end
     31
     32                end% }}}
    1333        end
    1434        methods
    … …  
    3050                        else
    3151                                md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
    32                                 md = checkfield(md,'fieldname','geometry.bed'      ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
     52                                md = checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'size',[md.mesh.numberofvertices 1]);
    3353                                md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
    34                                 if any((obj.thickness-obj.surface+obj.bed)>10^-9),
    35                                         md = checkmessage(md,['equality thickness=surface-bed violated']);
     54                                if any((obj.thickness-obj.surface+obj.base)>10^-9),
     55                                        md = checkmessage(md,['equality thickness=surface-base violated']);
    3656                                end
    3757                                if solution==TransientSolutionEnum() & md.transient.isgroundingline,
    38                                         md = checkfield(md,'fieldname','geometry.bathymetry','NaN',1,'size',[md.mesh.numberofvertices 1]);
     58                                        md = checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices 1]);
    3959                                end
    4060                        end
    … …  
    4363                        disp(sprintf('   geometry parameters:'));
    4464
    45                         fielddisplay(obj,'surface','surface elevation [m]');
     65                        fielddisplay(obj,'surface','ice upper surface elevation [m]');
    4666                        fielddisplay(obj,'thickness','ice thickness [m]');
     67                        fielddisplay(obj,'base','ice base elevation [m]');
    4768                        fielddisplay(obj,'bed','bed elevation [m]');
    48                         fielddisplay(obj,'bathymetry','bathymetry elevation [m]');
    49                         fielddisplay(obj,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro');
    5069
    5170                end % }}}
    … …  
    5372                        WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum());
    5473                        WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1);
    55                         WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BaseEnum());
    56                         WriteData(fid,'data',obj.bathymetry,'format','DoubleMat','mattype',1,'enum',BedEnum());
     74                        WriteData(fid,'data',obj.base,'format','DoubleMat','mattype',1,'enum',BaseEnum());
     75                        WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum());
    5776                        WriteData(fid,'object',obj,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1);
    5877                end % }}}

  • issm/trunk-jpl/src/m/classes/geometry.py

    r17555 r17590  
    1515                self.surface           = float('NaN')
    1616                self.thickness         = float('NaN')
    17                 self.bed               = float('NaN')
    18                 self.bathymetry        = float('NaN')
     17                self.base               = float('NaN')
     18                self.bed        = float('NaN')
    1919                self.hydrostatic_ratio = float('NaN')
    2020
    … …  
    2626
    2727                string="   geometry parameters:"
    28                 string="%s\n%s"%(string,fielddisplay(self,'surface','surface elevation [m]'))
     28                string="%s\n%s"%(string,fielddisplay(self,'surface','ice upper surface elevation [m]'))
    2929                string="%s\n%s"%(string,fielddisplay(self,'thickness','ice thickness [m]'))
     30                string="%s\n%s"%(string,fielddisplay(self,'base','ice base elevation [m]'))
    3031                string="%s\n%s"%(string,fielddisplay(self,'bed','bed elevation [m]'))
    31                 string="%s\n%s"%(string,fielddisplay(self,'bathymetry','bathymetry elevation [m]'))
    32                 string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro'))
    3332                return string
    3433                #}}}
    … …  
    3938
    4039                md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'size',[md.mesh.numberofvertices])
    41                 md = checkfield(md,'fieldname','geometry.bed'      ,'NaN',1,'size',[md.mesh.numberofvertices])
     40                md = checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'size',[md.mesh.numberofvertices])
    4241                md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'size',[md.mesh.numberofvertices],'>',0,'forcing',1)
    43                 if any((self.thickness-self.surface+self.bed)>10**-9):
    44                         md.checkmessage("equality thickness=surface-bed violated")
     42                if any((self.thickness-self.surface+self.base)>10**-9):
     43                        md.checkmessage("equality thickness=surface-base violated")
    4544                if solution==TransientSolutionEnum() and md.transient.isgroundingline:
    46                         md = checkfield(md,'fieldname','geometry.bathymetry','NaN',1,'size',[md.mesh.numberofvertices])
     45                        md = checkfield(md,'fieldname','geometry.bed','NaN',1,'size',[md.mesh.numberofvertices])
    4746
    4847                return md
    … …  
    5150                WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum())
    5251                WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1)
    53                 WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BaseEnum())
    54                 WriteData(fid,'data',self.bathymetry,'format','DoubleMat','mattype',1,'enum',BedEnum())
     52                WriteData(fid,'data',self.base,'format','DoubleMat','mattype',1,'enum',BaseEnum())
     53                WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BedEnum())
    5554                WriteData(fid,'object',self,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1)
    5655        # }}}

  • issm/trunk-jpl/src/m/classes/groundingline.m

    r17579 r17590  
    3232
    3333                        if ~strcmp(obj.migration,'None'),
    34                                 if isnan(md.geometry.bathymetry),
     34                                if isnan(md.geometry.bed),
    3535                                        md = checkmessage(md,['requesting grounding line migration, but bathymetry is absent!']);
    3636                                end
    3737                                pos=find(md.mask.groundedice_levelset>0.);
    38                                 if any(abs(md.geometry.bed(pos)-md.geometry.bathymetry(pos))>10^-10),
     38                                if any(abs(md.geometry.base(pos)-md.geometry.bed(pos))>10^-10),
    3939                                        md = checkmessage(md,['bathymetry not equal to bed on grounded ice!']);
    4040                                end
    41                                 if any(md.geometry.bathymetry - md.geometry.bed > 10^-9),
     41                                if any(md.geometry.bed - md.geometry.base > 10^-9),
    4242                                        md = checkmessage(md,['bathymetry superior to bed on floating ice!']);
    4343                                end

  • issm/trunk-jpl/src/m/classes/groundingline.py

    r17579 r17590  
    4545
    4646                if not m.strcmp(self.migration,'None'):
    47                         if numpy.any(numpy.isnan(md.geometry.bathymetry)):
     47                        if numpy.any(numpy.isnan(md.geometry.bed)):
    4848                                md.checkmessage("requesting grounding line migration, but bathymetry is absent!")
    4949                        pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
    50                         if any(numpy.abs(md.geometry.bed[pos]-md.geometry.bathymetry[pos])>10**-10):
     50                        if any(numpy.abs(md.geometry.base[pos]-md.geometry.bed[pos])>10**-10):
    5151                                md.checkmessage("bathymetry not equal to bed on grounded ice!")
    52                         if any(md.geometry.bathymetry - md.geometry.bed > 10**-9):
     52                        if any(md.geometry.bed - md.geometry.base > 10**-9):
    5353                                md.checkmessage("bathymetry superior to bed on floating ice!")
    5454

  • issm/trunk-jpl/src/m/classes/mesh3dprisms.m

    r17589 r17590  
    8787                        md = checkfield(md,'fieldname','mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]);
    8888                        md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]);
    89                         md = checkfield(md,'fieldname','mesh.z','>=',md.geometry.bed-10^-10,'message','''mesh.z'' lower than bedrock');
     89                        md = checkfield(md,'fieldname','mesh.z','>=',md.geometry.base-10^-10,'message','''mesh.z'' lower than bedrock');
    9090                        md = checkfield(md,'fieldname','mesh.z','<=',md.geometry.surface+10^-10,'message','''mesh.z'' higher than surface elevation');
    9191                        md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',24,'message','''mesh.average_vertex_connectivity'' should be at least 24 in 3d');

  • issm/trunk-jpl/src/m/classes/mesh3dtetras.m

    r17562 r17590  
    8383                        md = checkfield(md,'fieldname','mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]);
    8484                        md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]);
    85                         md = checkfield(md,'fieldname','mesh.z','>=',md.geometry.bed-10^-10,'message','''mesh.z'' lower than bedrock');
     85                        md = checkfield(md,'fieldname','mesh.z','>=',md.geometry.base-10^-10,'message','''mesh.z'' lower than bedrock');
    8686                        md = checkfield(md,'fieldname','mesh.z','<=',md.geometry.surface+10^-10,'message','''mesh.z'' higher than surface elevation');
    8787                        md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',24,'message','''mesh.average_vertex_connectivity'' should be at least 24 in 3d');

  • issm/trunk-jpl/src/m/classes/model.m

    r17566 r17590  
    232232                        md.geometry.surface=project2d(md,md.geometry.surface,1);
    233233                        md.geometry.thickness=project2d(md,md.geometry.thickness,1);
     234                        md.geometry.base=project2d(md,md.geometry.base,1);
    234235                        md.geometry.bed=project2d(md,md.geometry.bed,1);
    235                         md.geometry.bathymetry=project2d(md,md.geometry.bathymetry,1);
    236236                        md.mesh.vertexonboundary=project2d(md,md.mesh.vertexonboundary,1);
    237237                        md.mesh.elementconnectivity=project2d(md,md.mesh.elementconnectivity,1);
    … …  
    637637                        z3d=[];  %the lower node is on the bed
    638638                        thickness3d=md.geometry.thickness; %thickness and bed for these nodes
    639                         bed3d=md.geometry.bed;
     639                        bed3d=md.geometry.base;
    640640
    641641                        %Create the new layers
    … …  
    656656
    657657                        %Keep a trace of lower and upper nodes
    658                         mesh.lowervertex=NaN*ones(number_nodes3d,1);
    659                         mesh.uppervertex=NaN*ones(number_nodes3d,1);
    660                         mesh.lowervertex(md.mesh.numberofvertices+1:end)=1:(numlayers-1)*md.mesh.numberofvertices;
    661                         mesh.uppervertex(1:(numlayers-1)*md.mesh.numberofvertices)=md.mesh.numberofvertices+1:number_nodes3d;
    662                         md.mesh.lowervertex=mesh.lowervertex;
    663                         md.mesh.uppervertex=mesh.uppervertex;
     658                        lowervertex=NaN*ones(number_nodes3d,1);
     659                        uppervertex=NaN*ones(number_nodes3d,1);
     660                        lowervertex(md.mesh.numberofvertices+1:end)=1:(numlayers-1)*md.mesh.numberofvertices;
     661                        uppervertex(1:(numlayers-1)*md.mesh.numberofvertices)=md.mesh.numberofvertices+1:number_nodes3d;
     662                        md.mesh.lowervertex=lowervertex;
     663                        md.mesh.uppervertex=uppervertex;
    664664
    665665                        %same for lower and upper elements
    666                         mesh.lowerelements=NaN*ones(number_el3d,1);
    667                         mesh.upperelements=NaN*ones(number_el3d,1);
    668                         mesh.lowerelements(md.mesh.numberofelements+1:end)=1:(numlayers-2)*md.mesh.numberofelements;
    669                         mesh.upperelements(1:(numlayers-2)*md.mesh.numberofelements)=md.mesh.numberofelements+1:(numlayers-1)*md.mesh.numberofelements;
    670                         md.mesh.lowerelements=mesh.lowerelements;
    671                         md.mesh.upperelements=mesh.upperelements;
     666                        lowerelements=NaN*ones(number_el3d,1);
     667                        upperelements=NaN*ones(number_el3d,1);
     668                        lowerelements(md.mesh.numberofelements+1:end)=1:(numlayers-2)*md.mesh.numberofelements;
     669                        upperelements(1:(numlayers-2)*md.mesh.numberofelements)=md.mesh.numberofelements+1:(numlayers-1)*md.mesh.numberofelements;
     670                        md.mesh.lowerelements=lowerelements;
     671                        md.mesh.upperelements=upperelements;
    672672
    673673                        %Save old mesh
    … …  
    793793                        md.gia.lithosphere_thickness=project3d(md,'vector',md.gia.lithosphere_thickness,'type','node');
    794794                        md.geometry.hydrostatic_ratio=project3d(md,'vector',md.geometry.hydrostatic_ratio,'type','node');
     795                        md.geometry.base=project3d(md,'vector',md.geometry.base,'type','node');
    795796                        md.geometry.bed=project3d(md,'vector',md.geometry.bed,'type','node');
    796                         md.geometry.bathymetry=project3d(md,'vector',md.geometry.bathymetry,'type','node');
    797797                        md.mesh.vertexonboundary=project3d(md,'vector',md.mesh.vertexonboundary,'type','node');
    798798                        md.mask.groundedice_levelset=project3d(md,'vector',md.mask.groundedice_levelset,'type','node');
    … …  
    925925                        if isfield(structmd,'watercolumn'), md.initialization.watercolumn=structmd.watercolumn; end
    926926                        if isfield(structmd,'surface'), md.geometry.surface=structmd.surface; end
    927                         if isfield(structmd,'bed'), md.geometry.bed=structmd.bed; end
     927                        if isfield(structmd,'bed'), md.geometry.base=structmd.bed; end
    928928                        if isfield(structmd,'thickness'), md.geometry.thickness=structmd.thickness; end
    929                         if isfield(structmd,'bathymetry'), md.geometry.bathymetry=structmd.bathymetry; end
     929                        if isfield(structmd,'bathymetry'), md.geometry.bed=structmd.bathymetry; end
    930930                        if isfield(structmd,'thickness_coeff'), md.geometry.hydrostatic_ratio=structmd.thickness_coeff; end
    931931                        if isfield(structmd,'connectivity'), md.mesh.average_vertex_connectivity=structmd.connectivity; end

  • issm/trunk-jpl/src/m/classes/model.py

    r17588 r17590  
    528528                z3d=numpy.empty((0))    #the lower node is on the bed
    529529                thickness3d=md.geometry.thickness    #thickness and bed for these nodes
    530                 bed3d=md.geometry.bed
     530                bed3d=md.geometry.base
    531531
    532532                #Create the new layers
    … …  
    545545
    546546                #Keep a trace of lower and upper nodes
    547                 mesh.lowervertex=-1*numpy.ones(number_nodes3d,int)
    548                 mesh.uppervertex=-1*numpy.ones(number_nodes3d,int)
    549                 mesh.lowervertex[md.mesh.numberofvertices:]=numpy.arange(1,(numlayers-1)*md.mesh.numberofvertices+1)
    550                 mesh.uppervertex[:(numlayers-1)*md.mesh.numberofvertices]=numpy.arange(md.mesh.numberofvertices+1,number_nodes3d+1)
    551                 md.mesh.lowervertex=mesh.lowervertex
    552                 md.mesh.uppervertex=mesh.uppervertex
     547                lowervertex=-1*numpy.ones(number_nodes3d,int)
     548                uppervertex=-1*numpy.ones(number_nodes3d,int)
     549                lowervertex[md.mesh.numberofvertices:]=numpy.arange(1,(numlayers-1)*md.mesh.numberofvertices+1)
     550                uppervertex[:(numlayers-1)*md.mesh.numberofvertices]=numpy.arange(md.mesh.numberofvertices+1,number_nodes3d+1)
     551                md.mesh.lowervertex=lowervertex
     552                md.mesh.uppervertex=uppervertex
    553553
    554554                #same for lower and upper elements
    555                 mesh.lowerelements=-1*numpy.ones(number_el3d,int)
    556                 mesh.upperelements=-1*numpy.ones(number_el3d,int)
    557                 mesh.lowerelements[md.mesh.numberofelements:]=numpy.arange(1,(numlayers-2)*md.mesh.numberofelements+1)
    558                 mesh.upperelements[:(numlayers-2)*md.mesh.numberofelements]=numpy.arange(md.mesh.numberofelements+1,(numlayers-1)*md.mesh.numberofelements+1)
    559                 md.mesh.lowerelements=mesh.lowerelements
    560                 md.mesh.upperelements=mesh.upperelements
     555                lowerelements=-1*numpy.ones(number_el3d,int)
     556                upperelements=-1*numpy.ones(number_el3d,int)
     557                lowerelements[md.mesh.numberofelements:]=numpy.arange(1,(numlayers-2)*md.mesh.numberofelements+1)
     558                upperelements[:(numlayers-2)*md.mesh.numberofelements]=numpy.arange(md.mesh.numberofelements+1,(numlayers-1)*md.mesh.numberofelements+1)
     559                md.mesh.lowerelements=lowerelements
     560                md.mesh.upperelements=upperelements
    561561
    562562                #Save old mesh
    … …  
    674674                md.gia.lithosphere_thickness=project3d(md,'vector',md.gia.lithosphere_thickness,'type','node')
    675675                md.geometry.hydrostatic_ratio=project3d(md,'vector',md.geometry.hydrostatic_ratio,'type','node')
     676                md.geometry.base=project3d(md,'vector',md.geometry.base,'type','node')
    676677                md.geometry.bed=project3d(md,'vector',md.geometry.bed,'type','node')
    677                 md.geometry.bathymetry=project3d(md,'vector',md.geometry.bathymetry,'type','node')
    678678                md.mesh.vertexonboundary=project3d(md,'vector',md.mesh.vertexonboundary,'type','node')
    679679                md.mask.ice_levelset=project3d(md,'vector',md.mask.ice_levelset,'type','node')

  • issm/trunk-jpl/src/m/contrib/hydrology/effectivepressure.m

    r13007 r17590  
    88%      Neff=effectivepressure(md)
    99
    10 Neff=md.materials.rho_ice*md.constants.g*md.geometry.thickness+md.materials.rho_ice*md.constants.g*md.geometry.bed;
     10Neff=md.materials.rho_ice*md.constants.g*md.geometry.thickness+md.materials.rho_ice*md.constants.g*md.geometry.base;
    1111pos=find(Neff<0);
    1212Neff(pos)=0;

  • issm/trunk-jpl/src/m/geometry/ThicknessCorrection.m

    r15987 r17590  
    7575md.geometry.thickness=thickness;
    7676md.geometry.hydrostatic_ratio=hydrostatic_ratio;
    77 md.geometry.bed=md.geometry.surface-md.geometry.thickness;
     77md.geometry.base=md.geometry.surface-md.geometry.thickness;

  • issm/trunk-jpl/src/m/interp/ProfileValues.m

    r13008 r17590  
    1111%Get bed and surface for each 2d point, offset to make sure that it is inside the glacier system
    1212offset=10^-3;
    13 bed=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.bed,1),xprof,yprof)+offset;
     13bed=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.base,1),xprof,yprof)+offset;
    1414surface=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.surface,1),xprof,yprof)-offset;
    1515

  • issm/trunk-jpl/src/m/interp/SectionValues.m

    r17559 r17590  
    9494        %Get bed and surface for each 2d point, offset to make sure that it is inside the glacier system
    9595        offset=10^-3;
    96         bed=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.bed,1),X,Y)+offset;
     96        bed=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.base,1),X,Y)+offset;
    9797        surface=InterpFromMeshToMesh2d(md.mesh.elements2d,md.mesh.x2d,md.mesh.y2d,project2d(md,md.geometry.surface,1),X,Y)-offset;
    9898

  • issm/trunk-jpl/src/m/mech/basalstress.m

    r13646 r17590  
    1717
    1818%compute basal drag
    19 bx=(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.bed)).^r.*(md.friction.coefficient).^2.*ubx.^s;
    20 by=(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.bed)).^r.*(md.friction.coefficient).^2.*uby.^s;
    21 b=(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.bed)).^r.*(md.friction.coefficient).^2.*ub.^s;
     19bx=(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base)).^r.*(md.friction.coefficient).^2.*ubx.^s;
     20by=(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base)).^r.*(md.friction.coefficient).^2.*uby.^s;
     21b=(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base)).^r.*(md.friction.coefficient).^2.*ub.^s;

  • issm/trunk-jpl/src/m/plot/plot_basaldrag.m

    r17559 r17590  
    3030
    3131%compute basal drag
    32 drag=(max(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.bed),0)).^r.*(md.friction.coefficient).^2.*ub.^s/1000;
     32drag=(max(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base),0)).^r.*(md.friction.coefficient).^2.*ub.^s/1000;
    3333
    3434%Figure out if this is a Section plot

  • issm/trunk-jpl/test/NightlyRun/test217.m

    r17119 r17590  
    2222h=1000;
    2323md.geometry.thickness=h*ones(md.mesh.numberofvertices,1);
    24 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    25 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     24md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     25md.geometry.surface=md.geometry.base+md.geometry.thickness;
    2626
    2727%Initial velocity and pressure

  • issm/trunk-jpl/test/NightlyRun/test217.py

    r17499 r17590  
    3434h=1000.
    3535md.geometry.thickness=h*ones((md.mesh.numberofvertices,1))
    36 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    37 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     36md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     37md.geometry.surface=md.geometry.base+md.geometry.thickness
    3838
    3939# Initial velocity and pressure

  • issm/trunk-jpl/test/NightlyRun/test218.m

    r15771 r17590  
    1919h=1000;
    2020md.geometry.thickness=h*ones(md.mesh.numberofvertices,1);
    21 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    22 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     21md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     22md.geometry.surface=md.geometry.base+md.geometry.thickness;
    2323
    2424%Initial velocity and pressure

  • issm/trunk-jpl/test/NightlyRun/test223.m

    r17555 r17590  
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setflowequation(md,'SSA','all');
    5 md.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.;
     5md.geometry.base=md.geometry.base+50.; md.geometry.surface=md.geometry.surface+50.;
    66md.cluster=generic('name',oshostname(),'np',1);
    77md.masstransport.hydrostatic_adjustment='Incremental';

  • issm/trunk-jpl/test/NightlyRun/test223.py

    r17555 r17590  
    1212md=parameterize(md,'../Par/SquareShelf.py')
    1313md=setflowequation(md,'SSA','all')
    14 md.geometry.bed=md.geometry.bed+50.
     14md.geometry.base=md.geometry.base+50.
    1515md.geometry.surface=md.geometry.surface+50.
    1616md.cluster=generic('name',oshostname(),'np',1)

  • issm/trunk-jpl/test/NightlyRun/test225.m

    r17555 r17590  
    22md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    4 md.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.;
     4md.geometry.base=md.geometry.base+50.; md.geometry.surface=md.geometry.surface+50.;
    55md=extrude(md,3,1.);
    66md=setflowequation(md,'HO','all');

  • issm/trunk-jpl/test/NightlyRun/test225.py

    r17555 r17590  
    1111md=setmask(md,'all','')
    1212md=parameterize(md,'../Par/SquareShelf.py')
    13 md.geometry.bed=md.geometry.bed+50.
     13md.geometry.base=md.geometry.base+50.
    1414md.geometry.surface=md.geometry.surface+50.
    1515md.extrude(3,1.)

  • issm/trunk-jpl/test/NightlyRun/test3015.m

    r16363 r17590  
    3838md.autodiff.isautodiff=false;
    3939md.geometry.thickness(index)=h0;
    40 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    41 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     40md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     41md.geometry.surface=md.geometry.base+md.geometry.thickness;
    4242md=SetIceShelfBC(md);
    4343
    … …  
    4949md.autodiff.isautodiff=false;
    5050md.geometry.thickness(index)=h2;
    51 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    52 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     51md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     52md.geometry.surface=md.geometry.base+md.geometry.thickness;
    5353md=SetIceShelfBC(md);
    5454
    … …  
    6363md.autodiff.isautodiff=true;
    6464md.geometry.thickness(index)=h1;
    65 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    66 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     65md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     66md.geometry.surface=md.geometry.base+md.geometry.thickness;
    6767md=SetIceShelfBC(md);
    6868

  • issm/trunk-jpl/test/NightlyRun/test3015.py

    r16363 r17590  
    5252md.autodiff.isautodiff=False
    5353md.geometry.thickness[index]=h0
    54 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    55 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     54md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     55md.geometry.surface=md.geometry.base+md.geometry.thickness
    5656md=SetIceShelfBC(md)
    5757
    … …  
    6363md.autodiff.isautodiff=False
    6464md.geometry.thickness[index]=h2
    65 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    66 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     65md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     66md.geometry.surface=md.geometry.base+md.geometry.thickness
    6767md=SetIceShelfBC(md)
    6868
    … …  
    7777md.autodiff.isautodiff=True
    7878md.geometry.thickness[index]=h1
    79 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    80 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     79md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     80md.geometry.surface=md.geometry.base+md.geometry.thickness
    8181md=SetIceShelfBC(md)
    8282

  • issm/trunk-jpl/test/NightlyRun/test3020.m

    r16363 r17590  
    4040md.autodiff.isautodiff=false;
    4141md.geometry.thickness(index)=h0;
    42 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    43 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     42md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     43md.geometry.surface=md.geometry.base+md.geometry.thickness;
    4444md=SetIceShelfBC(md);
    4545
    … …  
    5252md.autodiff.isautodiff=false;
    5353md.geometry.thickness(index)=h2;
    54 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    55 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     54md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     55md.geometry.surface=md.geometry.base+md.geometry.thickness;
    5656md=SetIceShelfBC(md);
    5757
    … …  
    6868md.autodiff.isautodiff=true;
    6969md.geometry.thickness(index)=h1;
    70 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    71 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     70md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     71md.geometry.surface=md.geometry.base+md.geometry.thickness;
    7272md=SetIceShelfBC(md);
    7373

  • issm/trunk-jpl/test/NightlyRun/test3020.py

    r16363 r17590  
    5454md.autodiff.isautodiff=False
    5555md.geometry.thickness[index]=h0
    56 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    57 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     56md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     57md.geometry.surface=md.geometry.base+md.geometry.thickness
    5858md=SetIceShelfBC(md)
    5959
    … …  
    6666md.autodiff.isautodiff=False
    6767md.geometry.thickness[index]=h2
    68 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    69 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     68md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     69md.geometry.surface=md.geometry.base+md.geometry.thickness
    7070md=SetIceShelfBC(md)
    7171
    … …  
    8282md.autodiff.isautodiff=True
    8383md.geometry.thickness[index]=h1
    84 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    85 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     84md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     85md.geometry.surface=md.geometry.base+md.geometry.thickness
    8686md=SetIceShelfBC(md)
    8787

  • issm/trunk-jpl/test/NightlyRun/test423.m

    r17060 r17590  
    3434vel_soft=(md.results.TransientSolution.Vel);
    3535
    36 md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bathymetry;
     36md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.base;
    3737md.groundingline.migration='SubelementMigration';
    3838md=solve(md,TransientSolutionEnum());

  • issm/trunk-jpl/test/NightlyRun/test423.py

    r16938 r17590  
    4545vel_soft=md.results.TransientSolution[0].Vel
    4646
    47 md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.bathymetry
     47md.mask.groundedice_levelset=md.geometry.thickness + md.materials.rho_water/md.materials.rho_ice*md.geometry.base
    4848md.groundingline.migration='SubelementMigration'
    4949md=solve(md,TransientSolutionEnum())

  • issm/trunk-jpl/test/NightlyRun/test424.m

    r17555 r17590  
    55md.initialization.vx(:)=0.;
    66md.initialization.vy(:)=0.;
    7 md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.;
    8 md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.;
     7md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
     8md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
    99md.geometry.thickness(:)=1000.;
    10 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     10md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1111md.surfaceforcings.mass_balance(:)=100.;
    1212md.transient.isstressbalance=0;

  • issm/trunk-jpl/test/NightlyRun/test424.py

    r17555 r17590  
    1515md.initialization.vx[:]=0.
    1616md.initialization.vy[:]=0.
    17 md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    18 md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     17md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     18md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    1919md.geometry.thickness[:]=1000.
    20 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     20md.geometry.surface=md.geometry.base+md.geometry.thickness
    2121md.surfaceforcings.mass_balance[:]=100.
    2222md.transient.isstressbalance=False

  • issm/trunk-jpl/test/NightlyRun/test425.m

    r17555 r17590  
    55md.initialization.vx(:)=0.;
    66md.initialization.vy(:)=0.;
    7 md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.;
    8 md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.;
     7md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
     8md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
    99md.geometry.thickness(:)=1300.;
    10 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     10md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1111md.surfaceforcings.mass_balance(:)=-150.;
    1212md.transient.isstressbalance=0;

  • issm/trunk-jpl/test/NightlyRun/test425.py

    r17555 r17590  
    1515md.initialization.vx[:]=0.
    1616md.initialization.vy[:]=0.
    17 md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    18 md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     17md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     18md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    1919md.geometry.thickness[:]=1300.
    20 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     20md.geometry.surface=md.geometry.base+md.geometry.thickness
    2121md.surfaceforcings.mass_balance[:]=-150.
    2222md.transient.isstressbalance=False

  • issm/trunk-jpl/test/NightlyRun/test426.m

    r17555 r17590  
    44md.initialization.vx(:)=0.;
    55md.initialization.vy(:)=0.;
    6 md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.;
    7 md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.;
     6md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
     7md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
    88md.geometry.thickness(:)=1000.;
    9 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     9md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1010md.surfaceforcings.mass_balance(:)=100.;
    1111md=extrude(md,3,1.);

  • issm/trunk-jpl/test/NightlyRun/test426.py

    r17555 r17590  
    1414md.initialization.vx[:]=0.
    1515md.initialization.vy[:]=0.
    16 md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    17 md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     16md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     17md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    1818md.geometry.thickness[:]=1000.
    19 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     19md.geometry.surface=md.geometry.base+md.geometry.thickness
    2020md.surfaceforcings.mass_balance[:]=100.
    2121md.extrude(3,1.);

  • issm/trunk-jpl/test/NightlyRun/test427.m

    r17555 r17590  
    44md.initialization.vx(:)=0.;
    55md.initialization.vy(:)=0.;
    6 md.geometry.bed=-700.-abs(md.mesh.y-500000.)/1000.;
    7 md.geometry.bathymetry=-700.-abs(md.mesh.y-500000.)/1000.;
     6md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
     7md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.;
    88md.geometry.thickness(:)=1300;
    9 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     9md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1010md=setflowequation(md,'SSA','all');
    1111md=extrude(md,3,1.);

  • issm/trunk-jpl/test/NightlyRun/test427.py

    r17555 r17590  
    1414md.initialization.vx[:]=0.
    1515md.initialization.vy[:]=0.
    16 md.geometry.bed=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    17 md.geometry.bathymetry=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     16md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
     17md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
    1818md.geometry.thickness[:]=1300
    19 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     19md.geometry.surface=md.geometry.base+md.geometry.thickness
    2020md=setflowequation(md,'SSA','all')
    2121md.extrude(3,1.)

  • issm/trunk-jpl/test/NightlyRun/test435.m

    r17573 r17590  
    55md.initialization.vy(:)=1.;
    66md.geometry.thickness(:)=500-md.mesh.x/10000;
    7 md.geometry.bathymetry=-100-md.mesh.x/1000;
    8 md.geometry.bed=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
    9 md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.bathymetry;
     7md.geometry.base=-100-md.mesh.x/1000;
     8md.geometry.base=-md.geometry.thickness*md.materials.rho_ice/md.materials.rho_water;
     9md.mask.groundedice_levelset=md.geometry.thickness+md.materials.rho_water/md.materials.rho_ice*md.geometry.base;
    1010pos=find(md.mask.groundedice_levelset>=0);
    11 md.geometry.bed(pos)=md.geometry.bathymetry(pos);
    12 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     11md.geometry.base(pos)=md.geometry.base(pos);
     12md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1313md=extrude(md,4,1.);
    1414md=setflowequation(md,'HO','all');

  • issm/trunk-jpl/test/NightlyRun/test511.m

    r17205 r17590  
    44
    55%impose hydrostatic equilibrium (required by Stokes)
    6 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    7 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     6md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     7md.geometry.surface=md.geometry.base+md.geometry.thickness;
    88md=extrude(md,3,1.);
    99md=setflowequation(md,'FS','all');

  • issm/trunk-jpl/test/NightlyRun/test511.py

    r17205 r17590  
    1414
    1515#impose hydrostatic equilibrium (required by Stokes)
    16 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    17 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     16md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     17md.geometry.surface=md.geometry.base+md.geometry.thickness
    1818md.extrude(3,1.)
    1919md=setflowequation(md,'FS','all')

  • issm/trunk-jpl/test/NightlyRun/test701.m

    r17119 r17590  
    77%Geometry
    88md.geometry.surface   = interp1(x,b+h,md.mesh.x);
    9 md.geometry.bed       = interp1(x,b,md.mesh.x);
    10 md.geometry.thickness = md.geometry.surface-md.geometry.bed;
     9md.geometry.base       = interp1(x,b,md.mesh.x);
     10md.geometry.thickness = md.geometry.surface-md.geometry.base;
    1111
    1212%mask

  • issm/trunk-jpl/test/NightlyRun/test702.m

    r17119 r17590  
    1111%parameterize
    1212md.geometry.surface   = interp1(x,b+h,md.mesh.x);
    13 md.geometry.bed       = interp1(x,b,md.mesh.x);
    14 md.geometry.thickness = md.geometry.surface-md.geometry.bed;
     13md.geometry.base       = interp1(x,b,md.mesh.x);
     14md.geometry.thickness = md.geometry.surface-md.geometry.base;
    1515md.mask.ice_levelset = - ones(md.mesh.numberofvertices,1);
    1616md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0;

  • issm/trunk-jpl/test/NightlyRun/test703.m

    r17555 r17590  
    1111%parameterize
    1212md.geometry.surface   = interp1(x,b+h,md.mesh.x);
    13 md.geometry.bed       = interp1(x,b,md.mesh.x);
    14 md.geometry.thickness = md.geometry.surface-md.geometry.bed;
     13md.geometry.base       = interp1(x,b,md.mesh.x);
     14md.geometry.thickness = md.geometry.surface-md.geometry.base;
    1515md.mask.ice_levelset  = - ones(md.mesh.numberofvertices,1);
    1616md.mask.ice_levelset(find(vertexflags(md.mesh,2))) = 0;

  • issm/trunk-jpl/test/Par/79North.par

    r16167 r17590  
    1313md.geometry.surface  =InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y);
    1414md.geometry.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y);
    15 md.geometry.bed=md.geometry.surface-md.geometry.thickness;
     15md.geometry.base=md.geometry.surface-md.geometry.thickness;
    1616clear surface thickness vx vy x y index;
    1717

  • issm/trunk-jpl/test/Par/79North.py

    r16171 r17590  
    2525[md.geometry.surface]   = InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)
    2626[md.geometry.thickness] = InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)
    27 md.geometry.bed         = md.geometry.surface-md.geometry.thickness
     27md.geometry.base         = md.geometry.surface-md.geometry.thickness
    2828
    2929#Materials

  • issm/trunk-jpl/test/Par/GiaBenchmarksAB.par

    r16167 r17590  
    1111end
    1212md.geometry.thickness=md.geometry.thickness';
    13 md.geometry.bed=zeros(md.mesh.numberofvertices,1);
    14 md.geometry.surface=md.geometry.thickness+md.geometry.bed;
     13md.geometry.base=zeros(md.mesh.numberofvertices,1);
     14md.geometry.surface=md.geometry.thickness+md.geometry.base;
    1515
    1616%Ice density used for benchmarking, not 917 kg/m^3

  • issm/trunk-jpl/test/Par/GiaBenchmarksCD.par

    r16167 r17590  
    1111end
    1212md.geometry.thickness=md.geometry.thickness';
    13 md.geometry.bed=zeros(md.mesh.numberofvertices,1);
    14 md.geometry.surface=md.geometry.thickness+md.geometry.bed;
     13md.geometry.base=zeros(md.mesh.numberofvertices,1);
     14md.geometry.surface=md.geometry.thickness+md.geometry.base;
    1515
    1616%Ice density used for benchmarking, not 917 kg/m^3

  • issm/trunk-jpl/test/Par/ISMIPA.par

    r16167 r17590  
    33disp('      creating thickness');
    44md.geometry.surface=-md.mesh.x*tan(0.5*pi/180.);
    5 md.geometry.bed=md.geometry.surface-1000.+500.*sin(md.mesh.x*2.*pi/max(md.mesh.x)).*sin(md.mesh.y*2.*pi/max(md.mesh.x));
    6 md.geometry.thickness=md.geometry.surface-md.geometry.bed;
     5md.geometry.base=md.geometry.surface-1000.+500.*sin(md.mesh.x*2.*pi/max(md.mesh.x)).*sin(md.mesh.y*2.*pi/max(md.mesh.x));
     6md.geometry.thickness=md.geometry.surface-md.geometry.base;
    77
    88disp('      creating drag');

  • issm/trunk-jpl/test/Par/ISMIPA.py

    r16170 r17590  
    66print "      creating thickness"
    77md.geometry.surface=-md.mesh.x.reshape(-1,1)*numpy.tan(0.5*numpy.pi/180.)
    8 md.geometry.bed=md.geometry.surface-1000.+500.*numpy.sin(md.mesh.x.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))*numpy.sin(md.mesh.y.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))
    9 md.geometry.thickness=md.geometry.surface-md.geometry.bed
     8md.geometry.base=md.geometry.surface-1000.+500.*numpy.sin(md.mesh.x.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))*numpy.sin(md.mesh.y.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))
     9md.geometry.thickness=md.geometry.surface-md.geometry.base
    1010
    1111print "      creating drag"

  • issm/trunk-jpl/test/Par/ISMIPB.par

    r16167 r17590  
    33disp('      creating thickness');
    44md.geometry.surface=-md.mesh.x*tan(0.5*pi/180.);
    5 md.geometry.bed=md.geometry.surface-1000.+500.*sin(md.mesh.x*2.*pi/max(md.mesh.x));
    6 md.geometry.thickness=md.geometry.surface-md.geometry.bed;
     5md.geometry.base=md.geometry.surface-1000.+500.*sin(md.mesh.x*2.*pi/max(md.mesh.x));
     6md.geometry.thickness=md.geometry.surface-md.geometry.base;
    77
    88disp('      creating drag');

  • issm/trunk-jpl/test/Par/ISMIPB.py

    r16170 r17590  
    66print "      creating thickness"
    77md.geometry.surface=-md.mesh.x.reshape(-1,1)*numpy.tan(0.5*numpy.pi/180.)
    8 md.geometry.bed=md.geometry.surface-1000.+500.*numpy.sin(md.mesh.x.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))
    9 md.geometry.thickness=md.geometry.surface-md.geometry.bed
     8md.geometry.base=md.geometry.surface-1000.+500.*numpy.sin(md.mesh.x.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))
     9md.geometry.thickness=md.geometry.surface-md.geometry.base
    1010
    1111print "      creating drag"

  • issm/trunk-jpl/test/Par/ISMIPC.par

    r16167 r17590  
    33disp('      creating thickness');
    44md.geometry.surface=2000.-md.mesh.x*tan(0.1*pi/180.); %to have z>0
    5 md.geometry.bed=md.geometry.surface-1000.;
    6 md.geometry.thickness=md.geometry.surface-md.geometry.bed;
     5md.geometry.base=md.geometry.surface-1000.;
     6md.geometry.thickness=md.geometry.surface-md.geometry.base;
    77
    88disp('      creating drag');
    9 %md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x/2.)).*sin(md.mesh.y*2.*pi/max(md.mesh.x/2.)))./(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.bed)));
     9%md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x/2.)).*sin(md.mesh.y*2.*pi/max(md.mesh.x/2.)))./(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base)));
    1010md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x)).*sin(md.mesh.y*2.*pi/max(md.mesh.x))));
    1111md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;

  • issm/trunk-jpl/test/Par/ISMIPC.py

    r16170 r17590  
    66print "      creating thickness"
    77md.geometry.surface=2000.-md.mesh.x.reshape(-1,1)*numpy.tan(0.1*numpy.pi/180.)    #to have z>0
    8 md.geometry.bed=md.geometry.surface-1000.
    9 md.geometry.thickness=md.geometry.surface-md.geometry.bed
     8md.geometry.base=md.geometry.surface-1000.
     9md.geometry.thickness=md.geometry.surface-md.geometry.base
    1010
    1111print "      creating drag"
    12 #md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x/2.)).*sin(md.mesh.y*2.*pi/max(md.mesh.x/2.)))./(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.bed)));
     12#md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x/2.)).*sin(md.mesh.y*2.*pi/max(md.mesh.x/2.)))./(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base)));
    1313md.friction.coefficient=numpy.sqrt(md.constants.yts*(1000.+1000.*numpy.sin(md.mesh.x.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))*numpy.sin(md.mesh.y.reshape(-1,1)*2.*numpy.pi/numpy.max(md.mesh.x))))
    1414md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.

  • issm/trunk-jpl/test/Par/ISMIPD.par

    r16167 r17590  
    33disp('      creating thickness');
    44md.geometry.surface=2000.-md.mesh.x*tan(0.1*pi/180.); %to have z>0
    5 md.geometry.bed=md.geometry.surface-1000.;
    6 md.geometry.thickness=md.geometry.surface-md.geometry.bed;
     5md.geometry.base=md.geometry.surface-1000.;
     6md.geometry.thickness=md.geometry.surface-md.geometry.base;
    77
    88disp('      creating drag');

  • issm/trunk-jpl/test/Par/ISMIPD.py

    r16170 r17590  
    66print "      creating thickness"
    77md.geometry.surface=2000.-md.mesh.x.reshape(-1,1)*numpy.tan(0.1*numpy.pi/180.)    #to have z>0
    8 md.geometry.bed=md.geometry.surface-1000.
    9 md.geometry.thickness=md.geometry.surface-md.geometry.bed
     8md.geometry.base=md.geometry.surface-1000.
     9md.geometry.thickness=md.geometry.surface-md.geometry.base
    1010
    1111print "      creating drag"

  • issm/trunk-jpl/test/Par/ISMIPE.par

    r16167 r17590  
    44data=transpose(ncread('../Data/ISMIPE.nc','data'));
    55md.geometry.surface=zeros(md.mesh.numberofvertices,1);
    6 md.geometry.bed=zeros(md.mesh.numberofvertices,1);
     6md.geometry.base=zeros(md.mesh.numberofvertices,1);
    77for i=1:md.mesh.numberofvertices
    88        y=md.mesh.y(i);
    … …  
    1010        point2=min(point1+1,51);
    1111        coeff=(y-(point1-1.)*100.)/100.;
    12         md.geometry.bed(i)=(1.-coeff)*data(point1,2)+coeff*data(point2,2);
     12        md.geometry.base(i)=(1.-coeff)*data(point1,2)+coeff*data(point2,2);
    1313        md.geometry.surface(i)=(1.-coeff)*data(point1,3)+coeff*data(point2,3);
    1414end
    15 md.geometry.thickness=md.geometry.surface-md.geometry.bed;
     15md.geometry.thickness=md.geometry.surface-md.geometry.base;
    1616md.geometry.thickness(find(~md.geometry.thickness))=0.01;
    17 md.geometry.bed=md.geometry.surface-md.geometry.thickness;
     17md.geometry.base=md.geometry.surface-md.geometry.thickness;
    1818
    1919disp('      creating drag');

  • issm/trunk-jpl/test/Par/ISMIPE.py

    r16170 r17590  
    1010f.close()
    1111md.geometry.surface=numpy.zeros((md.mesh.numberofvertices,1))
    12 md.geometry.bed=numpy.zeros((md.mesh.numberofvertices,1))
     12md.geometry.base=numpy.zeros((md.mesh.numberofvertices,1))
    1313for i in xrange(0,md.mesh.numberofvertices):
    1414        y=md.mesh.y[i]
    … …  
    1616        point2=numpy.minimum(point1+1,50)
    1717        coeff=(y-(point1-1.)*100.)/100.
    18         md.geometry.bed[i]=(1.-coeff)*data[point1,1]+coeff*data[point2,1]
     18        md.geometry.base[i]=(1.-coeff)*data[point1,1]+coeff*data[point2,1]
    1919        md.geometry.surface[i]=(1.-coeff)*data[point1,2]+coeff*data[point2,2]
    20 md.geometry.thickness=md.geometry.surface-md.geometry.bed
     20md.geometry.thickness=md.geometry.surface-md.geometry.base
    2121md.geometry.thickness[numpy.nonzero(numpy.logical_not(md.geometry.thickness))]=0.01
    22 md.geometry.bed=md.geometry.surface-md.geometry.thickness
     22md.geometry.base=md.geometry.surface-md.geometry.thickness
    2323
    2424print "      creating drag"

  • issm/trunk-jpl/test/Par/ISMIPF.par

    r16167 r17590  
    44disp('      creating thickness');
    55md.geometry.surface=-md.mesh.x*tan(3.*pi/180.);
    6 %md.geometry.bed=md.geometry.surface-1000.;
    7 md.geometry.bed=md.geometry.surface-1000.+100.*exp(-((md.mesh.x-max(md.mesh.x)/2.).^2+(md.mesh.y-max(md.mesh.y)/2.).^2)/(10000.^2));
    8 md.geometry.thickness=md.geometry.surface-md.geometry.bed;
     6%md.geometry.base=md.geometry.surface-1000.;
     7md.geometry.base=md.geometry.surface-1000.+100.*exp(-((md.mesh.x-max(md.mesh.x)/2.).^2+(md.mesh.y-max(md.mesh.y)/2.).^2)/(10000.^2));
     8md.geometry.thickness=md.geometry.surface-md.geometry.base;
    99
    1010disp('      creating drag');

  • issm/trunk-jpl/test/Par/ISMIPF.py

    r16170 r17590  
    77print "      creating thickness"
    88md.geometry.surface=-md.mesh.x.reshape(-1,1)*numpy.tan(3.*numpy.pi/180.)
    9 #md.geometry.bed=md.geometry.surface-1000.
    10 md.geometry.bed=md.geometry.surface-1000.+100.*numpy.exp(-((md.mesh.x.reshape(-1,1)-numpy.max(md.mesh.x)/2.)**2+(md.mesh.y.reshape(-1,1)-numpy.max(md.mesh.y)/2.)**2)/(10000.**2))
    11 md.geometry.thickness=md.geometry.surface-md.geometry.bed
     9#md.geometry.base=md.geometry.surface-1000.
     10md.geometry.base=md.geometry.surface-1000.+100.*numpy.exp(-((md.mesh.x.reshape(-1,1)-numpy.max(md.mesh.x)/2.)**2+(md.mesh.y.reshape(-1,1)-numpy.max(md.mesh.y)/2.)**2)/(10000.**2))
     11md.geometry.thickness=md.geometry.surface-md.geometry.base
    1212
    1313print "      creating drag"

  • issm/trunk-jpl/test/Par/Pig.par

    r16167 r17590  
    1313md.geometry.surface  =InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y);
    1414md.geometry.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y);
    15 md.geometry.bed=md.geometry.surface-md.geometry.thickness;
     15md.geometry.base=md.geometry.surface-md.geometry.thickness;
    1616clear surface thickness vx_obs vy_obs x y index;
    1717md.initialization.vx=md.inversion.vx_obs;

  • issm/trunk-jpl/test/Par/Pig.py

    r16171 r17590  
    2525[md.geometry.surface]  =InterpFromMeshToMesh2d(index,x,y,surface,md.mesh.x,md.mesh.y)
    2626[md.geometry.thickness]=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)
    27 md.geometry.bed=md.geometry.surface-md.geometry.thickness
     27md.geometry.base=md.geometry.surface-md.geometry.thickness
    2828md.initialization.vx=md.inversion.vx_obs
    2929md.initialization.vy=md.inversion.vy_obs

  • issm/trunk-jpl/test/Par/RoundSheetEISMINT.par

    r16167 r17590  
    22disp('      creating thickness');
    33md.geometry.thickness=10.*ones(md.mesh.numberofvertices,1);
    4 md.geometry.bed=zeros(md.mesh.numberofvertices,1);
    5 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     4md.geometry.base=zeros(md.mesh.numberofvertices,1);
     5md.geometry.surface=md.geometry.base+md.geometry.thickness;
    66
    77disp('      creating drag');

  • issm/trunk-jpl/test/Par/RoundSheetEISMINT.py

    r16170 r17590  
    55print "      creating thickness"
    66md.geometry.thickness=10.*numpy.ones((md.mesh.numberofvertices,1))
    7 md.geometry.bed=numpy.zeros((md.mesh.numberofvertices,1))
    8 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     7md.geometry.base=numpy.zeros((md.mesh.numberofvertices,1))
     8md.geometry.surface=md.geometry.base+md.geometry.thickness
    99
    1010print "      creating drag"

  • issm/trunk-jpl/test/Par/RoundSheetShelf.par

    r16207 r17590  
    1111ymax=max(radius);
    1212md.geometry.thickness=hmax+(hmin-hmax)*(radius-ymin)/(ymax-ymin);
    13 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     13md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    1414
    1515pos=find(md.mask.groundedice_levelset>0.);
    16 md.geometry.bed(pos)=md.geometry.bed(pos)-300.*(radius(pos)-(rad-shelfextent))/(rad-shelfextent);
    17 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     16md.geometry.base(pos)=md.geometry.base(pos)-300.*(radius(pos)-(rad-shelfextent))/(rad-shelfextent);
     17md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1818
    1919pos=find(radius<200000);
    2020md.geometry.thickness(pos)=100.;
    21 md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20.;
    22 md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
     21md.geometry.base(pos)=-di*md.geometry.thickness(pos)-20.;
     22md.geometry.surface(pos)=md.geometry.base(pos)+md.geometry.thickness(pos);
    2323
    2424pos=find(md.mesh.x<0.2*1.e6 & md.mesh.x>-0.2*1.e6 & md.mesh.y>0.);
    2525md.geometry.thickness(pos)=100.;
    26 md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20.;
    27 md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
     26md.geometry.base(pos)=-di*md.geometry.thickness(pos)-20.;
     27md.geometry.surface(pos)=md.geometry.base(pos)+md.geometry.thickness(pos);
    2828
    2929pos=find(md.mesh.x<0.1*1.e6 & md.mesh.x>-0.1*1.e6 & md.mesh.y<-0.5*1.e6 & md.mesh.y>-0.6*1.e6);
    3030md.geometry.thickness(pos)=100.;
    31 md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20.;
    32 md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
     31md.geometry.base(pos)=-di*md.geometry.thickness(pos)-20.;
     32md.geometry.surface(pos)=md.geometry.base(pos)+md.geometry.thickness(pos);
    3333
    3434%plug holes into the ice sheet, to test for grounding line migration.
    … …  
    3737pos=find(rad<200000.);
    3838md.geometry.thickness(pos)=100.;
    39 md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20.;
    40 md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
     39md.geometry.base(pos)=-di*md.geometry.thickness(pos)-20.;
     40md.geometry.surface(pos)=md.geometry.base(pos)+md.geometry.thickness(pos);
    4141
    4242pos=find(md.mesh.x<0.2*1.e6 & md.mesh.x>-0.2*1.e6 & md.mesh.y>0.);
    4343md.geometry.thickness(pos)=100.;
    44 md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20.;
    45 md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
     44md.geometry.base(pos)=-di*md.geometry.thickness(pos)-20.;
     45md.geometry.surface(pos)=md.geometry.base(pos)+md.geometry.thickness(pos);
    4646
    4747pos=find(md.mesh.x<0.1*1.e6 & md.mesh.x>-0.1*1.e6 & md.mesh.y<-0.5*1.e6 & md.mesh.y>-0.6*1.e6);
    4848md.geometry.thickness(pos)=100.;
    49 md.geometry.bed(pos)=-di*md.geometry.thickness(pos)-20.;
    50 md.geometry.surface(pos)=md.geometry.bed(pos)+md.geometry.thickness(pos);
     49md.geometry.base(pos)=-di*md.geometry.thickness(pos)-20.;
     50md.geometry.surface(pos)=md.geometry.base(pos)+md.geometry.thickness(pos);
    5151
    5252%Initial velocity
    … …  
    9898%bathymetry and grounding line migration:
    9999md.groundingline.migration='AgressiveMigration';
    100 md.geometry.bathymetry=md.geometry.bed;
    101 pos=find(md.mask.groundedice_levelset<0.); md.geometry.bathymetry(pos)=md.geometry.bed(pos)-900.;
     100md.geometry.bed=md.geometry.base;
     101pos=find(md.mask.groundedice_levelset<0.); md.geometry.bed(pos)=md.geometry.base(pos)-900.;
    102102
    103103%Deal with boundary conditions:

  • issm/trunk-jpl/test/Par/RoundSheetShelf.py

    r16207 r17590  
    1818ymax=numpy.max(radius)
    1919md.geometry.thickness=hmax+(hmin-hmax)*(radius-ymin)/(ymax-ymin)
    20 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     20md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    2121
    2222pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
    23 md.geometry.bed[pos]=md.geometry.bed[pos]-300.*(radius[pos]-(rad-shelfextent))/(rad-shelfextent)
    24 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     23md.geometry.base[pos]=md.geometry.base[pos]-300.*(radius[pos]-(rad-shelfextent))/(rad-shelfextent)
     24md.geometry.surface=md.geometry.base+md.geometry.thickness
    2525
    2626pos=numpy.nonzero(radius<200000.)
    2727md.geometry.thickness[pos]=100.
    28 md.geometry.bed[pos]=-di*md.geometry.thickness[pos]-20.
    29 md.geometry.surface[pos]=md.geometry.bed[pos]+md.geometry.thickness[pos]
     28md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20.
     29md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos]
    3030
    3131pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.2*1.e6,md.mesh.x>-0.2*1.e6),md.mesh.y>0.))
    3232md.geometry.thickness[pos]=100.
    33 md.geometry.bed[pos]=-di*md.geometry.thickness[pos]-20.
    34 md.geometry.surface[pos]=md.geometry.bed[pos]+md.geometry.thickness[pos]
     33md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20.
     34md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos]
    3535
    3636pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.1*1.e6,md.mesh.x>-0.1*1.e6),numpy.logical_and(md.mesh.y<-0.5*1.e6,md.mesh.y>-0.6*1.e6)))
    3737md.geometry.thickness[pos]=100.
    38 md.geometry.bed[pos]=-di*md.geometry.thickness[pos]-20.
    39 md.geometry.surface[pos]=md.geometry.bed[pos]+md.geometry.thickness[pos]
     38md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20.
     39md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos]
    4040
    4141#plug holes into the ice sheet, to test for grounding line migration.
    … …  
    4444pos=numpy.nonzero(rad<200000.)
    4545md.geometry.thickness[pos]=100.
    46 md.geometry.bed[pos]=-di*md.geometry.thickness[pos]-20.
    47 md.geometry.surface[pos]=md.geometry.bed[pos]+md.geometry.thickness[pos]
     46md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20.
     47md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos]
    4848
    4949pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.2*1.e6,md.mesh.x>-0.2*1.e6),md.mesh.y>0.))
    5050md.geometry.thickness[pos]=100.
    51 md.geometry.bed[pos]=-di*md.geometry.thickness[pos]-20.
    52 md.geometry.surface[pos]=md.geometry.bed[pos]+md.geometry.thickness[pos]
     51md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20.
     52md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos]
    5353
    5454pos=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.x<0.1*1.e6,md.mesh.x>-0.1*1.e6),numpy.logical_and(md.mesh.y<-0.5*1.e6,md.mesh.y>-0.6*1.e6)))
    5555md.geometry.thickness[pos]=100.
    56 md.geometry.bed[pos]=-di*md.geometry.thickness[pos]-20.
    57 md.geometry.surface[pos]=md.geometry.bed[pos]+md.geometry.thickness[pos]
     56md.geometry.base[pos]=-di*md.geometry.thickness[pos]-20.
     57md.geometry.surface[pos]=md.geometry.base[pos]+md.geometry.thickness[pos]
    5858
    5959#Initial velocity
    … …  
    106106#bathymetry and grounding line migration:
    107107md.groundingline.migration='AgressiveMigration'
    108 md.geometry.bathymetry=copy.deepcopy(md.geometry.bed)
     108md.geometry.base=copy.deepcopy(md.geometry.base)
    109109pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0]
    110 md.geometry.bathymetry[pos]=md.geometry.bed[pos]-900.
     110md.geometry.base[pos]=md.geometry.base[pos]-900.
    111111
    112112#Deal with boundary conditions:

  • issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par

    r16167 r17590  
    66radius(find(radius>(1.-10^-9)*radiusmax))=radiusmax;    %eliminate roundoff issues in next statement
    77md.geometry.thickness=hmin*ones(size(md.mesh.x,1),1)+hmax*(4.*((1./2.)^(4./3.)*ones(size(md.mesh.x,1),1)-((radius)./(2.*radiusmax)).^(4./3.))).^(3./8.);
    8 md.geometry.bed=0.*md.geometry.thickness;
    9 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     8md.geometry.base=0.*md.geometry.thickness;
     9md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1010
    1111disp('      creating drag');

  • issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py

    r16170 r17590  
    99radius[numpy.nonzero(radius>(1.-10**-9)*radiusmax)]=radiusmax    #eliminate roundoff issues in next statement
    1010md.geometry.thickness=hmin*numpy.ones((numpy.size(md.mesh.x),1))+hmax*(4.*((1./2.)**(4./3.)*numpy.ones((numpy.size(md.mesh.x),1))-((radius)/(2.*radiusmax))**(4./3.)))**(3./8.)
    11 md.geometry.bed=0.*md.geometry.thickness
    12 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     11md.geometry.base=0.*md.geometry.thickness
     12md.geometry.surface=md.geometry.base+md.geometry.thickness
    1313
    1414print "      creating drag"

  • issm/trunk-jpl/test/Par/SquareEISMINT.par

    r16404 r17590  
    55ymax=max(md.mesh.y);
    66md.geometry.thickness=500.*ones(md.mesh.numberofvertices,1);
    7 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    8 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     7md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     8md.geometry.surface=md.geometry.base+md.geometry.thickness;
    99
    1010disp('      creating drag');

  • issm/trunk-jpl/test/Par/SquareEISMINT.py

    r16404 r17590  
    88ymax=numpy.max(md.mesh.y)
    99md.geometry.thickness=500.*numpy.ones((md.mesh.numberofvertices,1))
    10 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    11 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     10md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     11md.geometry.surface=md.geometry.base+md.geometry.thickness
    1212
    1313print "      creating drag"

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.par

    r17440 r17590  
    99xmax=max(md.mesh.x);
    1010md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    11 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness+20.;
    12 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     11md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness+20.;
     12md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1313
    1414%Initial velocity

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.py

    r17438 r17590  
    1818xmax=max(md.mesh.x)
    1919md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    20 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness+20.
    21 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     20md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness+20.
     21md.geometry.surface=md.geometry.base+md.geometry.thickness
    2222
    2323#Initial velocity

  • issm/trunk-jpl/test/Par/SquareSheetShelf.par

    r16404 r17590  
    99xmax=max(md.mesh.x);
    1010md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    11 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     11md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    1212bed_sheet=-md.materials.rho_ice/md.materials.rho_water*(hmax+(hmin-hmax)*(ymax/2-ymin)/(ymax-ymin));
    1313pos=find(md.mesh.y<=ymax/2.);
    14 md.geometry.bed(pos)=bed_sheet;
    15 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     14md.geometry.base(pos)=bed_sheet;
     15md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1616
    1717%Initial velocity

  • issm/trunk-jpl/test/Par/SquareSheetShelf.py

    r16404 r17590  
    1818xmax=max(md.mesh.x)
    1919md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    20 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     20md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    2121bed_sheet=-md.materials.rho_ice/md.materials.rho_water*(hmax+(hmin-hmax)*(ymax/2-ymin)/(ymax-ymin))
    2222pos=numpy.nonzero(md.mesh.y<=ymax/2.)
    23 md.geometry.bed[pos]=bed_sheet
    24 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     23md.geometry.base[pos]=bed_sheet
     24md.geometry.surface=md.geometry.base+md.geometry.thickness
    2525
    2626#Initial velocity

  • issm/trunk-jpl/test/Par/SquareShelf.par

    r16404 r17590  
    99xmax=max(md.mesh.x);
    1010md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    11 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    12 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     11md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     12md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1313
    1414%Initial velocity and pressure

  • issm/trunk-jpl/test/Par/SquareShelf.py

    r16404 r17590  
    1717xmax=max(md.mesh.x)
    1818md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    19 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    20 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     19md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     20md.geometry.surface=md.geometry.base+md.geometry.thickness
    2121
    2222#Initial velocity and pressure

  • issm/trunk-jpl/test/Par/SquareShelf2.par

    r16403 r17590  
    99xmax=max(md.mesh.x);
    1010md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    11 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    12 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     11md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     12md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1313
    1414%Initial velocity and pressure

  • issm/trunk-jpl/test/Par/SquareShelf2.py

    r16403 r17590  
    1717xmax=max(md.mesh.x)
    1818md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    19 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    20 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     19md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     20md.geometry.surface=md.geometry.base+md.geometry.thickness
    2121
    2222#Initial velocity and pressure

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.par

    r16420 r17590  
    99xmax=max(md.mesh.x);
    1010md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x-xmin)/(xmax-xmin);
    11 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
    12 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     11md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
     12md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1313
    1414%Initial velocity

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.py

    r16404 r17590  
    1717xmax=max(md.mesh.x)
    1818md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
    19 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    20 md.geometry.surface=md.geometry.bed+md.geometry.thickness
     19md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
     20md.geometry.surface=md.geometry.base+md.geometry.thickness
    2121
    2222#Initial velocity

  • issm/trunk-jpl/test/Par/SquareThermal.par

    r16404 r17590  
    66h=1000.;
    77md.geometry.thickness=h*ones(md.mesh.numberofvertices,1);
    8 md.geometry.bed=-1000.*ones(md.mesh.numberofvertices,1);
    9 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     8md.geometry.base=-1000.*ones(md.mesh.numberofvertices,1);
     9md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1010
    1111disp('      creating velocities');

  • issm/trunk-jpl/test/Par/SquareThermal.py

    r16404 r17590  
    1010h=1000.
    1111md.geometry.thickness=h*numpy.ones((md.mesh.numberofvertices,1))
    12 md.geometry.bed=-1000.*numpy.ones((md.mesh.numberofvertices,1))
    13 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
     12md.geometry.base=-1000.*numpy.ones((md.mesh.numberofvertices,1))
     13md.geometry.surface=md.geometry.base+md.geometry.thickness;
    1414
    1515print "      creating velocities"

  • issm/trunk-jpl/test/Par/ValleyGlacierShelf.par

    r17470 r17590  
    2020slope = 0.9*(bmin-bmax)*(x-xmin)/(Lx*alpha) + 0.1*(bmin-bmax)*(y-ymin)/(Ly) + bmax;
    2121md.geometry.surface = (thk_center+bmax) + slope ;
    22 md.geometry.bed = bmax + slope + 4./Ly^2*(thk_center-thk_margin)*(y-ym).^2;
    23 md.geometry.thickness = md.geometry.surface - md.geometry.bed;
    24 md.geometry.bathymetry = md.geometry.bed;
     22md.geometry.base = bmax + slope + 4./Ly^2*(thk_center-thk_margin)*(y-ym).^2;
     23md.geometry.thickness = md.geometry.surface - md.geometry.base;
     24md.geometry.bed = md.geometry.base;
    2525
    2626%Mask

  • issm/trunk-jpl/test/Par/ValleyGlacierShelf.py

    r17462 r17590  
    2727slope = 0.9*(bmin-bmax)*(x-xmin)/(Lx*alpha) + 0.1*(bmin-bmax)*(y-ymin)/(Ly) + bmax
    2828md.geometry.surface= (thk_center+bmax) + slope
    29 md.geometry.bed=bmax + slope + 4./Ly**2*(thk_center-thk_margin)*(numpy.power(y-ym,2))
    30 md.geometry.thickness=md.geometry.surface - md.geometry.bed
    31 md.geometry.bathymetry = md.geometry.bed
     29md.geometry.base=bmax + slope + 4./Ly**2*(thk_center-thk_margin)*(numpy.power(y-ym,2))
     30md.geometry.thickness=md.geometry.surface - md.geometry.base
     31md.geometry.base = md.geometry.base
    3232
    3333#Mask
Note: See TracChangeset for help on using the changeset viewer.