Index: /issm/trunk-jpl/test/NightlyRun/test2001.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2001.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2001.m (revision 25070) @@ -4,4 +4,13 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); + +%GIA: +md.gia=giaivins(); +md.gia.lithosphere_thickness=100.*ones(md.mesh.numberofvertices,1); % in km +md.gia.mantle_viscosity=1.0*10^21*ones(md.mesh.numberofvertices,1); % in Pa.s +md.materials.lithosphere_shear_modulus=6.7*10^10; % in Pa +md.materials.lithosphere_density=3.32; % in g/cm^-3 +md.materials.mantle_shear_modulus=1.45*10^11; % in Pa +md.materials.mantle_density=3.34; % in g/cm^-3 %% indicate what you want to compute @@ -26,5 +35,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2002.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2002.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2002.m (revision 25070) @@ -55,6 +55,4 @@ %New stuff md.slr.spcthickness = NaN(md.mesh.numberofvertices,1); -md.slr.Ngia = zeros(md.mesh.numberofvertices,1); -md.slr.Ugia = zeros(md.mesh.numberofvertices,1); md.slr.hydro_rate = zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test2051.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2051.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2051.m (revision 25070) @@ -28,5 +28,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2052.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2052.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2052.m (revision 25070) @@ -28,5 +28,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2053.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2053.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2053.m (revision 25070) @@ -28,5 +28,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2071.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2071.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2071.m (revision 25070) @@ -27,5 +27,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2072.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2072.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2072.m (revision 25070) @@ -27,5 +27,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2073.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2073.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2073.m (revision 25070) @@ -27,5 +27,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2081.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2081.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2081.m (revision 25070) @@ -27,5 +27,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2082.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2082.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2082.m (revision 25070) @@ -7,4 +7,5 @@ %% indicate what you want to compute md.gia.cross_section_shape=2; % for elliptical edge + %% define loading history @@ -27,5 +28,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/NightlyRun/test2083.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2083.m (revision 25069) +++ /issm/trunk-jpl/test/NightlyRun/test2083.m (revision 25070) @@ -27,5 +27,5 @@ field_tolerances={1e-13,1e-13}; field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... + (md.results.GiaSolution.UGia),... + (md.results.GiaSolution.UGiaRate),... }; Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.par =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.par (revision 25069) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.par (revision 25070) @@ -18,4 +18,5 @@ %GIA parameters specific to Experiments A and B +md.gia=giavins(); md.gia.mantle_viscosity=10^21*ones(md.mesh.numberofvertices,1); %in Pa.s md.gia.lithosphere_thickness=100*ones(md.mesh.numberofvertices,1); %in km Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.par =================================================================== --- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.par (revision 25069) +++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.par (revision 25070) @@ -18,4 +18,5 @@ %GIA parameters specific to Experiments A and B +md.gia=giaivins(); md.gia.mantle_viscosity=10^21*ones(md.mesh.numberofvertices,1); %in Pa.s md.gia.lithosphere_thickness=100*ones(md.mesh.numberofvertices,1); %in km Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrained.par (revision 25069) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.par (revision 25070) @@ -59,11 +59,4 @@ md.groundingline.migration='None'; -%GIA: -md.gia.lithosphere_thickness=100.*ones(md.mesh.numberofvertices,1); % in km -md.gia.mantle_viscosity=1.0*10^21*ones(md.mesh.numberofvertices,1); % in Pa.s -md.materials.lithosphere_shear_modulus=6.7*10^10; % in Pa -md.materials.lithosphere_density=3.32; % in g/cm^-3 -md.materials.mantle_shear_modulus=1.45*10^11; % in Pa -md.materials.mantle_density=3.34; % in g/cm^-3 %Boundary conditions: