Index: sm/trunk-jpl/test/NightlyRun/test3115.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3115.m (revision 16201) +++ (revision ) @@ -1,78 +1,0 @@ -%This test runs test3005 with autodiff on, and checks that -%the value of the scalar forward difference match a step-wise differential - -%First configure -md=triangle(model(),'../Exp/Square.exp',50000.); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.masstransport.requested_outputs=IceVolumeEnum(); -md.verbose=verbose('autodiff',true); -md.toolkits.DefaultAnalysis=issmmumpssolver(); - -%setup autodiff parameters -index=1; %this is the scalar component we are checking against -md.autodiff.independents={... - independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',index) - }; - -md.autodiff.dependents={... - dependent('name','IceVolume','type','scalar')... - }; -md.autodiff.driver='fos_forward'; - -%parameters for the step-wise derivative -delta=0.001; -h1=md.geometry.thickness(index); -h0=h1*(1.-delta); -h2=h1*(1.+delta); -deltaH=(h2-h0); - -%save model: -md2=md; - -%evaluate derivative by forward and backward stepping -%forward -md=md2; -md.autodiff.isautodiff=false; -md.geometry.thickness(index)=h0; -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=SetIceShelfBC(md); - -md=solve(md,MasstransportSolutionEnum()); -V0=md.results.MasstransportSolution.IceVolume; - -%backward -md=md2; -md.autodiff.isautodiff=false; -md.geometry.thickness(index)=h2; -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=SetIceShelfBC(md); - -md=solve(md,MasstransportSolutionEnum()); -V2=md.results.MasstransportSolution.IceVolume; - -%compute resulting derivative -dVdh_an=(V2-V0)/deltaH; - -%evaluate derivative using ADOLC -md=md2; -md.autodiff.isautodiff=true; -md.geometry.thickness(index)=h1; -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=SetIceShelfBC(md); - -md=solve(md,MasstransportSolutionEnum()); -%retrieve directly -dVdh_ad=md.results.MasstransportSolution.AutodiffJacobian; - -disp(sprintf('dV/dh: analytical: %16.16g\n using adolc: %16.16g\n',dVdh_an,dVdh_ad)); - -%Fields and tolerances to track changes -field_names ={'dV/dh-dV/dh0'}; -field_tolerances={1e-13}; -field_values={dVdh_ad-dVdh_an}; Index: sm/trunk-jpl/test/NightlyRun/test3115.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3115.py (revision 16201) +++ (revision ) @@ -1,92 +1,0 @@ -import numpy -import copy -from model import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from independent import * -from dependent import * -from SetIceShelfBC import * -from EnumDefinitions import * -from solve import * -from MatlabFuncs import * - -#This test runs test3005 with autodiff on, and checks that -#the value of the scalar forward difference match a step-wise differential - -#First configure -md=triangle(model(),'../Exp/Square.exp',50000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',oshostname(),'np',3) -md.masstransport.requested_outputs=IceVolumeEnum() -md.verbose=verbose('autodiff',True) -md.toolkits.DefaultAnalysis=issmmumpssolver() - -#setup autodiff parameters -index=1 #this is the scalar component we are checking against -md.autodiff.independents=[\ - independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',index) - ] - -md.autodiff.dependents=[\ - dependent('name','IceVolume','type','scalar')\ - ] -md.autodiff.driver='fos_forward' - -#parameters for the step-wise derivative -delta=0.001 -h1=md.geometry.thickness[index] -h0=h1*(1.-delta) -h2=h1*(1.+delta) -deltaH=(h2-h0) - -#save model -md2=copy.deepcopy(md) - -#evaluate derivative by forward and backward stepping -#forward -md=copy.deepcopy(md2) -md.autodiff.isautodiff=False -md.geometry.thickness[index]=h0 -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness -md.geometry.surface=md.geometry.bed+md.geometry.thickness -md=SetIceShelfBC(md) - -md=solve(md,MasstransportSolutionEnum()) -V0=md.results.MasstransportSolution.IceVolume - -#backward -md=copy.deepcopy(md2) -md.autodiff.isautodiff=False -md.geometry.thickness[index]=h2 -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness -md.geometry.surface=md.geometry.bed+md.geometry.thickness -md=SetIceShelfBC(md) - -md=solve(md,MasstransportSolutionEnum()) -V2=md.results.MasstransportSolution.IceVolume - -#compute resulting derivative -dVdh_an=(V2-V0)/deltaH - -#evaluate derivative using ADOLC -md=md2 -md.autodiff.isautodiff=True -md.geometry.thickness[index]=h1 -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness -md.geometry.surface=md.geometry.bed+md.geometry.thickness -md=SetIceShelfBC(md) - -md=solve(md,MasstransportSolutionEnum()) -#retrieve directly -dVdh_ad=md.results.MasstransportSolution.AutodiffJacobian - -print "dV/dh: analytical: #16.16g\n using adolc: #16.16g\n" % (dVdh_an,dVdh_ad) - -#Fields and tolerances to track changes -field_names =['dV/dh-dV/dh0'] -field_tolerances=[1e-13] -field_values=[dVdh_ad-dVdh_an] Index: /issm/trunk-jpl/test/NightlyRun/test3119.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3119.m (revision 16201) +++ /issm/trunk-jpl/test/NightlyRun/test3119.m (revision 16202) @@ -1,3 +1,3 @@ -%test reverse scalar vs forward vectorial drivers in ADOLC, using the test3009 setup, equivalent to test109 setup. +%test reverse scalar driver in ADOLC, using the test3009 setup, equivalent to test109 setup. md=triangle(model(),'../Exp/Square.exp',100000.); md=setmask(md,'all',''); @@ -20,16 +20,6 @@ jac_reverse=md.results.TransientSolution(1).AutodiffJacobian; -%now run vectorial forward mode -md.autodiff.independents={independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fov_forward_indices',(1:md.mesh.numberofvertices)')}; -md.autodiff.dependents={dependent('name','MaxVel','type','scalar')}; -md.autodiff.driver='fov_forward'; - -md=solve(md,TransientSolutionEnum()); - -%recover jacobian: -jac_forward=md.results.TransientSolution(1).AutodiffJacobian; - %Fields and tolerances to track changes -field_names ={'Jac Forward','Jac Reverse','Jac Forward - Reverse'}; -field_tolerances={1e-8,1e-8,1e-6}; -field_values={jac_forward,jac_reverse,jac_forward-jac_reverse}; +field_names ={'Jac Reverse'}; +field_tolerances={1e-8}; +field_values={jac_reverse,}; Index: /issm/trunk-jpl/test/NightlyRun/test3119.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3119.py (revision 16201) +++ /issm/trunk-jpl/test/NightlyRun/test3119.py (revision 16202) @@ -32,16 +32,6 @@ jac_reverse=md.results.TransientSolution[0].AutodiffJacobian -#now run vectorial forward mode -md.autodiff.independents=[independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fov_forward_indices',numpy.arange(0,md.mesh.numberofvertices))] -md.autodiff.dependents=[dependent('name','MaxVel','type','scalar')] -md.autodiff.driver='fov_forward' - -md=solve(md,TransientSolutionEnum()) - -#recover jacobian: -jac_forward=md.results.TransientSolution[0].AutodiffJacobian - #Fields and tolerances to track changes -field_names =['Jac Forward','Jac Reverse','Jac Forward - Reverse'] -field_tolerances=[1e-13,1e-13,1e-13] -field_values=[jac_forward,jac_reverse,jac_forward-jac_reverse] +field_names =['Jac Reverse'] +field_tolerances=[1e-13] +field_values=[jac_reverse] Index: sm/trunk-jpl/test/NightlyRun/test3120.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3120.m (revision 16201) +++ (revision ) @@ -1,85 +1,0 @@ -%This test runs test3020 with autodiff on, and checks that -%the value of the scalar forward difference match a step-wise differential - -%First configure -md=triangle(model(),'../Exp/Square.exp',150000.); -md=setmask(md,'all',''); -md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',3); -md.transient.requested_outputs=[IceVolumeEnum();MaxVelEnum()]; -md.verbose=verbose('autodiff',true); -md.stressbalance.restol=1e-4; -md.toolkits.DefaultAnalysis=issmmumpssolver(); - -%setup autodiff parameters -index=1; %this is the scalar component we are checking against -md.autodiff.independents={... - independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',index) - }; - -md.autodiff.dependents={... - dependent('name','IceVolume','type','scalar'),... - dependent('name','MaxVel','type','scalar')... - }; -md.autodiff.driver='fos_forward'; - -%parameters for the step-wise derivative -delta=0.00001; -h1=md.geometry.thickness(index); -h0=h1*(1.-delta); -h2=h1*(1.+delta); -deltaH=(h2-h0); - -%save model: -md2=md; - -%evaluate derivative by forward and backward stepping -%forward -md=md2; -md.autodiff.isautodiff=false; -md.geometry.thickness(index)=h0; -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=SetIceShelfBC(md); - -md=solve(md,TransientSolutionEnum()); -V0=md.results.TransientSolution(end).IceVolume; -MaxV0=md.results.TransientSolution(end).MaxVel; - -%backward -md=md2; -md.autodiff.isautodiff=false; -md.geometry.thickness(index)=h2; -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=SetIceShelfBC(md); - -md=solve(md,TransientSolutionEnum()); -V2=md.results.TransientSolution(end).IceVolume; -MaxV2=md.results.TransientSolution(end).MaxVel; - -%compute resulting derivative -dVdh_an=(V2-V0)/deltaH; -dMaxVdh_an=(MaxV2-MaxV0)/deltaH; - -%evaluate derivative using ADOLC -md=md2; -md.autodiff.isautodiff=true; -md.geometry.thickness(index)=h1; -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; -md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=SetIceShelfBC(md); - -md=solve(md,TransientSolutionEnum()); -%retrieve directly -dVdh_ad=md.results.TransientSolution(1).AutodiffJacobian(1); -dMaxVdh_ad=md.results.TransientSolution(1).AutodiffJacobian(2); - -disp(sprintf('dV/dh: analytical: %16.16g\n using adolc: %16.16g\n',dVdh_an,dVdh_ad)); -disp(sprintf('dMaxV/dh: analytical: %16.16g\n using adolc: %16.16g\n',dMaxVdh_an,dMaxVdh_ad)); - -%Fields and tolerances to track changes -field_names ={'dV/dh-dV/dh0','dMaxV/dh-dMaxV/dh0'}; -field_tolerances={1e-8,1e-7}; -field_values={dVdh_ad-dVdh_an,dMaxVdh_an-dMaxVdh_ad}; Index: sm/trunk-jpl/test/NightlyRun/test3120.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3120.py (revision 16201) +++ (revision ) @@ -1,99 +1,0 @@ -import numpy -import copy -from model import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from independent import * -from dependent import * -from SetIceShelfBC import * -from EnumDefinitions import * -from solve import * -from MatlabFuncs import * - -#This test runs test3020 with autodiff on, and checks that -#the value of the scalar forward difference match a step-wise differential - -#First configure -md=triangle(model(),'../Exp/Square.exp',150000.) -md=setmask(md,'all','') -md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',oshostname(),'np',3) -md.transient.requested_outputs=[IceVolumeEnum(),MaxVelEnum()] -md.verbose=verbose('autodiff',True) -md.stressbalance.restol=0.000001 -md.toolkits.DefaultAnalysis=issmmumpssolver() - -#setup autodiff parameters -index=1 #this is the scalar component we are checking against -md.autodiff.independents=[\ - independent('name','Thickness','type','vertex','nods',md.mesh.numberofvertices,'fos_forward_index',index) - ] - -md.autodiff.dependents=[\ - dependent('name','IceVolume','type','scalar'),\ - dependent('name','MaxVel','type','scalar')\ - ] -md.autodiff.driver='fos_forward' - -#parameters for the step-wise derivative -delta=0.00001 -h1=md.geometry.thickness[index] -h0=h1*(1.-delta) -h2=h1*(1.+delta) -deltaH=(h2-h0) - -#save model: -md2=copy.deepcopy(md) - -#evaluate derivative by forward and backward stepping -#forward -md=copy.deepcopy(md2) -md.autodiff.isautodiff=False -md.geometry.thickness[index]=h0 -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness -md.geometry.surface=md.geometry.bed+md.geometry.thickness -md=SetIceShelfBC(md) - -md=solve(md,TransientSolutionEnum()) -V0=md.results.TransientSolution[2].IceVolume -MaxV0=md.results.TransientSolution[2].MaxVel - -#backward -md=copy.deepcopy(md2) -md.autodiff.isautodiff=False -md.geometry.thickness[index]=h2 -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness -md.geometry.surface=md.geometry.bed+md.geometry.thickness -md=SetIceShelfBC(md) - -md=solve(md,TransientSolutionEnum()) -V2=md.results.TransientSolution[2].IceVolume -MaxV2=md.results.TransientSolution[2].MaxVel - -#compute resulting derivative -dVdh_an=(V2-V0)/deltaH -dMaxVdh_an=(MaxV2-MaxV0)/deltaH - -#evaluate derivative using ADOLC -md=copy.deepcopy(md2) -md.autodiff.isautodiff=True -md.geometry.thickness[index]=h1 -md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness -md.geometry.surface=md.geometry.bed+md.geometry.thickness -md=SetIceShelfBC(md) - -md=solve(md,TransientSolutionEnum()) -#retrieve directly -dVdh_ad=md.results.TransientSolution[0].AutodiffJacobian[0] -dMaxVdh_ad=md.results.TransientSolution[0].AutodiffJacobian[1] - -print "dV/dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dVdh_an,dVdh_ad) -print "dMaxV/dh: analytical: %16.16g\n using adolc: %16.16g\n" % (dMaxVdh_an,dMaxVdh_ad) - -#Fields and tolerances to track changes -field_names =['dV/dh-dV/dh0','dMaxV/dh-dMaxV/dh0'] -field_tolerances=[1e-13,1e-13] -field_values=[dVdh_ad-dVdh_an,dMaxVdh_an-dMaxVdh_ad]