Changeset 21533


Ignore:
Timestamp:
02/08/17 20:26:46 (8 years ago)
Author:
adhikari
Message:

CHG: Nightly updated for GiaIvins model

Location:
issm/trunk-jpl/test
Files:
2 added
2 deleted
13 edited

Legend:

Unmodified
Added
Removed

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

    r21056 r21533  
    1 %Test Name: SquareSheetConstrainedGia2d
     1%Test Name: SquareSheetConstrainedGiaIvins2d
    22%GIA test, inspired on test101
    33md=triangle(model(),'../Exp/Square.exp',100000.);
    … …  
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=1;    % for square-edged x-section
     8md.giaivins.cross_section_shape=1;    % for square-edged x-section
    99
    1010%% define loading history
    … …  
    2020md.cluster=generic('name',oshostname(),'np',3);
    2121md.verbose=verbose('1111111');
    22 md=solve(md,'Gia');
     22md=solve(md,'GiaIvins');
    2323
    2424%Fields and tolerances to track changes
    25 field_names     ={'GiaW','GiadWdt'};
     25field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2626field_tolerances={1e-13,1e-13};
    2727field_values={...
    28         (md.results.GiaSolution.GiaW),...
    29         (md.results.GiaSolution.GiadWdt),...
     28        (md.results.GiaIvinsSolution.GiaIvinsW),...
     29        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3030        };

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

    r21408 r21533  
    1 #Test Name: SquareSheetConstrainedGia2d
     1#Test Name: SquareSheetConstrainedGiaIvins2d
    22import numpy as np
    33import copy
    … …  
    1818
    1919#Indicate what you want to compute
    20 md.gia.cross_section_shape=1    # for square-edged x-section
     20md.giaivins.cross_section_shape=1    # for square-edged x-section
    2121
    2222#Define loading history (see test2001.m for the description)
    … …  
    3131#Solve for GIA deflection
    3232md.cluster=generic('name',gethostname(),'np',3)
    33 md=solve(md,'Gia')
     33md=solve(md,'GiaIvins')
    3434
    3535#Fields and tolerances to track changes
    36 field_names     =['GiaW','GiadWdt']
     36field_names     =['GiaIvinsW','GiaIvinsdWdt']
    3737field_tolerances=[1e-13,1e-13]
    38 field_values    =[md.results.GiaSolution.GiaW,
    39                                                                         md.results.GiaSolution.GiadWdt]
     38field_values    =[md.results.GiaIvinsSolution.GiaIvinsW,
     39                                                                        md.results.GiaIvinsSolution.GiaIvinsdWdt]
    4040

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dA1
     1%Test Name: GiaIvinsBenchmarksAB2dA1
    22% Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksAB.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksAB.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=1;    % for square-edged x-section
     8md.giaivins.cross_section_shape=1;    % for square-edged x-section
    99
    1010%% define loading history
    … …  
    2222md.cluster=generic('name',oshostname(),'np',3);
    2323md.verbose=verbose('1111111');
    24 md=solve(md,'Gia');
     24md=solve(md,'GiaIvins');
    2525
    2626%Fields and tolerances to track changes
    27 field_names     ={'GiaW','GiadWdt'};
     27field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2828field_tolerances={1e-13,1e-13};
    2929field_values={...
    30         (md.results.GiaSolution.GiaW),...
    31         (md.results.GiaSolution.GiadWdt),...
     30        (md.results.GiaIvinsSolution.GiaIvinsW),...
     31        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3232        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dA2
     1%Test Name: GiaIvinsBenchmarksAB2dA2
    22% Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksAB.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksAB.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=1;    % for square-edged x-section
     8md.giaivins.cross_section_shape=1;    % for square-edged x-section
    99
    1010%% define loading history
    … …  
    2222md.cluster=generic('name',oshostname(),'np',3);
    2323md.verbose=verbose('1111111');
    24 md=solve(md,'Gia');
     24md=solve(md,'GiaIvins');
    2525
    2626%Fields and tolerances to track changes
    27 field_names     ={'GiaW','GiadWdt'};
     27field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2828field_tolerances={1e-13,1e-13};
    2929field_values={...
    30         (md.results.GiaSolution.GiaW),...
    31         (md.results.GiaSolution.GiadWdt),...
     30        (md.results.GiaIvinsSolution.GiaIvinsW),...
     31        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3232        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dA3
     1%Test Name: GiaIvinsBenchmarksAB2dA3
    22% Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksAB.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksAB.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=1;    % for square-edged x-section
     8md.giaivins.cross_section_shape=1;    % for square-edged x-section
    99
    1010%% define loading history
    … …  
    2222md.cluster=generic('name',oshostname(),'np',3);
    2323md.verbose=verbose('1111111');
    24 md=solve(md,'Gia');
     24md=solve(md,'GiaIvins');
    2525
    2626%Fields and tolerances to track changes
    27 field_names     ={'GiaW','GiadWdt'};
     27field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2828field_tolerances={1e-13,1e-13};
    2929field_values={...
    30         (md.results.GiaSolution.GiaW),...
    31         (md.results.GiaSolution.GiadWdt),...
     30        (md.results.GiaIvinsSolution.GiaIvinsW),...
     31        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3232        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dC1
     1%Test Name: GiaIvinsBenchmarksAB2dC1
    22% Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksCD.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksCD.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=1;    % for square-edged x-section
     8md.giaivins.cross_section_shape=1;    % for square-edged x-section
    99
    1010%% define loading history
    … …  
    2121md.cluster=generic('name',oshostname(),'np',3);
    2222md.verbose=verbose('1111111');
    23 md=solve(md,'Gia');
     23md=solve(md,'GiaIvins');
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'GiaW','GiadWdt'};
     26field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaIvinsSolution.GiaIvinsW),...
     30        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3131        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dC2
     1%Test Name: GiaIvinsBenchmarksAB2dC2
    22% Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksCD.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksCD.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=1;    % for square-edged x-section
     8md.giaivins.cross_section_shape=1;    % for square-edged x-section
    99
    1010%% define loading history
    … …  
    2121md.cluster=generic('name',oshostname(),'np',3);
    2222md.verbose=verbose('1111111');
    23 md=solve(md,'Gia');
     23md=solve(md,'GiaIvins');
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'GiaW','GiadWdt'};
     26field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaIvinsSolution.GiaIvinsW),...
     30        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3131        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dC3
     1%Test Name: GiaIvinsBenchmarksAB2dC3
    22% Benchmark experiments (Figure A2c Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksCD.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksCD.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=1;    % for square-edged x-section
     8md.giaivins.cross_section_shape=1;    % for square-edged x-section
    99
    1010%% define loading history
    … …  
    2121md.cluster=generic('name',oshostname(),'np',3);
    2222md.verbose=verbose('1111111');
    23 md=solve(md,'Gia');
     23md=solve(md,'GiaIvins');
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'GiaW','GiadWdt'};
     26field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaIvinsSolution.GiaIvinsW),...
     30        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3131        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dD1
     1%Test Name: GiaIvinsBenchmarksAB2dD1
    22% Benchmark experiments (Figure A2d Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksCD.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksCD.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=2;    % for elliptical edge 
     8md.giaivins.cross_section_shape=2;    % for elliptical edge 
    99
    1010%% define loading history
    … …  
    2121md.cluster=generic('name',oshostname(),'np',3);
    2222md.verbose=verbose('1111111');
    23 md=solve(md,'Gia');
     23md=solve(md,'GiaIvins');
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'GiaW','GiadWdt'};
     26field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaIvinsSolution.GiaIvinsW),...
     30        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3131        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dD2
     1%Test Name: GiaIvinsBenchmarksAB2dD2
    22% Benchmark experiments (Figure A2d Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksCD.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksCD.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=2;    % for elliptical edge
     8md.giaivins.cross_section_shape=2;    % for elliptical edge
    99
    1010%% define loading history
    … …  
    2121md.cluster=generic('name',oshostname(),'np',3);
    2222md.verbose=verbose('1111111');
    23 md=solve(md,'Gia');
     23md=solve(md,'GiaIvins');
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'GiaW','GiadWdt'};
     26field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaIvinsSolution.GiaIvinsW),...
     30        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3131        };

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

    r21056 r21533  
    1 %Test Name: GiaBenchmarksAB2dD3
     1%Test Name: GiaIvinsBenchmarksAB2dD3
    22% Benchmark experiments (Figure A2d Ivins and James, 1999, Geophys. J. Int.)
    33md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.);
    44md=setmask(md,'','');
    5 md=parameterize(md,'../Par/GiaBenchmarksCD.par');
     5md=parameterize(md,'../Par/GiaIvinsBenchmarksCD.par');
    66
    77%% indicate what you want to compute
    8 md.gia.cross_section_shape=2;    % for elliptical edge
     8md.giaivins.cross_section_shape=2;    % for elliptical edge
    99
    1010%% define loading history
    … …  
    2121md.cluster=generic('name',oshostname(),'np',3);
    2222md.verbose=verbose('1111111');
    23 md=solve(md,'Gia');
     23md=solve(md,'GiaIvins');
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'GiaW','GiadWdt'};
     26field_names     ={'GiaIvinsW','GiaIvinsdWdt'};
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaIvinsSolution.GiaIvinsW),...
     30        (md.results.GiaIvinsSolution.GiaIvinsdWdt),...
    3131        };

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

    r21169 r21533  
    6060
    6161%GIA:
    62 md.gia.lithosphere_thickness=100.*ones(md.mesh.numberofvertices,1); % in km
    63 md.gia.mantle_viscosity=1.0*10^21*ones(md.mesh.numberofvertices,1); % in Pa.s
     62md.giaivins.lithosphere_thickness=100.*ones(md.mesh.numberofvertices,1); % in km
     63md.giaivins.mantle_viscosity=1.0*10^21*ones(md.mesh.numberofvertices,1); % in Pa.s
    6464md.materials.lithosphere_shear_modulus=6.7*10^10;                   % in Pa
    6565md.materials.lithosphere_density=3.32;                              % in g/cm^-3

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

    r21409 r21533  
    6262
    6363#GIA:
    64 md.gia.lithosphere_thickness=100.*numpy.ones((md.mesh.numberofvertices)); # in km
    65 md.gia.mantle_viscosity=1.*10**21*numpy.ones((md.mesh.numberofvertices)); # in Pa.s
     64md.giaivins.lithosphere_thickness=100.*numpy.ones((md.mesh.numberofvertices)); # in km
     65md.giaivins.mantle_viscosity=1.*10**21*numpy.ones((md.mesh.numberofvertices)); # in Pa.s
    6666md.materials.lithosphere_shear_modulus=6.7*10**10;                          # in Pa
    6767md.materials.lithosphere_density=3.32;                                      # in g/cm^-3
Note: See TracChangeset for help on using the changeset viewer.