Changeset 25070


Ignore:
Timestamp:
06/19/20 09:55:56 (5 years ago)
Author:
Eric.Larour
Message:

CHG: updates of the GIA enums, and giamme class.

Location:
issm/trunk-jpl/test
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r24749 r25070  
    44md=setmask(md,'','');
    55md=parameterize(md,'../Par/SquareSheetConstrained.par');
     6
     7%GIA:
     8md.gia=giaivins();
     9md.gia.lithosphere_thickness=100.*ones(md.mesh.numberofvertices,1); % in km
     10md.gia.mantle_viscosity=1.0*10^21*ones(md.mesh.numberofvertices,1); % in Pa.s
     11md.materials.lithosphere_shear_modulus=6.7*10^10;                   % in Pa
     12md.materials.lithosphere_density=3.32;                              % in g/cm^-3
     13md.materials.mantle_shear_modulus=1.45*10^11;                       % in Pa
     14md.materials.mantle_density=3.34;                                   % in g/cm^-3
    615
    716%% indicate what you want to compute
    … …  
    2635field_tolerances={1e-13,1e-13};
    2736field_values={...
    28         (md.results.GiaSolution.GiaW),...
    29         (md.results.GiaSolution.GiadWdt),...
     37        (md.results.GiaSolution.UGia),...
     38        (md.results.GiaSolution.UGiaRate),...
    3039        };

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

    r24889 r25070  
    5555%New stuff
    5656md.slr.spcthickness = NaN(md.mesh.numberofvertices,1);
    57 md.slr.Ngia = zeros(md.mesh.numberofvertices,1);
    58 md.slr.Ugia = zeros(md.mesh.numberofvertices,1);
    5957md.slr.hydro_rate = zeros(md.mesh.numberofvertices,1);
    6058

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

    r21580 r25070  
    2828field_tolerances={1e-13,1e-13};
    2929field_values={...
    30         (md.results.GiaSolution.GiaW),...
    31         (md.results.GiaSolution.GiadWdt),...
     30        (md.results.GiaSolution.UGia),...
     31        (md.results.GiaSolution.UGiaRate),...
    3232        };

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

    r21585 r25070  
    2828field_tolerances={1e-13,1e-13};
    2929field_values={...
    30         (md.results.GiaSolution.GiaW),...
    31         (md.results.GiaSolution.GiadWdt),...
     30        (md.results.GiaSolution.UGia),...
     31        (md.results.GiaSolution.UGiaRate),...
    3232        };

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

    r21585 r25070  
    2828field_tolerances={1e-13,1e-13};
    2929field_values={...
    30         (md.results.GiaSolution.GiaW),...
    31         (md.results.GiaSolution.GiadWdt),...
     30        (md.results.GiaSolution.UGia),...
     31        (md.results.GiaSolution.UGiaRate),...
    3232        };

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

    r21585 r25070  
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaSolution.UGia),...
     30        (md.results.GiaSolution.UGiaRate),...
    3131        };

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

    r21585 r25070  
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaSolution.UGia),...
     30        (md.results.GiaSolution.UGiaRate),...
    3131        };

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

    r21585 r25070  
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaSolution.UGia),...
     30        (md.results.GiaSolution.UGiaRate),...
    3131        };

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

    r21585 r25070  
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaSolution.UGia),...
     30        (md.results.GiaSolution.UGiaRate),...
    3131        };

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

    r21585 r25070  
    77%% indicate what you want to compute
    88md.gia.cross_section_shape=2;    % for elliptical edge
     9
    910
    1011%% define loading history
    … …  
    2728field_tolerances={1e-13,1e-13};
    2829field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     30        (md.results.GiaSolution.UGia),...
     31        (md.results.GiaSolution.UGiaRate),...
    3132        };

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

    r21585 r25070  
    2727field_tolerances={1e-13,1e-13};
    2828field_values={...
    29         (md.results.GiaSolution.GiaW),...
    30         (md.results.GiaSolution.GiadWdt),...
     29        (md.results.GiaSolution.UGia),...
     30        (md.results.GiaSolution.UGiaRate),...
    3131        };

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

    r24863 r25070  
    1818
    1919%GIA parameters specific to Experiments A  and B
     20md.gia=giavins();
    2021md.gia.mantle_viscosity=10^21*ones(md.mesh.numberofvertices,1);    %in Pa.s
    2122md.gia.lithosphere_thickness=100*ones(md.mesh.numberofvertices,1); %in km

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

    r24863 r25070  
    1818
    1919%GIA parameters specific to Experiments A  and B
     20md.gia=giaivins();
    2021md.gia.mantle_viscosity=10^21*ones(md.mesh.numberofvertices,1);    %in Pa.s
    2122md.gia.lithosphere_thickness=100*ones(md.mesh.numberofvertices,1); %in km

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

    r24863 r25070  
    5959md.groundingline.migration='None';
    6060
    61 %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
    64 md.materials.lithosphere_shear_modulus=6.7*10^10;                   % in Pa
    65 md.materials.lithosphere_density=3.32;                              % in g/cm^-3
    66 md.materials.mantle_shear_modulus=1.45*10^11;                       % in Pa
    67 md.materials.mantle_density=3.34;                                   % in g/cm^-3
    6861
    6962%Boundary conditions:
Note: See TracChangeset for help on using the changeset viewer.