Changeset 15566


Ignore:
Timestamp:
07/23/13 14:26:18 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: MacAyeal -> SSA

Location:
issm/trunk-jpl/test/NightlyRun
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/test/NightlyRun/test1202.m

    r15565 r15566  
    77md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');
    9 md=setflowequation(md,'SSA','all'); %MacAyeal's model and 2d
     9md=setflowequation(md,'SSA','all'); %SSA's model and 2d
    1010
    11 %Compute solution for MacAyeal's model
     11%Compute solution for SSA's model
    1212md.cluster=generic('name',oshostname(),'np',8);
    1313md=solve(md,DiagnosticSolutionEnum());
  • issm/trunk-jpl/test/NightlyRun/test1202.py

    r15565 r15566  
    2020md=setmask(md,'all','')
    2121md=parameterize(md,'../Par/SquareEISMINT.py')
    22 md=setflowequation(md,'SSA','all')    #MacAyeal's model and 2d
     22md=setflowequation(md,'SSA','all')    #SSA's model and 2d
    2323
    24 #Compute solution for MacAyeal's model
     24#Compute solution for SSA's model
    2525md.cluster=generic('name',oshostname(),'np',8)
    2626md=solve(md,DiagnosticSolutionEnum())
  • issm/trunk-jpl/test/NightlyRun/test1203.m

    r15565 r15566  
    77md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');
    9 md=setflowequation(md,'SSA','all'); %MacAyeal's model and 2d
     9md=setflowequation(md,'SSA','all'); %SSA's model and 2d
    1010
    1111%Impose a non zero velocity on the upper boundary condition (y=max(y))
     
    1313md.diagnostic.spcvy(pos)=400.*(((md.mesh.x(pos)-100000.)/25000.).^2-ones(size(pos,1),1)).*heaviside((1.+eps)*ones(size(pos,1),1)-((md.mesh.x(pos)-100000.)/25000.).^2);
    1414
    15 %Compute solution for MacAyeal's model
     15%Compute solution for SSA's model
    1616md.cluster=generic('name',oshostname(),'np',8);
    1717md=solve(md,DiagnosticSolutionEnum());
  • issm/trunk-jpl/test/NightlyRun/test1203.py

    r15565 r15566  
    2121md=setmask(md,'all','')
    2222md=parameterize(md,'../Par/SquareEISMINT.py')
    23 md=setflowequation(md,'SSA','all')    #MacAyeal's model and 2d
     23md=setflowequation(md,'SSA','all')    #SSA's model and 2d
    2424
    2525#Impose a non zero velocity on the upper boundary condition (y=max(y))
     
    2727md.diagnostic.spcvy[pos]=400.*(((md.mesh.x[pos].reshape(-1,1)-100000.)/25000.)**2-numpy.ones((numpy.size(pos),1)))*heaviside((1.+sys.float_info.epsilon)*numpy.ones((numpy.size(pos),1))-((md.mesh.x[pos].reshape(-1,1)-100000.)/25000.)**2)
    2828
    29 #Compute solution for MacAyeal's model
     29#Compute solution for SSA's model
    3030md.cluster=generic('name',oshostname(),'np',8)
    3131md=solve(md,DiagnosticSolutionEnum())
  • issm/trunk-jpl/test/NightlyRun/test1204.m

    r15565 r15566  
    77md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');
    9 md=setflowequation(md,'SSA','all'); %MacAyeal's model and 2d
     9md=setflowequation(md,'SSA','all'); %SSA's model and 2d
    1010
    1111%Impose a non zero velocity on the upper boundary condition (y=max(y))
     
    1313md.diagnostic.spcvy(pos)=400.*(((md.mesh.x(pos)-100000.)/25000.).^2-ones(size(pos,1),1)).*heaviside((1.+eps)*ones(size(pos,1),1)-((md.mesh.x(pos)-100000.)/25000.).^2);
    1414
    15 %Compute solution for MacAyeal's model
     15%Compute solution for SSA's model
    1616md.cluster=generic('name',oshostname(),'np',8);
    1717md=solve(md,DiagnosticSolutionEnum());
  • issm/trunk-jpl/test/NightlyRun/test1204.py

    r15565 r15566  
    2121md=setmask(md,'all','')
    2222md=parameterize(md,'../Par/SquareEISMINT.py')
    23 md=setflowequation(md,'SSA','all')    #MacAyeal's model and 2d
     23md=setflowequation(md,'SSA','all')    #SSA's model and 2d
    2424
    2525#Impose a non zero velocity on the upper boundary condition (y=max(y))
     
    2727md.diagnostic.spcvy[pos]=400.*(((md.mesh.x[pos].reshape(-1,1)-100000.)/25000.)**2-numpy.ones((numpy.size(pos),1)))*heaviside((1.+sys.float_info.epsilon)*numpy.ones((numpy.size(pos),1))-((md.mesh.x[pos].reshape(-1,1)-100000.)/25000.)**2)
    2828
    29 #Compute solution for MacAyeal's model
     29#Compute solution for SSA's model
    3030md.cluster=generic('name',oshostname(),'np',8)
    3131md=solve(md,DiagnosticSolutionEnum())
  • issm/trunk-jpl/test/NightlyRun/test1205.m

    r15565 r15566  
    1 %The aim of this program is to compare a model with an analytical solution given in MacAyeal EISMINT : Lessons in Ice-Sheet Modeling.
     1%The aim of this program is to compare a model with an analytical solution given in SSA EISMINT : Lessons in Ice-Sheet Modeling.
    22printingflag=false;
    33
  • issm/trunk-jpl/test/NightlyRun/test1205.py

    r15565 r15566  
    1010
    1111"""
    12 The aim of this program is to compare a model with an analytical solution given in MacAyeal EISMINT : Lessons in Ice-Sheet Modeling.
     12The aim of this program is to compare a model with an analytical solution given in SSA EISMINT : Lessons in Ice-Sheet Modeling.
    1313"""
    1414
  • issm/trunk-jpl/test/NightlyRun/test1206.m

    r15565 r15566  
    1 %The aim of this program is to compare a model with an analytical solution given in MacAyeal EISMINT : Lessons in Ice-Sheet Modeling.
     1%The aim of this program is to compare a model with an analytical solution given in SSA EISMINT : Lessons in Ice-Sheet Modeling.
    22printingflag=false;
    33
  • issm/trunk-jpl/test/NightlyRun/test1206.py

    r15565 r15566  
    1010
    1111"""
    12 The aim of this program is to compare a model with an analytical solution given in MacAyeal EISMINT : Lessons in Ice-Sheet Modeling.
     12The aim of this program is to compare a model with an analytical solution given in SSA EISMINT : Lessons in Ice-Sheet Modeling.
    1313"""
    1414
  • issm/trunk-jpl/test/NightlyRun/test1207.m

    r15565 r15566  
    1 %The aim of this program is to compare a model with an analytical solution given in MacAyeal EISMINT : Lessons in Ice-Sheet Modeling.
     1%The aim of this program is to compare a model with an analytical solution given in SSA EISMINT : Lessons in Ice-Sheet Modeling.
    22printingflag=false;
    33
  • issm/trunk-jpl/test/NightlyRun/test1207.py

    r15565 r15566  
    1010
    1111"""
    12 The aim of this program is to compare a model with an analytical solution given in MacAyeal EISMINT : Lessons in Ice-Sheet Modeling.
     12The aim of this program is to compare a model with an analytical solution given in SSA EISMINT : Lessons in Ice-Sheet Modeling.
    1313"""
    1414
Note: See TracChangeset for help on using the changeset viewer.