Index: /issm/trunk-jpl/test/NightlyRun/test2001.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2001.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2001.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=1; % for square-edged x-section Index: /issm/trunk-jpl/test/NightlyRun/test2001.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2001.py (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2001.py (revision 15154) @@ -17,5 +17,4 @@ #Indicate what you want to compute -md.gia.output_rates=1 # just want "w" solution md.gia.cross_section_shape=1 # for square-edged x-section Index: /issm/trunk-jpl/test/NightlyRun/test2051.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2051.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2051.m (revision 15154) @@ -1,9 +1,8 @@ % Benchmark experiments (Figure A2a Ivins and James, 1999, Geophys. J. Int.) -md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',100000.); +md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.); md=setmask(md,'',''); md=parameterize(md,'../Par/GiaBenchmarksAB.par'); %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=1; % for square-edged x-section @@ -20,5 +19,5 @@ %% solve for GIA deflection -md.cluster=generic('name',oshostname(),'np',8); +md.cluster=generic('name',oshostname(),'np',3); md.verbose=verbose('1111111'); md=solve(md,GiaSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test2052.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2052.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2052.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=1; % for square-edged x-section Index: /issm/trunk-jpl/test/NightlyRun/test2053.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2053.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2053.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=1; % for square-edged x-section Index: sm/trunk-jpl/test/NightlyRun/test2061.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2061.m (revision 15153) +++ (revision ) @@ -1,32 +1,0 @@ -% Benchmark experiments (Figure A2b Ivins and James, 1999, Geophys. J. Int.) -md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.); -md=setmask(md,'',''); -md=parameterize(md,'../Par/GiaBenchmarksAB.par'); - -%% indicate what you want to compute -md.gia.output_rates=2; % just want "w" solution -md.gia.cross_section_shape=1; % for square-edged x-section - -%% define loading history -md.timestepping.start_time=2002100; % after 2 kr of deglaciation -md.timestepping.final_time=2500000; %2,500 kyr -md.geometry.thickness=[... - [md.geometry.thickness*0.0; 0.0],... - [md.geometry.thickness; 1000],... - [md.geometry.thickness; 2000000],... - [md.geometry.thickness*0.0; 2000100],... - [md.geometry.thickness*0.0; md.timestepping.start_time],... - ]; - -%% solve for GIA deflection -md.cluster=generic('name',oshostname(),'np',3); -md.verbose=verbose('1111111'); -md=solve(md,GiaSolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'GiaW','GiadWdt'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... - }; Index: sm/trunk-jpl/test/NightlyRun/test2062.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2062.m (revision 15153) +++ (revision ) @@ -1,32 +1,0 @@ -% Benchmark experiments (Figure A2b Ivins and James, 1999, Geophys. J. Int.) -md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.); -md=setmask(md,'',''); -md=parameterize(md,'../Par/GiaBenchmarksAB.par'); - -%% indicate what you want to compute -md.gia.output_rates=2; % just want "w" solution -md.gia.cross_section_shape=1; % for square-edged x-section - -%% define loading history -md.timestepping.start_time=2005100; % after 5 kr of deglaciation -md.timestepping.final_time=2500000; %2,500 kyr -md.geometry.thickness=[... - [md.geometry.thickness*0.0; 0.0],... - [md.geometry.thickness; 1000],... - [md.geometry.thickness; 2000000],... - [md.geometry.thickness*0.0; 2000100],... - [md.geometry.thickness*0.0; md.timestepping.start_time],... - ]; - -%% solve for GIA deflection -md.cluster=generic('name',oshostname(),'np',3); -md.verbose=verbose('1111111'); -md=solve(md,GiaSolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'GiaW','GiadWdt'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... - }; Index: sm/trunk-jpl/test/NightlyRun/test2063.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2063.m (revision 15153) +++ (revision ) @@ -1,32 +1,0 @@ -% Benchmark experiments (Figure A2b Ivins and James, 1999, Geophys. J. Int.) -md=triangle(model(),'../Exp/RoundFrontEISMINT.exp',200000.); -md=setmask(md,'',''); -md=parameterize(md,'../Par/GiaBenchmarksAB.par'); - -%% indicate what you want to compute -md.gia.output_rates=2; % just want "w" solution -md.gia.cross_section_shape=1; % for square-edged x-section - -%% define loading history -md.timestepping.start_time=2010100; % after 10 kyr of deglaciation -md.timestepping.final_time=2500000; %2,500 kyr -md.geometry.thickness=[... - [md.geometry.thickness*0.0; 0.0],... - [md.geometry.thickness; 1000],... - [md.geometry.thickness; 2000000],... - [md.geometry.thickness*0.0; 2000100],... - [md.geometry.thickness*0.0; md.timestepping.start_time],... - ]; - -%% solve for GIA deflection -md.cluster=generic('name',oshostname(),'np',3); -md.verbose=verbose('1111111'); -md=solve(md,GiaSolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'GiaW','GiadWdt'}; -field_tolerances={1e-13,1e-13}; -field_values={... - (md.results.GiaSolution.GiaW),... - (md.results.GiaSolution.GiadWdt),... - }; Index: /issm/trunk-jpl/test/NightlyRun/test2071.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2071.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2071.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=1; % for square-edged x-section Index: /issm/trunk-jpl/test/NightlyRun/test2072.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2072.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2072.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=1; % for square-edged x-section Index: /issm/trunk-jpl/test/NightlyRun/test2073.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2073.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2073.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=1; % for square-edged x-section Index: /issm/trunk-jpl/test/NightlyRun/test2081.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2081.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2081.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=2; % for elliptical edge Index: /issm/trunk-jpl/test/NightlyRun/test2082.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2082.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2082.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=2; % for elliptical edge Index: /issm/trunk-jpl/test/NightlyRun/test2083.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2083.m (revision 15153) +++ /issm/trunk-jpl/test/NightlyRun/test2083.m (revision 15154) @@ -5,5 +5,4 @@ %% indicate what you want to compute -md.gia.output_rates=1; % just want "w" solution md.gia.cross_section_shape=2; % for elliptical edge