Index: /issm/trunk/test/NightlyRun/test115.m =================================================================== --- /issm/trunk/test/NightlyRun/test115.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test115.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test116.m =================================================================== --- /issm/trunk/test/NightlyRun/test116.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test116.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test117.m =================================================================== --- /issm/trunk/test/NightlyRun/test117.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test117.m (revision 9611) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test118.m =================================================================== --- /issm/trunk/test/NightlyRun/test118.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test118.m (revision 9611) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk/test/NightlyRun/test1208.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test1208.m (revision 9611) @@ -29,5 +29,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-07}; field_values={... @@ -41,4 +41,4 @@ PatchToVec(md.results.TransientSolution(end).Surface),... PatchToVec(md.results.TransientSolution(end).Temperature),... - PatchToVec(md.results.TransientSolution(end).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(end).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test121.m =================================================================== --- /issm/trunk/test/NightlyRun/test121.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test121.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test122.m =================================================================== --- /issm/trunk/test/NightlyRun/test122.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test122.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 9611) @@ -22,5 +22,5 @@ %melting heat = geothermal flux %Mb*L*rho=G => Mb=G/L*rho -melting=md.geothermalflux/(md.rho_ice*md.latentheat)*md.constants.yts; +melting=md.basalforcings.geothermalflux/(md.rho_ice*md.latentheat)*md.constants.yts; %modeled results @@ -30,5 +30,5 @@ %plot results comp_melting=zeros(md.numberofnodes,1); -comp_melting(md.results.ThermalSolution.BasalMeltingRate.index)=md.results.ThermalSolution.BasalMeltingRate.value; +comp_melting(md.results.ThermalSolution.BasalforcingsMeltingRate.index)=md.results.ThermalSolution.BasalforcingsMeltingRate.value; relative=abs((comp_melting-melting)./melting)*100; relative(find(comp_melting==melting))=0; Index: /issm/trunk/test/NightlyRun/test1304.m =================================================================== --- /issm/trunk/test/NightlyRun/test1304.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test1304.m (revision 9611) @@ -14,5 +14,5 @@ pos2=find(md.elementonsurface); md.spctemperature(md.elements(pos2,4:6))=0; md.pressure=zeros(md.numberofnodes,1); -md.geothermalflux(:)=0.1; %100mW/m^2 +md.basalforcings.geothermalflux(:)=0.1; %100mW/m^2 %analytical results Index: /issm/trunk/test/NightlyRun/test1501.m =================================================================== --- /issm/trunk/test/NightlyRun/test1501.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test1501.m (revision 9611) @@ -15,5 +15,5 @@ smb= 2*ones(md.numberofnodes,1); md.surfaceforcings.mass_balance= smb; -md.basal_melting_rate= smb; +md.basalforcings.melting_rate= smb; md=solve(md,PrognosticSolutionEnum); Index: /issm/trunk/test/NightlyRun/test1502.m =================================================================== --- /issm/trunk/test/NightlyRun/test1502.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test1502.m (revision 9611) @@ -16,5 +16,5 @@ smb= 2*ones(md.numberofnodes,1); md.surfaceforcings.mass_balance= smb; -md.basal_melting_rate= smb; +md.basalforcings.melting_rate= smb; md=solve(md,PrognosticSolutionEnum); Index: /issm/trunk/test/NightlyRun/test211.m =================================================================== --- /issm/trunk/test/NightlyRun/test211.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test211.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test212.m =================================================================== --- /issm/trunk/test/NightlyRun/test212.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test212.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test213.m =================================================================== --- /issm/trunk/test/NightlyRun/test213.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test213.m (revision 9611) @@ -8,12 +8,12 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','MeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3'}; +field_names ={'Temperature1','MeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(3).Temperature),... - PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test214.m =================================================================== --- /issm/trunk/test/NightlyRun/test214.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test214.m (revision 9611) @@ -8,12 +8,12 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','BasalMeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3'}; +field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(3).Temperature),... - PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test217.m =================================================================== --- /issm/trunk/test/NightlyRun/test217.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test217.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test218.m =================================================================== --- /issm/trunk/test/NightlyRun/test218.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test218.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test219.m =================================================================== --- /issm/trunk/test/NightlyRun/test219.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test219.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test220.m =================================================================== --- /issm/trunk/test/NightlyRun/test220.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test220.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... @@ -25,5 +25,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -35,5 +35,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -45,4 +45,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test221.m =================================================================== --- /issm/trunk/test/NightlyRun/test221.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test221.m (revision 9611) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... 1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... @@ -25,5 +25,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -35,5 +35,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -45,4 +45,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test222.m =================================================================== --- /issm/trunk/test/NightlyRun/test222.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test222.m (revision 9611) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={... 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... @@ -26,5 +26,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -46,4 +46,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test247.m =================================================================== --- /issm/trunk/test/NightlyRun/test247.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test247.m (revision 9611) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; field_values={... @@ -23,5 +23,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -33,5 +33,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -43,4 +43,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test248.m =================================================================== --- /issm/trunk/test/NightlyRun/test248.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test248.m (revision 9611) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... @@ -26,5 +26,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -46,4 +46,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test249.m =================================================================== --- /issm/trunk/test/NightlyRun/test249.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test249.m (revision 9611) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; field_values={... @@ -24,5 +24,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test250.m =================================================================== --- /issm/trunk/test/NightlyRun/test250.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test250.m (revision 9611) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... @@ -27,5 +27,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -37,5 +37,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -47,4 +47,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test253.m =================================================================== --- /issm/trunk/test/NightlyRun/test253.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test253.m (revision 9611) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... @@ -26,5 +26,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -46,4 +46,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test254.m =================================================================== --- /issm/trunk/test/NightlyRun/test254.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test254.m (revision 9611) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... @@ -27,5 +27,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -37,5 +37,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -47,4 +47,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test263.m =================================================================== --- /issm/trunk/test/NightlyRun/test263.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test263.m (revision 9611) @@ -11,14 +11,14 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','BasalMeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3','Temperature4','BasalMeltingRate4'}; +field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(3).Temperature),... - PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(4).Temperature),... - PatchToVec(md.results.ThermalSolution(4).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(4).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test264.m =================================================================== --- /issm/trunk/test/NightlyRun/test264.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test264.m (revision 9611) @@ -11,14 +11,14 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','BasalMeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3','Temperature4','BasalMeltingRate4'}; +field_names ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(3).Temperature),... - PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(4).Temperature),... - PatchToVec(md.results.ThermalSolution(4).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(4).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test265.m =================================================================== --- /issm/trunk/test/NightlyRun/test265.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test265.m (revision 9611) @@ -11,8 +11,8 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3',... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalMeltingRate4'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3',... + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... @@ -29,5 +29,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -39,5 +39,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -49,5 +49,5 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(4).Vx),... PatchToVec(md.results.TransientSolution(4).Vy),... @@ -59,4 +59,4 @@ PatchToVec(md.results.TransientSolution(4).Thickness),... PatchToVec(md.results.TransientSolution(4).Temperature),... - PatchToVec(md.results.TransientSolution(4).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(4).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test266.m =================================================================== --- /issm/trunk/test/NightlyRun/test266.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test266.m (revision 9611) @@ -11,8 +11,8 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3', ... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalMeltingRate4'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', ... + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... @@ -29,5 +29,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -39,5 +39,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -49,5 +49,5 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(4).Vx),... PatchToVec(md.results.TransientSolution(4).Vy),... @@ -59,4 +59,4 @@ PatchToVec(md.results.TransientSolution(4).Thickness),... PatchToVec(md.results.TransientSolution(4).Temperature),... - PatchToVec(md.results.TransientSolution(4).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(4).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test323.m =================================================================== --- /issm/trunk/test/NightlyRun/test323.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test323.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test324.m =================================================================== --- /issm/trunk/test/NightlyRun/test324.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test324.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test325.m =================================================================== --- /issm/trunk/test/NightlyRun/test325.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test325.m (revision 9611) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test326.m =================================================================== --- /issm/trunk/test/NightlyRun/test326.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test326.m (revision 9611) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test329.m =================================================================== --- /issm/trunk/test/NightlyRun/test329.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test329.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -24,5 +24,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test330.m =================================================================== --- /issm/trunk/test/NightlyRun/test330.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test330.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,..., 5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -24,5 +24,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test333.m =================================================================== --- /issm/trunk/test/NightlyRun/test333.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test333.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... @@ -24,5 +24,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test334.m =================================================================== --- /issm/trunk/test/NightlyRun/test334.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test334.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... @@ -24,5 +24,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test335.m =================================================================== --- /issm/trunk/test/NightlyRun/test335.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test335.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 @@ -20,4 +20,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test336.m =================================================================== --- /issm/trunk/test/NightlyRun/test336.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test336.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test347.m =================================================================== --- /issm/trunk/test/NightlyRun/test347.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test347.m (revision 9611) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; - %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; + %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -26,5 +26,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... % PatchToVec(md.results.TransientSolution(3).Vx),... % PatchToVec(md.results.TransientSolution(3).Vy),... @@ -46,4 +46,4 @@ % PatchToVec(md.results.TransientSolution(3).Thickness),... % PatchToVec(md.results.TransientSolution(3).Temperature),... -% PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... +% PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test348.m =================================================================== --- /issm/trunk/test/NightlyRun/test348.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test348.m (revision 9611) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; - %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; + %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-13, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,..., 5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -26,5 +26,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... % PatchToVec(md.results.TransientSolution(3).Vx),... % PatchToVec(md.results.TransientSolution(3).Vy),... @@ -46,4 +46,4 @@ % PatchToVec(md.results.TransientSolution(3).Thickness),... % PatchToVec(md.results.TransientSolution(3).Temperature),... -% PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... +% PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test411.m =================================================================== --- /issm/trunk/test/NightlyRun/test411.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test411.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test412.m =================================================================== --- /issm/trunk/test/NightlyRun/test412.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test412.m (revision 9611) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test413.m =================================================================== --- /issm/trunk/test/NightlyRun/test413.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test413.m (revision 9611) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test414.m =================================================================== --- /issm/trunk/test/NightlyRun/test414.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test414.m (revision 9611) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test417.m =================================================================== --- /issm/trunk/test/NightlyRun/test417.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test417.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test418.m =================================================================== --- /issm/trunk/test/NightlyRun/test418.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test418.m (revision 9611) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={... 1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,... @@ -25,5 +25,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -35,5 +35,5 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(3).Vx),... PatchToVec(md.results.TransientSolution(3).Vy),... @@ -45,4 +45,4 @@ PatchToVec(md.results.TransientSolution(3).Thickness),... PatchToVec(md.results.TransientSolution(3).Temperature),... - PatchToVec(md.results.TransientSolution(3).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test419.m =================================================================== --- /issm/trunk/test/NightlyRun/test419.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test419.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test420.m =================================================================== --- /issm/trunk/test/NightlyRun/test420.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test420.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test421.m =================================================================== --- /issm/trunk/test/NightlyRun/test421.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test421.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; field_values={... @@ -18,4 +18,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test422.m =================================================================== --- /issm/trunk/test/NightlyRun/test422.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test422.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-09,1e-09,1e-08,1e-09,1e-09,1e-08,1e-05 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test429.m =================================================================== --- /issm/trunk/test/NightlyRun/test429.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test429.m (revision 9611) @@ -23,5 +23,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -35,4 +35,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test430.m =================================================================== --- /issm/trunk/test/NightlyRun/test430.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test430.m (revision 9611) @@ -23,4 +23,5 @@ %Fields and tolerances to track changes +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-9,1e-13,1e-6}; @@ -35,4 +36,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test431.m =================================================================== --- /issm/trunk/test/NightlyRun/test431.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test431.m (revision 9611) @@ -23,5 +23,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; field_values={... @@ -35,4 +35,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test432.m =================================================================== --- /issm/trunk/test/NightlyRun/test432.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test432.m (revision 9611) @@ -23,5 +23,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; field_tolerances={1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05}; field_values={... @@ -35,4 +35,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test509.m =================================================================== --- /issm/trunk/test/NightlyRun/test509.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test509.m (revision 9611) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; field_values={... @@ -21,5 +21,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -31,4 +31,4 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test510.m =================================================================== --- /issm/trunk/test/NightlyRun/test510.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test510.m (revision 9611) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -21,5 +21,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -31,4 +31,4 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test511.m =================================================================== --- /issm/trunk/test/NightlyRun/test511.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test511.m (revision 9611) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,4 +32,4 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test512.m =================================================================== --- /issm/trunk/test/NightlyRun/test512.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test512.m (revision 9611) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,1e-12,1e-11,1e-12,1e-12,... 1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,1e-08}; @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,4 +32,4 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test513.m =================================================================== --- /issm/trunk/test/NightlyRun/test513.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test513.m (revision 9611) @@ -9,6 +9,6 @@ %Fields and tolerances to track changes %The thickness wants to be lower than 1 so we contrain it to 1 -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,4 +32,4 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test514.m =================================================================== --- /issm/trunk/test/NightlyRun/test514.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test514.m (revision 9611) @@ -9,6 +9,6 @@ %Fields and tolerances to track changes %The thickness wants to be lower than 1 so we contrain it to 1 -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.TransientSolution(1).Thickness),... PatchToVec(md.results.TransientSolution(1).Temperature),... - PatchToVec(md.results.TransientSolution(1).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.TransientSolution(2).Vx),... PatchToVec(md.results.TransientSolution(2).Vy),... @@ -32,4 +32,4 @@ PatchToVec(md.results.TransientSolution(2).Thickness),... PatchToVec(md.results.TransientSolution(2).Temperature),... - PatchToVec(md.results.TransientSolution(2).BasalMeltingRate),... + PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test515.m =================================================================== --- /issm/trunk/test/NightlyRun/test515.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test515.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test516.m =================================================================== --- /issm/trunk/test/NightlyRun/test516.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test516.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-08 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test517.m =================================================================== --- /issm/trunk/test/NightlyRun/test517.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test517.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test518.m =================================================================== --- /issm/trunk/test/NightlyRun/test518.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test518.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test519.m =================================================================== --- /issm/trunk/test/NightlyRun/test519.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test519.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test520.m =================================================================== --- /issm/trunk/test/NightlyRun/test520.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test520.m (revision 9611) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test525.m =================================================================== --- /issm/trunk/test/NightlyRun/test525.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test525.m (revision 9611) @@ -23,5 +23,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -35,4 +35,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test526.m =================================================================== --- /issm/trunk/test/NightlyRun/test526.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test526.m (revision 9611) @@ -23,5 +23,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; +field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06}; field_values={... @@ -35,4 +35,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test529.m =================================================================== --- /issm/trunk/test/NightlyRun/test529.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test529.m (revision 9611) @@ -8,11 +8,11 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','BasalMeltingRate1', ... - 'Temperature2','BasalMeltingRate2'}; +field_names ={'Temperature1','BasalforcingsMeltingRate1', ... + 'Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-13,1e-9,1e-13,1e-9}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test530.m =================================================================== --- /issm/trunk/test/NightlyRun/test530.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test530.m (revision 9611) @@ -9,11 +9,11 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','BasalMeltingRate1', ... - 'Temperature2','BasalMeltingRate2'}; +field_names ={'Temperature1','BasalforcingsMeltingRate1', ... + 'Temperature2','BasalforcingsMeltingRate2'}; field_tolerances={1e-13,1e-8,1e-13,1e-8}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test531.m =================================================================== --- /issm/trunk/test/NightlyRun/test531.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test531.m (revision 9611) @@ -10,8 +10,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-13,1e-12}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test532.m =================================================================== --- /issm/trunk/test/NightlyRun/test532.m (revision 9610) +++ /issm/trunk/test/NightlyRun/test532.m (revision 9611) @@ -11,8 +11,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','BasalMeltingRate'}; +field_names ={'Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-11,1e-11}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... }; Index: /issm/trunk/test/Par/79North.par =================================================================== --- /issm/trunk/test/Par/79North.par (revision 9610) +++ /issm/trunk/test/Par/79North.par (revision 9611) @@ -23,8 +23,8 @@ %Ice shelf melting and surface mass balance -md.basal_melting_rate=zeros(md.numberofnodes,1); +md.basalforcings.melting_rate=zeros(md.numberofnodes,1); pos=zeros(md.numberofnodes,1); pos(md.elements(find(md.elementoniceshelf),:))=1; -md.basal_melting_rate(find(pos))=10; +md.basalforcings.melting_rate(find(pos))=10; md.surfaceforcings.mass_balance=15*ones(md.numberofnodes,1); Index: /issm/trunk/test/Par/ISMIPF.par =================================================================== --- /issm/trunk/test/Par/ISMIPF.par (revision 9610) +++ /issm/trunk/test/Par/ISMIPF.par (revision 9611) @@ -32,5 +32,5 @@ md.spcthickness(pos)=md.thickness(pos); md.spctemperature=255*ones(md.numberofnodes,1); -md.geothermalflux=0.4*ones(md.numberofnodes,1); +md.basalforcings.geothermalflux=0.4*ones(md.numberofnodes,1); %Parallel options Index: /issm/trunk/test/Par/RoundSheetEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 9610) +++ /issm/trunk/test/Par/RoundSheetEISMINT.par (revision 9611) @@ -15,5 +15,5 @@ radius=sqrt((md.x).^2+(md.y).^2); md.temperature=(tmin+st*radius); -md.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); +md.basalforcings.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); disp(' creating flow law paramter'); Index: /issm/trunk/test/Par/RoundSheetShelf.par =================================================================== --- /issm/trunk/test/Par/RoundSheetShelf.par (revision 9610) +++ /issm/trunk/test/Par/RoundSheetShelf.par (revision 9611) @@ -46,6 +46,6 @@ %Surface mass balance and basal melting md.surfaceforcings.mass_balance=-10*ones(md.numberofnodes,1); -md.basal_melting_rate=zeros(md.numberofnodes,1); -pos=find(md.nodeoniceshelf);md.basal_melting_rate(pos)=10; +md.basalforcings.melting_rate=zeros(md.numberofnodes,1); +pos=find(md.nodeoniceshelf);md.basalforcings.melting_rate(pos)=10; %Friction Index: /issm/trunk/test/Par/RoundSheetStaticEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 9610) +++ /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 9611) @@ -20,5 +20,5 @@ st=1.67*10^-2/1000; %k/m; md.temperature=(tmin+st*radius); -md.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); +md.basalforcings.geothermalflux=4.2*10^-2*ones(md.numberofnodes,1); disp(' creating flow law paramter'); Index: /issm/trunk/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk/test/Par/SquareEISMINT.par (revision 9610) +++ /issm/trunk/test/Par/SquareEISMINT.par (revision 9611) @@ -25,5 +25,5 @@ disp(' creating surface mass balance'); md.surfaceforcings.mass_balance=0.2*ones(md.numberofnodes,1); %0m/a -md.basal_melting_rate=0*ones(md.numberofnodes,1); %0m/a +md.basalforcings.melting_rate=0*ones(md.numberofnodes,1); %0m/a disp(' boundary conditions '); Index: /issm/trunk/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk/test/Par/SquareSheetShelf.par (revision 9610) +++ /issm/trunk/test/Par/SquareSheetShelf.par (revision 9611) @@ -28,5 +28,5 @@ %Accumulation and melting md.surfaceforcings.mass_balance=10*ones(md.numberofnodes,1); -md.basal_melting_rate=5*ones(md.numberofnodes,1); +md.basalforcings.melting_rate=5*ones(md.numberofnodes,1); %Friction Index: /issm/trunk/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9610) +++ /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9611) @@ -25,5 +25,5 @@ %Surface mass balance and basal melting md.surfaceforcings.mass_balance=10*ones(md.numberofnodes,1); -md.basal_melting_rate=5*ones(md.numberofnodes,1); +md.basalforcings.melting_rate=5*ones(md.numberofnodes,1); %Friction Index: /issm/trunk/test/Par/SquareThermal.par =================================================================== --- /issm/trunk/test/Par/SquareThermal.par (revision 9610) +++ /issm/trunk/test/Par/SquareThermal.par (revision 9611) @@ -31,5 +31,5 @@ disp(' creating surface mass balance'); md.surfaceforcings.mass_balance=ones(md.numberofnodes,1)/md.constants.yts; %1m/a -md.basal_melting_rate=0*ones(md.numberofnodes,1)/md.constants.yts; %1m/a +md.basalforcings.melting_rate=0*ones(md.numberofnodes,1)/md.constants.yts; %1m/a %Deal with boundary conditions: @@ -40,4 +40,4 @@ disp(' boundary conditions for thermal model'); md.spctemperature(:)=md.temperature; -md.geothermalflux=zeros(md.numberofnodes,1); -pos=find(md.elementonicesheet);md.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2 +md.basalforcings.geothermalflux=zeros(md.numberofnodes,1); +pos=find(md.elementonicesheet);md.basalforcings.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2