Index: /issm/oecreview/Archive/10937-10976/Date.tex =================================================================== --- /issm/oecreview/Archive/10937-10976/Date.tex (revision 10979) +++ /issm/oecreview/Archive/10937-10976/Date.tex (revision 10979) @@ -0,0 +1,1 @@ +Nov-29-2011 Index: /issm/oecreview/Archive/10937-10976/ISSM-10938-10939.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10938-10939.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10938-10939.diff (revision 10979) @@ -0,0 +1,16 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/startup.py +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/startup.py (revision 10938) ++++ /proj/ice/larour/issm-uci/trunk-jpl/startup.py (revision 10939) +@@ -1,8 +1,9 @@ + #!/usr/bin/env python + # STARTUP - Python startup script + # +-# startup.py is a script run by python at the beginning of a session, just before +-# handing over the prompt to the user if the environment variable PYTHONSTARTUP is defined: ++# startup.py is a script run by python at the beginning of a session, just ++# before handing over the prompt to the user if the environment variable ++# PYTHONSTARTUP is defined: + # export PYTHONSTARTUP=$ISSM_TIER/startup.py + # This startup script should be run by users before trying to use ISSM. + Index: /issm/oecreview/Archive/10937-10976/ISSM-10939-10940.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10939-10940.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10939-10940.diff (revision 10979) @@ -0,0 +1,29 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/startup.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/startup.m (revision 10939) ++++ /proj/ice/larour/issm-uci/trunk-jpl/startup.m (revision 10940) +@@ -1,12 +1,11 @@ + %STARTUP - Matlab startup script + % +-% startup.m is a script run by matlab at the beginning of a session, just before +-% handing over the prompt to the user. This delivery startup.m script has been customized here for +-% the ISSM code. This startup script should be run by users before trying to use ISSM. The best way +-% to do that is to put the startup file in the location where Matlab starts and established its root +-% directory. +-% +-% Copyright Jet Propulsion Laboratory. ++% startup.m is a script run by matlab at the beginning of a session, just ++% before handing over the prompt to the user. This delivery startup.m script ++% has been customized here for the ISSM code. This startup script should be ++% run by users before trying to use ISSM. The best way to do that is to put ++% the startup file in the location where Matlab starts and established its ++% root directory. + + % clear the last warning to focus on the warnings of the ISSM path + lastwarn(''); + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Added: svn:mergeinfo + Merged /issm/trunk:r10938-10939 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10940-10941.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10940-10941.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10940-10941.diff (revision 10979) @@ -0,0 +1,6 @@ + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r10937,10940 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10941-10942.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10941-10942.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10941-10942.diff (revision 10979) @@ -0,0 +1,6 @@ + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r10936,10941 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10943-10944.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10943-10944.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10943-10944.diff (revision 10979) @@ -0,0 +1,6 @@ + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r10943 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10946-10947.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10946-10947.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10946-10947.diff (revision 10979) @@ -0,0 +1,48 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/plot/plot_mesh.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/plot/plot_mesh.m (revision 10946) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/plot/plot_mesh.m (revision 10947) +@@ -19,19 +19,19 @@ + %plot mesh + if is2d + A=elements(:,1); B=elements(:,2); C=elements(:,3); +- patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); ++ patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); + else + if ~isplanet, + A=elements(:,1); B=elements(:,2); C=elements(:,3); D=elements(:,4); E=elements(:,5); F=elements(:,6); +- patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); +- patch( 'Faces', [D E F], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); +- patch( 'Faces', [A B E D],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); +- patch( 'Faces', [B E F C],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); +- patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); ++ patch( 'Faces', [A B C], 'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); ++ patch( 'Faces', [D E F], 'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); ++ patch( 'Faces', [A B E D],'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); ++ patch( 'Faces', [B E F C],'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); ++ patch( 'Faces', [C A D F],'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); + else + A=elements(:,1); B=elements(:,2); C=elements(:,3); + if (size(elements,2)==4), D=elements(:,4); else D=C; end +- patch( 'Faces', [A B C D], 'Vertices', [x y z],'FaceVertexCData', [1 1 1],'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); ++ patch( 'Faces', [A B C D], 'Vertices', [x y z],'FaceVertexCData',zeros(size(x)),'FaceColor','none','EdgeColor',edgecolor,'linewidth',linewidth); + end + end + +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/clusters/pfe.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/clusters/pfe.m (revision 10946) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/clusters/pfe.m (revision 10947) +@@ -66,9 +66,9 @@ + %}}} + function checkconsistency(cluster,md,solution,analyses) % {{{1 + +- available_queues={'long','debug'}; +- queue_requirements_time=[7200 120]; +- queue_requirements_np=[2048 150]; ++ available_queues={'long','normal','debug'}; ++ queue_requirements_time=[5*24*60 8*60 2*60]; ++ queue_requirements_np=[2048 2048 150]; + + QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time) + Index: /issm/oecreview/Archive/10937-10976/ISSM-10948-10949.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10948-10949.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10948-10949.diff (revision 10979) @@ -0,0 +1,133 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 10948) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp (revision 10949) +@@ -114,6 +114,6 @@ + _printf_(true,"\n"); + _printf_(true," Example:\n"); + _printf_(true," load('temperature.mat');\n"); +- _printf_(true," md.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.x,md.y,md.z,253);\n"); ++ _printf_(true," md.initialization.temperature=InterpFromMeshToMesh3d(index,x,y,z,temperature,md.mesh.x,md.mesh.y,md.mesh.z,253);\n"); + _printf_(true,"\n"); + } +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 10948) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp (revision 10949) +@@ -90,6 +90,6 @@ + _printf_(true,"\n"); + _printf_(true," Example:\n"); + _printf_(true," load('velocities.mat');\n"); +- _printf_(true," md.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.x,md.y,0);\n"); ++ _printf_(true," md.inversion.vx_obs=InterpFromGridToMesh(x_n,y_m,vx,md.mesh.x,md.mesh.y,0);\n"); + _printf_(true,"\n"); + } +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp (revision 10948) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp (revision 10949) +@@ -156,7 +156,7 @@ + _printf_(true,"\n"); + _printf_(true," Example:\n"); + _printf_(true," load('temperature.mat');\n"); +- _printf_(true," md.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.x,md.y);\n"); +- _printf_(true," md.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.x,md.y,253,'Contour.exp');\n"); ++ _printf_(true," md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y);\n"); ++ _printf_(true," md.initialization.temperature=InterpFromMeshToMesh2d(index,x,y,temperature,md.mesh.x,md.mesh.y,253,'Contour.exp');\n"); + _printf_(true,"\n"); + } +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/clusters/generic.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/clusters/generic.m (revision 10948) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/clusters/generic.m (revision 10949) +@@ -14,7 +14,7 @@ + port=0; + interactive=1; + codepath=[issmtier() '/bin']; +- executionpath=[issmdir() '/execution']; ++ executionpath=[issmtier() '/execution']; + valgrind=[issmtier() '/externalpackages/valgrind/install/bin/valgrind']; + valgrindlib=[issmtier() '/externalpackages/valgrind/install/lib/libmpidebug.so']; + valgrindsup=[issmtier() '/externalpackages/valgrind/issm.supp']; +Index: /proj/ice/larour/issm-uci/trunk-jpl/scripts/SyncBranches.sh +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/scripts/SyncBranches.sh (revision 0) ++++ /proj/ice/larour/issm-uci/trunk-jpl/scripts/SyncBranches.sh (revision 10949) +@@ -0,0 +1,65 @@ ++#!/bin/bash ++#Script to synchronize trunk and trunk-jpl ++#http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice ++# ++# ++# ___A___________________X______________________________ trunk ++# \ \ / ++# \ merge \ / reintegrate ++# \____________ B _________________________________ trunk-jpl (branch) ++# ++#Step 1: update both branches ++#Step 2: merge trunk back to trunk-jpl ++# cd trunk-jpl ++# svn merge -r A:HEAD ../trunk ++# svn commit -m "merged trunk and trun-jpl for revision HEAD" ++#Step 3: reintegrate trunk-jpl in trunk ++# cd trunk ++# svn merge --reintegrate https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl ++# svn commit -m "merged trunk-jpl and trunk for revision HEAD" ++#Step 4: record reintegration ++# svn merge --record-only -c X ../trunk ++# svn commit -m "Block revision X from being merged into trunk-jpl" ++ ++STEP=1 ++LASTMERGEREVISION=10943 ++ ++#Check user ++if [[ $(users) != "morlighe" ]]; then ++ echo "you are not allowed to synchronize trunk and trunk-jpl" && exit 1 ++fi ++ ++#get paths ++CURRENTPATH=$(pwd) ++cd ../.. ++PREFIX=$(pwd) ++cd $CURRENTPATH ++ ++if [ "$STEP" -eq "1" ]; then ++ echo "--- Step 1: updating trunk and trunk-jpl ---" ++ cd $PREFIX/trunk ++ svn update ++ cd $PREFIX/trunk-jpl ++ svn update ++fi ++if [ "$STEP" -eq "2" ]; then ++ echo "--- Step 2: merging trunk in trunk-jpl ---" ++ cd $PREFIX/trunk-jpl ++ svn merge -r $LASTMERGEREVISION:HEAD ../trunk ++fi ++if [ "$STEP" -eq "3" ]; ++then ++ echo "--- Step 3: reintegrate trunk-jpl in trunk ---" ++ cd $PREFIX/trunk ++ B=$(svnversion .) ++ svn merge --reintegrate https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl ++ svn commit -m "merged trunk-jpl and trunk for revision $B" ++fi ++if [ "$STEP" -eq "4" ]; ++then ++ echo "--- Step 4: record reintegration ---" ++ cd $PREFIX/trunk-jpl ++ X=$(svnversion .) ++ svn merge --record-only -c $X ../trunk ++ svn commit -m "Block revision $X from being merged into trunk-jpl" ++fi + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl/scripts/SyncBranches.sh +___________________________________________________________________ +Added: svn:executable + + * + + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r10944-10948 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10952-10953.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10952-10953.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10952-10953.diff (revision 10979) @@ -0,0 +1,6 @@ + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r10949 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10958-10959.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10958-10959.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10958-10959.diff (revision 10979) @@ -0,0 +1,14 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/petsc/configs/3.2/macmathieu64/configure.sh +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/petsc/configs/3.2/macmathieu64/configure.sh (revision 10958) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/petsc/configs/3.2/macmathieu64/configure.sh (revision 10959) +@@ -13,9 +13,3 @@ + --download-plapack=yes \ + --download-parmetis=yes \ + --download-f-blas-lapack=yes +- +- #flags not needed because we have built MPI with these options (in which case they are already there) +- #--COPTFLAGS="-march=opteron -O2 -arch x86_64" \ +- #--CXXOPTFLAGS="-march=opteron -O2 -arch x86_64" \ +- #--FOPTFLAGS="-march=opteron -O2 -m64" \ +- #--FFLAGS="-I$ISSM_TIER/externalpackages/mpich2/install/include -L$ISSM_TIER/externalpackages/mpich2/install/lib -lmpich -lpmpich -lgfortran -m64" Index: /issm/oecreview/Archive/10937-10976/ISSM-10959-10960.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10959-10960.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10959-10960.diff (revision 10979) @@ -0,0 +1,103 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/scripts/SyncBranches.sh +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/scripts/SyncBranches.sh (revision 10959) ++++ /proj/ice/larour/issm-uci/trunk-jpl/scripts/SyncBranches.sh (revision 10960) +@@ -1,65 +0,0 @@ +-#!/bin/bash +-#Script to synchronize trunk and trunk-jpl +-#http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice +-# +-# +-# ___A___________________X______________________________ trunk +-# \ \ / +-# \ merge \ / reintegrate +-# \____________ B _________________________________ trunk-jpl (branch) +-# +-#Step 1: update both branches +-#Step 2: merge trunk back to trunk-jpl +-# cd trunk-jpl +-# svn merge -r A:HEAD ../trunk +-# svn commit -m "merged trunk and trun-jpl for revision HEAD" +-#Step 3: reintegrate trunk-jpl in trunk +-# cd trunk +-# svn merge --reintegrate https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl +-# svn commit -m "merged trunk-jpl and trunk for revision HEAD" +-#Step 4: record reintegration +-# svn merge --record-only -c X ../trunk +-# svn commit -m "Block revision X from being merged into trunk-jpl" +- +-STEP=1 +-LASTMERGEREVISION=10943 +- +-#Check user +-if [[ $(users) != "morlighe" ]]; then +- echo "you are not allowed to synchronize trunk and trunk-jpl" && exit 1 +-fi +- +-#get paths +-CURRENTPATH=$(pwd) +-cd ../.. +-PREFIX=$(pwd) +-cd $CURRENTPATH +- +-if [ "$STEP" -eq "1" ]; then +- echo "--- Step 1: updating trunk and trunk-jpl ---" +- cd $PREFIX/trunk +- svn update +- cd $PREFIX/trunk-jpl +- svn update +-fi +-if [ "$STEP" -eq "2" ]; then +- echo "--- Step 2: merging trunk in trunk-jpl ---" +- cd $PREFIX/trunk-jpl +- svn merge -r $LASTMERGEREVISION:HEAD ../trunk +-fi +-if [ "$STEP" -eq "3" ]; +-then +- echo "--- Step 3: reintegrate trunk-jpl in trunk ---" +- cd $PREFIX/trunk +- B=$(svnversion .) +- svn merge --reintegrate https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl +- svn commit -m "merged trunk-jpl and trunk for revision $B" +-fi +-if [ "$STEP" -eq "4" ]; +-then +- echo "--- Step 4: record reintegration ---" +- cd $PREFIX/trunk-jpl +- X=$(svnversion .) +- svn merge --record-only -c $X ../trunk +- svn commit -m "Block revision $X from being merged into trunk-jpl" +-fi +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test452.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test452.m (revision 10959) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test452.m (revision 10960) +@@ -26,7 +26,7 @@ + 'Bed3','Surface3','Thickness3','Floatingice3'}; + 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-11,1e-11,1e-11,1e-13}; + field_values={... + PatchToVec(md.results.TransientSolution(1).Bed),... + PatchToVec(md.results.TransientSolution(1).Surface),... +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test420.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test420.m (revision 10959) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test420.m (revision 10960) +@@ -9,8 +9,7 @@ + + %Fields and tolerances to track changes + 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 +-}; ++field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-06}; + field_values={... + PatchToVec(md.results.SteadystateSolution.Vx),... + PatchToVec(md.results.SteadystateSolution.Vy),... + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r10950-10959 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10961-10962.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10961-10962.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10961-10962.diff (revision 10979) @@ -0,0 +1,6 @@ + +Property changes on: /proj/ice/larour/issm-uci/trunk-jpl +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /issm/trunk:r10960 + Index: /issm/oecreview/Archive/10937-10976/ISSM-10964-10965.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10964-10965.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10964-10965.diff (revision 10979) @@ -0,0 +1,437 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/.ignore.txt (revision 10965) +@@ -1,18 +0,0 @@ +-bin +-configure +-Makefile +-Makefile.in +-ISSM.paf +-list +-ISSM.ppf_cache +-config.log +-config.h +-.ignore.txt +-config.status +-stamp-h1 +-svn-commit* +-ISSM.ppf +-config.h.in +-autom4te.cache +-aclocal.m4 +-doxygen +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-MITgcm +-OpenAD +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/cmake/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/cmake/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/cmake/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-install +-src +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/cppcheck/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/cppcheck/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/cppcheck/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/adolc/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/adolc/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/adolc/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install* +-src +-configure.sh +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/mpich2/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/mpich2/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/mpich2/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install* +-src +-configure.sh +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/shapelib/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/shapelib/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/shapelib/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install* +-src +- +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/graphviz/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/graphviz/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/graphviz/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install* +-src +-configure.sh +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/satstress/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/satstress/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/satstress/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/bbftp/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/bbftp/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/bbftp/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/adic/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/adic/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/adic/.ignore.txt (revision 10965) +@@ -1,5 +0,0 @@ +-source +-build +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/dakota/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/dakota/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/dakota/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install* +-src* +-configure.sh +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/m2html/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/m2html/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/m2html/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/openanalysis/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/openanalysis/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/openanalysis/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install +-src +-openanalysis +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/valgrind/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/valgrind/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/valgrind/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install +-configure.sh +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/gdal/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/gdal/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/gdal/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install* +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/rose/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/rose/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/rose/.ignore.txt (revision 10965) +@@ -1,5 +0,0 @@ +-install +-build +-source +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/latex2rtf/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/latex2rtf/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/latex2rtf/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-cfg +-latex2rtf-2.0.0 +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/colpack/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/colpack/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/colpack/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/chaco/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/chaco/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/chaco/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install +-src +-.ignore.txt +-old +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/doxygen/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/doxygen/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/doxygen/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/petsc/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/petsc/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/petsc/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install* +-src +-configure.sh +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/autoconf/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/autoconf/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/autoconf/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/metis/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/metis/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/metis/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-install* +-src +-Makefile.in.patch +- +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/kml/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/kml/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/kml/.ignore.txt (revision 10965) +@@ -1,5 +0,0 @@ +-install +-src +-license.txt +-myKML.kml +-kml_shapefile.m +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/mercurial/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/mercurial/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/mercurial/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-install +-src +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/scotch/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/scotch/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/scotch/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-install +-src +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/tao/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/tao/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/tao/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-install +-src +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/appscan/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/appscan/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/appscan/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-logs +-logs1 +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/xaifbooster/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/xaifbooster/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/xaifbooster/.ignore.txt (revision 10965) +@@ -1 +0,0 @@ +-xaifBooster +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/angel/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/angel/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/angel/.ignore.txt (revision 10965) +@@ -1 +0,0 @@ +-angel +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/boost/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/boost/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/boost/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/flaim/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/flaim/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/flaim/.ignore.txt (revision 10965) +@@ -1 +0,0 @@ +-install +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/xerces/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/xerces/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/xerces/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/vim/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/vim/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/vim/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-install +-src +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/dyson/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/dyson/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/dyson/.ignore.txt (revision 10965) +@@ -1 +0,0 @@ +-jplusers.db +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/matlab/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/matlab/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/matlab/.ignore.txt (revision 10965) +@@ -1 +0,0 @@ +-install +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/netcdf/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/netcdf/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/netcdf/.ignore.txt (revision 10965) +@@ -1 +0,0 @@ +-install +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/libtool/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/libtool/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/libtool/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/triangle/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/triangle/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/triangle/.ignore.txt (revision 10965) +@@ -1,2 +0,0 @@ +-install +-configure.make +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/automake/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/automake/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/automake/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/googleearthtoolbox/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/googleearthtoolbox/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/googleearthtoolbox/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/rats/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/rats/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/rats/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-install +-src +-.ignore.txt +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/.ignore.txt (revision 10965) +@@ -1,3 +0,0 @@ +-Makefile +-ignore.txt +-Makefile.in +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/.ignore.txt (revision 10965) +@@ -1,15 +0,0 @@ +-Makefile +-Makefile.in +-.ignore.txt +-*.o +-*.exe +-appscan.* +-ouncemake* +-list +-*.ppf_cache +-.deps +-config +-g++results +-probe.results +-stXXXX* +- +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/ad/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/ad/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/ad/.ignore.txt (revision 10965) +@@ -1,19 +0,0 @@ +-solutions +-include +-notes +-solvers +-EnumDefinitions +-toolkits +-objects +-issm.h +-modules +-Makefile +-ignore.txt +-Container +-shared +-io +-ignore.txt +-*.o +-issm.exe +-.deps +-Makefile.in +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/mex/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/mex/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/mex/.ignore.txt (revision 10965) +@@ -1,6 +0,0 @@ +-Makefile +-.ignore.txt +-Makefile.in +-*.mexa64 +-.deps +-*.o +Index: /proj/ice/larour/issm-uci/trunk-jpl/bin/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/bin/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/bin/.ignore.txt (revision 10965) +@@ -1,4 +0,0 @@ +-*.mexa64 +-Makefile +-Makefile.in +-issm.exe +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/.ignore.txt +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/.ignore.txt (revision 10964) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/.ignore.txt (revision 10965) +@@ -1,6 +0,0 @@ +-*.tar.gz +-*.bin +-*.petsc +-*.outlog +-*.errlog +-*.queue Index: /issm/oecreview/Archive/10937-10976/ISSM-10968-10969.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10968-10969.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10968-10969.diff (revision 10979) @@ -0,0 +1,2334 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/presolve.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/presolve.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/presolve.m (revision 10969) +@@ -1,16 +0,0 @@ +-function md=presolve(md) +-%PRESOLVE - pre-solve phase operations. +-% +-% Usage: +-% md=presolve(md) +- +-%deal with rifts. +-if isempty(md.rifts.riftstruct) | isnans(md.rifts.riftstruct), +- md.rifts.numrifts=0; +-else +- md.rifts.numrifts=numel(md.rifts.riftstruct); +-end +- +-%Control methods +-md.inversion.num_control_parameters=numel(md.inversion.control_parameters); +-md.inversion.num_cost_functions=size(md.inversion.cost_functions,2); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/solve.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/solve.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/solve.m (revision 10969) +@@ -51,9 +51,6 @@ + md=preqmu(md,options); + end + +-%preprocesses model before solving +-md=presolve(md); +- + %Save model as is (in case of a crash) + assignin('base',inputname(1),md); + +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/marshall.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/marshall.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/marshall.m (revision 10969) +@@ -1,7 +1,7 @@ + function marshall(md) +-%MARSHALL - output JPL-package compatible binary file from @model md, for certain solution type. ++%MARSHALL - output compatible binary file from @model md, for certain solution type. + % +-% The routine creates a JPL-package compatible binary file from @model md ++% The routine creates a compatible binary file from @model md + % This binary file will be used for parallel runs in JPL-package + % + % Usage: +@@ -15,356 +15,28 @@ + error(['marshall error message: could not open ' [md.miscellaneous.name '.bin'],' file for binary writing']); + end + +-%automatically marshall model md, using template information available from an empty model class. +-template=model.template(); +-MarshallObject(fid,template,md,''); +- +-%close file +-st=fclose(fid); +-if st==-1, +- error(['marshall error message: could not close file ' [md.miscellaneous.name '.bin']]); +-end +- +-function MarshallObject(fid,template,object,prefix) % {{{ +-fields=fieldnames(template); ++%Go through al model field check that it is a class and call checkconsistency ++fields=properties(md); + for i=1:length(fields), +- fieldname=fields{i}; +- if ~isa(template.(fieldname),'modelfield'), +- %Recursive call +- MarshallObject(fid,template.(fieldname),object.(fieldname),[prefix fieldname]) +- elseif template.(fieldname).marshall, +- if ~isempty(template.(fieldname).preprocess), +- eval(['fieldvalue=' template.(fieldname).preprocess '(object.(fieldname));']); +- else +- fieldvalue=object.(fieldname); +- end ++ field=fields{i}; + +- %Capitalize for enums +- fieldnamecap=fieldname; +- fieldnamecap(1)=upper(fieldname(1)); +- prefixcap=prefix; +- if ~isempty(prefix), prefixcap(1)=upper(prefix(1)); end +- +- %Write Data +- WriteData(fid,[prefixcap fieldnamecap],fieldvalue,template.(fieldname)); ++ %Some properties do not need to be marshalled ++ if ismember(field,{'results' 'debug' 'radaroverlay' 'solver' 'cluster' 'flaim' 'private'}), ++ continue; + end +-end +- % }}} +-function WriteData(fid,fieldname,fieldvalue,fieldprop) % {{{ +-%WRITEDATA - write model field in binary file +-% +-% Usage: +-% WriteData(fid,fieldname,fieldvalue,fieldprop) +-% + +-%first recover data, enum of the data and type of data +-data=fieldvalue; +-if fieldprop.enum==NoneEnum, +- enum=BuildEnum(fieldname); +-else +- %Field enum overloaded +- enum=fieldprop.enum; +-end +-data_type=fieldprop.format; +- +-if issparse(data), +- data=full(data); +-end +- +-%Ok! write the enum (name) to identify this record uniquely +-fwrite(fid,enum,'int'); +- +-%Now, write the data itself. +-if strcmpi(data_type,'Boolean'),% {{{ +- if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end +- +- %first write length of record +- fwrite(fid,4+4,'int'); %1 bool (disguised as an int)+code +- +- %write data code: +- fwrite(fid,TypeToCode(data_type),'int'); +- +- %now write integer +- fwrite(fid,data,'int'); %send an int, not easy to send a bool +- % }}} +-elseif strcmpi(data_type,'Integer'), % {{{ +- if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end +- +- %first write length of record +- fwrite(fid,4+4,'int'); %1 integer + code +- +- %write data code: +- fwrite(fid,TypeToCode(data_type),'int'); +- +- %now write integer +- fwrite(fid,data,'int'); +- % }}} +-elseif strcmpi(data_type,'Double'), % {{{ +- if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end +- +- %first write length of record +- fwrite(fid,8+4,'int'); %1 double+code +- +- %write data code: +- fwrite(fid,TypeToCode(data_type),'int'); +- +- %now write double +- fwrite(fid,data,'double'); +- % }}} +-elseif strcmpi(data_type,'String'), % {{{ +- %first write length of record +- fwrite(fid,length(data)+4+4,'int'); %string + string size + code +- +- %write data code: +- fwrite(fid,TypeToCode(data_type),'int'); +- +- %now write string +- fwrite(fid,length(data),'int'); +- fwrite(fid,data,'char'); +- % }}} +-elseif strcmpi(data_type,'BooleanMat'), % {{{ +- +- %matrix type: +- mattype=fieldprop.mattype; +- +- %Get size +- s=size(data); +- %if matrix = NaN, then do not write anything +- if (s(1)==1 & s(2)==1 & isnan(data)), +- s(1)=0; s(2)=0; ++ %Check that current field is an object ++ if ~isobject(md.(field)) ++ checkmessage(['field ''' char(field) ''' is not an object']); + end + +- %first write length of record +- fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int'); %2 integers (32 bits) + the double matrix + code + matrix type +- +- %write data code and matrix type: +- fwrite(fid,TypeToCode(data_type),'int'); +- fwrite(fid,mattype,'int'); +- +- %now write matrix +- fwrite(fid,s(1),'int'); +- fwrite(fid,s(2),'int'); +- if s(1)*s(2), +- fwrite(fid,data','double'); %get to the "c" convention, hence the transpose +- end +- % }}} +-elseif strcmpi(data_type,'IntMat'), % {{{ +- +- %matrix type: +- mattype=fieldtype{2}; +- +- %Get size +- s=size(data); +- %if matrix = NaN, then do not write anything +- if (s(1)==1 & s(2)==1 & isnan(data)), +- s(1)=0; s(2)=0; +- end +- +- %first write length of record +- fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int'); %2 integers (32 bits) + the double matrix + code + matrix type +- +- %write data code and matrix type: +- fwrite(fid,TypeToCode(data_type),'int'); +- fwrite(fid,mattype,'int'); +- +- %now write matrix +- fwrite(fid,s(1),'int'); +- fwrite(fid,s(2),'int'); +- if s(1)*s(2), +- fwrite(fid,data','double'); %get to the "c" convention, hence the transpose +- end +- % }}} +-elseif strcmpi(data_type,'DoubleMat'), % {{{ +- +- %matrix type: +- mattype=fieldprop.mattype; +- +- %Get size +- s=size(data); +- %if matrix = NaN, then do not write anything +- if (s(1)==1 & s(2)==1 & isnan(data)), +- s(1)=0; s(2)=0; +- end +- +- %first write length of record +- fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int'); %2 integers (32 bits) + the double matrix + code + matrix type +- +- %write data code and matrix type: +- fwrite(fid,TypeToCode(data_type),'int'); +- fwrite(fid,mattype,'int'); +- +- %now write matrix +- fwrite(fid,s(1),'int'); +- fwrite(fid,s(2),'int'); +- if s(1)*s(2), +- fwrite(fid,data','double'); %get to the "c" convention, hence the transpose +- end +- % }}} +-elseif strcmpi(data_type,'MatArray'), % {{{ +- +- numrecords=numel(data); +- +- %first get length of record +- recordlength=4+4; %number of records + code +- for i=1:numrecords, +- matrix=data{i}; +- s=size(matrix); +- recordlength=recordlength+4*2+... %row and col of matrix +- s(1)*s(2)*8; %matrix of doubles +- end +- +- %write length of record +- fwrite(fid,recordlength,'int'); +- +- %write data code: +- fwrite(fid,TypeToCode(data_type),'int'); +- +- %write data, first number of records +- fwrite(fid,numrecords,'int'); +- +- %write each matrix: +- for i=1:numrecords, +- matrix=data{i}; +- s=size(matrix); +- fwrite(fid,s(1),'int'); +- fwrite(fid,s(2),'int'); +- fwrite(fid,matrix','double'); +- end +- % }}} +-elseif strcmpi(data_type,'StringArray'), % {{{ +- +- %first get length of string array: +- num=numel(data); +- %now get length of record: +- recordlength=4+4; %for length of array + code +- for i=1:num, +- string=data{i}; +- recordlength=recordlength+4+length(string); %for each string +- end +- +- %write length of record +- fwrite(fid,recordlength,'int'); +- +- %write data code: +- fwrite(fid,TypeToCode(data_type),'int'); +- +- %now write length of string array +- fwrite(fid,num,'int'); +- +- %now write the strings +- for i=1:num, +- string=data{i}; +- fwrite(fid,length(string),'int'); +- fwrite(fid,string,'char'); +- end +- % }}} +-else +- error(['WriteData error message: data type: ' num2str(data_type) ' not supported yet! (' EnumToString(enum) ')']); ++ %Marshall current object ++ %disp(['marshalling ' field '...']); ++ md.(field).marshall(fid); + end +-% }}} +-function enum=BuildEnum(string) % {{{ +-%BUILDENUM - build enum out of string +-% +-% Usage: +-% enum=BuildEnum(string) + +-if findstr(string,'_'), +- indices=findstr(string,'_'); +- for i=1:length(indices), +- string(indices(i)+1)=upper(string(indices(i)+1)); +- end +- string(indices)=[]; ++%close file ++st=fclose(fid); ++if st==-1, ++ error(['marshall error message: could not close file ' [md.miscellaneous.name '.bin']]); + end +- +-%take first letter of string and make it uppercase: +-string(1)=upper(string(1)); +- +-%Get Enum +-enum=eval([string 'Enum']); +-% }}} +-function code=TypeToCode(data_type) % {{{1 +-%This routine takes the data_type string, and hardcodes it into an integer, which +-%is passed along the record, in order to identify the nature of the dataset being +-%sent. +-if strcmpi(data_type,'Boolean'), +- code=1; +-elseif strcmpi(data_type,'Integer'), +- code=2; +-elseif strcmpi(data_type,'Double'), +- code=3; +-elseif strcmpi(data_type,'String'), +- code=4; +-elseif strcmpi(data_type,'BooleanMat'), +- code=5; +-elseif strcmpi(data_type,'IntMat'), +- code=6; +-elseif strcmpi(data_type,'DoubleMat'), +- code=7; +-elseif strcmpi(data_type,'MatArray'), +- code=8; +-elseif strcmpi(data_type,'StringArray'), +- code=9; +-else +- error('TypeToCode error message: data type not supported yet!'); +-end% }}} +- +-%FIXME Some processing, should be moved to the corresponding classes in the future +-function out=marshallverbose(in) +- out = VerboseToBinary(in); +-function out=marshallicefront(in) +- out=in; +- pos=find(in(:,end)==0); out(pos,end)=AirEnum; +- pos=find(in(:,end)==1); out(pos,end)=WaterEnum; +- pos=find(in(:,end)==2); out(pos,end)=IceEnum; +- +-function out=marshallrifts(in) +- if isempty(in) | isnans(in), +- numrifts=0; +- else +- numrifts=numel(in); +- end +- numpairs=0; +- for i=1:numrifts, +- numpairs=numpairs+size(in(i).penaltypairs,1); +- end +- +- out=zeros(numpairs,12); % 2 for nodes + 2 for elements+ 2 for normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state. +- +- count=1; +- for i=1:numrifts, +- numpairsforthisrift=size(in(i).penaltypairs,1); +- out(count:count+numpairsforthisrift-1,1:7)=in(i).penaltypairs; +- out(count:count+numpairsforthisrift-1,8)=in(i).fill; +- out(count:count+numpairsforthisrift-1,9)=in(i).friction; +- out(count:count+numpairsforthisrift-1,10)=in(i).fraction; +- out(count:count+numpairsforthisrift-1,11)=in(i).fractionincrement; +- out(count:count+numpairsforthisrift-1,12)=in(i).state; +- count=count+numpairsforthisrift; +- end +-function out=marshallapproximations(in), +- out=in; +- pos=find(in==0); out(pos,end)=NoneApproximationEnum; +- pos=find(in==1); out(pos,end)=HutterApproximationEnum; +- pos=find(in==2); out(pos,end)=MacAyealApproximationEnum; +- pos=find(in==3); out(pos,end)=PattynApproximationEnum; +- pos=find(in==4); out(pos,end)=StokesApproximationEnum; +- pos=find(in==5); out(pos,end)=MacAyealPattynApproximationEnum; +- pos=find(in==6); out(pos,end)=MacAyealStokesApproximationEnum; +- pos=find(in==7); out(pos,end)=PattynStokesApproximationEnum; +- +-function out=marshallcontroltype(in) +- out=zeros(1,numel(in)); +- for i=1:numel(in), +- out(i)=StringToEnum(in{i}); +- end +-function out=marshallcmresponses(in), +- out=in; +- pos=find(in==101); out(pos)=SurfaceAbsVelMisfitEnum; +- pos=find(in==102); out(pos)=SurfaceRelVelMisfitEnum; +- pos=find(in==103); out(pos)=SurfaceLogVelMisfitEnum; +- pos=find(in==104); out(pos)=SurfaceLogVxVyMisfitEnum; +- pos=find(in==105); out(pos)=SurfaceAverageVelMisfitEnum; +- pos=find(in==201); out(pos)=ThicknessAbsMisfitEnum; +- pos=find(in==501); out(pos)=DragCoefficientAbsGradientEnum; +- pos=find(in==502); out(pos)=RheologyBbarAbsGradientEnum; +- pos=find(in==503); out(pos)=ThicknessAbsGradientEnum; +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/WriteData.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/WriteData.m (revision 0) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/model/WriteData.m (revision 10969) +@@ -0,0 +1,260 @@ ++function WriteData(fid,varargin) ++%WRITEDATA - write model field in binary file ++% ++% Usage: ++% WriteData(fid,varargin); ++ ++%process options ++options=pairoptions(varargin{:}); ++ ++%Get data properties ++if exist(options,'object'); ++ %This is a object field, construct enum and data ++ obj = getfieldvalue(options,'object'); ++ fieldname = getfieldvalue(options,'fieldname'); ++ classname = class(obj); ++ ++ enum = BuildEnum([classname '_' fieldname]); ++ data = obj.(fieldname); ++else ++ %No processing required ++ data = getfieldvalue(options,'data'); ++ enum = getfieldvalue(options,'enum'); ++end ++format = getfieldvalue(options,'format'); ++mattype = getfieldvalue(options,'mattype',0); %only required for matrices ++ ++%Process sparse matrices ++if issparse(data), ++ data=full(data); ++end ++ ++%Step 1: write the enum to identify this record uniquely ++fwrite(fid,enum,'int'); ++ ++%Step 2: write the data itself. ++if strcmpi(format,'Boolean'),% {{{ ++ if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end ++ ++ %first write length of record ++ fwrite(fid,4+4,'int'); %1 bool (disguised as an int)+code ++ ++ %write data code: ++ fwrite(fid,FormatToCode(format),'int'); ++ ++ %now write integer ++ fwrite(fid,data,'int'); %send an int, not easy to send a bool ++ % }}} ++elseif strcmpi(format,'Integer'), % {{{ ++ if(numel(data)~=1), error(['field ' EnumToString(enum) ' cannot be marshalled as it has more than one element!']); end ++ ++ %first write length of record ++ fwrite(fid,4+4,'int'); %1 integer + code ++ ++ %write data code: ++ fwrite(fid,FormatToCode(format),'int'); ++ ++ %now write integer ++ fwrite(fid,data,'int'); ++ % }}} ++elseif strcmpi(format,'Double'), % {{{ ++ if(numel(data)~=1), error(['field ' field ' cannot be marshalled as it has more than one element!']); end ++ ++ %first write length of record ++ fwrite(fid,8+4,'int'); %1 double+code ++ ++ %write data code: ++ fwrite(fid,FormatToCode(format),'int'); ++ ++ %now write double ++ fwrite(fid,data,'double'); ++ % }}} ++elseif strcmpi(format,'String'), % {{{ ++ %first write length of record ++ fwrite(fid,length(data)+4+4,'int'); %string + string size + code ++ ++ %write data code: ++ fwrite(fid,FormatToCode(format),'int'); ++ ++ %now write string ++ fwrite(fid,length(data),'int'); ++ fwrite(fid,data,'char'); ++ % }}} ++elseif strcmpi(format,'BooleanMat'), % {{{ ++ ++ %Get size ++ s=size(data); ++ %if matrix = NaN, then do not write anything ++ if (s(1)==1 & s(2)==1 & isnan(data)), ++ s(1)=0; s(2)=0; ++ end ++ ++ %first write length of record ++ fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int'); %2 integers (32 bits) + the double matrix + code + matrix type ++ ++ %write data code and matrix type: ++ fwrite(fid,FormatToCode(format),'int'); ++ fwrite(fid,mattype,'int'); ++ ++ %now write matrix ++ fwrite(fid,s(1),'int'); ++ fwrite(fid,s(2),'int'); ++ if s(1)*s(2), ++ fwrite(fid,data','double'); %get to the "c" convention, hence the transpose ++ end ++ % }}} ++elseif strcmpi(format,'IntMat'), % {{{ ++ ++ %Get size ++ s=size(data); ++ %if matrix = NaN, then do not write anything ++ if (s(1)==1 & s(2)==1 & isnan(data)), ++ s(1)=0; s(2)=0; ++ end ++ ++ %first write length of record ++ fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int'); %2 integers (32 bits) + the double matrix + code + matrix type ++ ++ %write data code and matrix type: ++ fwrite(fid,FormatToCode(format),'int'); ++ fwrite(fid,mattype,'int'); ++ ++ %now write matrix ++ fwrite(fid,s(1),'int'); ++ fwrite(fid,s(2),'int'); ++ if s(1)*s(2), ++ fwrite(fid,data','double'); %get to the "c" convention, hence the transpose ++ end ++ % }}} ++elseif strcmpi(format,'DoubleMat'), % {{{ ++ ++ %Get size ++ s=size(data); ++ %if matrix = NaN, then do not write anything ++ if (s(1)==1 & s(2)==1 & isnan(data)), ++ s(1)=0; s(2)=0; ++ end ++ ++ %first write length of record ++ fwrite(fid,4+4+8*s(1)*s(2)+4+4,'int'); %2 integers (32 bits) + the double matrix + code + matrix type ++ ++ %write data code and matrix type: ++ fwrite(fid,FormatToCode(format),'int'); ++ fwrite(fid,mattype,'int'); ++ ++ %now write matrix ++ fwrite(fid,s(1),'int'); ++ fwrite(fid,s(2),'int'); ++ if s(1)*s(2), ++ fwrite(fid,data','double'); %get to the "c" convention, hence the transpose ++ end ++ % }}} ++elseif strcmpi(format,'MatArray'), % {{{ ++ ++ numrecords=numel(data); ++ ++ %first get length of record ++ recordlength=4+4; %number of records + code ++ for i=1:numrecords, ++ matrix=data{i}; ++ s=size(matrix); ++ recordlength=recordlength+4*2+... %row and col of matrix ++ s(1)*s(2)*8; %matrix of doubles ++ end ++ ++ %write length of record ++ fwrite(fid,recordlength,'int'); ++ ++ %write data code: ++ fwrite(fid,FormatToCode(format),'int'); ++ ++ %write data, first number of records ++ fwrite(fid,numrecords,'int'); ++ ++ %write each matrix: ++ for i=1:numrecords, ++ matrix=data{i}; ++ s=size(matrix); ++ fwrite(fid,s(1),'int'); ++ fwrite(fid,s(2),'int'); ++ fwrite(fid,matrix','double'); ++ end ++ % }}} ++elseif strcmpi(format,'StringArray'), % {{{ ++ ++ %first get length of string array: ++ num=numel(data); ++ %now get length of record: ++ recordlength=4+4; %for length of array + code ++ for i=1:num, ++ string=data{i}; ++ recordlength=recordlength+4+length(string); %for each string ++ end ++ ++ %write length of record ++ fwrite(fid,recordlength,'int'); ++ ++ %write data code: ++ fwrite(fid,FormatToCode(format),'int'); ++ ++ %now write length of string array ++ fwrite(fid,num,'int'); ++ ++ %now write the strings ++ for i=1:num, ++ string=data{i}; ++ fwrite(fid,length(string),'int'); ++ fwrite(fid,string,'char'); ++ end ++ % }}} ++else % {{{ ++ error(['WriteData error message: data type: ' num2str(format) ' not supported yet! (' EnumToString(enum) ')']); ++end % }}} ++end ++ ++function enum=BuildEnum(string) % {{{ ++%BUILDENUM - build enum out of string ++% ++% Usage: ++% enum=BuildEnum(string) ++ ++ if findstr(string,'_'), ++ indices=findstr(string,'_'); ++ for i=1:length(indices), ++ string(indices(i)+1)=upper(string(indices(i)+1)); ++ end ++ string(indices)=[]; ++ end ++ ++ %take first letter of string and make it uppercase: ++ string(1)=upper(string(1)); ++ ++ %Get Enum ++ enum=eval([string 'Enum();']); ++end % }}} ++function code=FormatToCode(format) % {{{1 ++%This routine takes the format string, and hardcodes it into an integer, which ++%is passed along the record, in order to identify the nature of the dataset being ++%sent. ++ if strcmpi(format,'Boolean'), ++ code=1; ++ elseif strcmpi(format,'Integer'), ++ code=2; ++ elseif strcmpi(format,'Double'), ++ code=3; ++ elseif strcmpi(format,'String'), ++ code=4; ++ elseif strcmpi(format,'BooleanMat'), ++ code=5; ++ elseif strcmpi(format,'IntMat'), ++ code=6; ++ elseif strcmpi(format,'DoubleMat'), ++ code=7; ++ elseif strcmpi(format,'MatArray'), ++ code=8; ++ elseif strcmpi(format,'StringArray'), ++ code=9; ++ else ++ error('FormatToCode error message: data type not supported yet!'); ++ end ++end% }}} +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/prognostic.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/prognostic.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/prognostic.m (revision 10969) +@@ -5,11 +5,11 @@ + + classdef prognostic + properties (SetAccess=public) +- spcthickness = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- hydrostatic_adjustment = modelfield('default',0,'marshall',true,'preprocess','StringToEnum','format','Integer'); +- stabilization = modelfield('default',0,'marshall',true,'format','Integer'); +- vertex_pairing = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); +- penalty_factor = modelfield('default',0,'marshall',true,'format','Double'); ++ spcthickness = NaN; ++ hydrostatic_adjustment = 0; ++ stabilization = 0; ++ vertex_pairing = NaN; ++ penalty_factor = 0; + end + methods + function obj = prognostic(varargin) % {{{ +@@ -29,13 +29,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %Type of stabilization to use 0:nothing 1:artificial_diffusivity 3:Discontinuous Galerkin + obj.stabilization=1; + +@@ -66,5 +59,12 @@ + fielddisplay(obj,'vertex_pairing','pairs of vertices that are penalized'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1); ++ WriteData(fid,'data',StringToEnum(obj.hydrostatic_adjustment),'format','Integer','enum',PrognosticHydrostaticAdjustmentEnum); ++ WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','vertex_pairing','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/initialization.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/initialization.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/initialization.m (revision 10969) +@@ -5,14 +5,14 @@ + + classdef initialization + properties (SetAccess=public) +- vx = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',VxEnum); +- vy = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',VyEnum); +- vz = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',VzEnum); +- vel = modelfield('default',NaN,'marshall',false); +- pressure = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',PressureEnum); +- temperature = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',TemperatureEnum); +- watercolumn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum); +- waterfraction = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',WaterfractionEnum); ++ vx = NaN; ++ vy = NaN; ++ vz = NaN; ++ vel = NaN; ++ pressure = NaN; ++ temperature = NaN; ++ watercolumn = NaN; ++ waterfraction = NaN; + end + methods + function obj = initialization(varargin) % {{{ +@@ -32,13 +32,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + if ismember(DiagnosticHorizAnalysisEnum,analyses) +@@ -82,5 +75,14 @@ + fielddisplay(obj,'waterfraction','fraction of water in the ice'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'data',obj.vx,'format','DoubleMat','mattype',1,'enum',VxEnum); ++ WriteData(fid,'data',obj.vy,'format','DoubleMat','mattype',1,'enum',VyEnum); ++ WriteData(fid,'data',obj.vz,'format','DoubleMat','mattype',1,'enum',VzEnum); ++ WriteData(fid,'data',obj.pressure,'format','DoubleMat','mattype',1,'enum',PressureEnum); ++ WriteData(fid,'data',obj.temperature,'format','DoubleMat','mattype',1,'enum',TemperatureEnum); ++ WriteData(fid,'data',obj.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum); ++ WriteData(fid,'data',obj.waterfraction,'format','DoubleMat','mattype',1,'enum',WaterfractionEnum); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/steadystate.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/steadystate.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/steadystate.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef steadystate + properties (SetAccess=public) +- reltol = modelfield('default',0,'marshall',true,'format','Double'); +- maxiter = modelfield('default',0,'marshall',true,'format','Integer'); +- requested_outputs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); ++ reltol = 0; ++ maxiter = 0; ++ requested_outputs = NaN; + end + methods + function obj = steadystate(varargin) % {{{ +@@ -26,14 +26,6 @@ + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ +- +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %maximum of steady state iterations + obj.maxiter=100; + +@@ -61,5 +53,10 @@ + fielddisplay(obj,'requested_outputs','additional requested outputs'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','reltol','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/mask.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/mask.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/mask.m (revision 10969) +@@ -5,12 +5,12 @@ + + classdef mask + properties (SetAccess=public) +- elementonfloatingice = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); +- elementongroundedice = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); +- elementonwater = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); +- vertexonfloatingice = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- vertexongroundedice = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- vertexonwater = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); ++ elementonfloatingice = NaN; ++ elementongroundedice = NaN; ++ elementonwater = NaN; ++ vertexonfloatingice = NaN; ++ vertexongroundedice = NaN; ++ vertexonwater = NaN; + end + methods + function obj = mask(varargin) % {{{ +@@ -30,13 +30,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -48,7 +41,6 @@ + checkfield(md,'mask.vertexonwater' ,'size',[md.mesh.numberofvertices 1],'values',[0 1]); + end % }}} + function disp(obj) % {{{ +- + fielddisplay(obj,'elementonfloatingice','element on floating ice flags list'); + fielddisplay(obj,'vertexonfloatingice','vertex on floating ice flags list'); + fielddisplay(obj,'elementongroundedice','element on grounded ice list'); +@@ -56,5 +48,13 @@ + fielddisplay(obj,'elementonwater','element on water flags list'); + fielddisplay(obj,'vertexonwater','vertex on water flags list'); + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','elementonfloatingice','format','BooleanMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','elementongroundedice','format','BooleanMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','elementonwater','format','BooleanMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','vertexonfloatingice','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','vertexongroundedice','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','vertexonwater','format','DoubleMat','mattype',1); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/mesh.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/mesh.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/mesh.m (revision 10969) +@@ -5,45 +5,45 @@ + + classdef mesh + properties (SetAccess=public) +- x = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- y = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- z = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- elements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); +- dimension = modelfield('default',0,'marshall',true,'format','Integer'); +- numberoflayers = modelfield('default',0,'marshall',true,'format','Integer'); +- numberofelements = modelfield('default',0,'marshall',true,'format','Integer'); +- numberofvertices = modelfield('default',0,'marshall',true,'format','Integer'); +- numberofedges = modelfield('default',0,'marshall',true,'format','Integer'); ++ x = NaN; ++ y = NaN; ++ z = NaN ++ elements = NaN ++ dimension = 0; ++ numberoflayers = 0; ++ numberofelements = 0; ++ numberofvertices = 0; ++ numberofedges = 0; + +- lat = modelfield('default',NaN,'marshall',false); +- long = modelfield('default',NaN,'marshall',false); +- hemisphere = modelfield('default',NaN,'marshall',false); ++ lat = NaN ++ long = NaN ++ hemisphere = NaN + +- elementonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); +- elementonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); +- vertexonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); +- vertexonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); +- lowerelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); +- lowervertex = modelfield('default',NaN,'marshall',false); +- upperelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); +- uppervertex = modelfield('default',NaN,'marshall',false); +- vertexonboundary = modelfield('default',NaN,'marshall',false); ++ elementonbed = NaN ++ elementonsurface = NaN ++ vertexonbed = NaN ++ vertexonsurface = NaN ++ lowerelements = NaN ++ lowervertex = NaN ++ upperelements = NaN ++ uppervertex = NaN ++ vertexonboundary = NaN + +- edges = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); +- segments = modelfield('default',NaN,'marshall',false); +- segmentmarkers = modelfield('default',NaN,'marshall',false); +- vertexconnectivity = modelfield('default',NaN,'marshall',false); +- elementconnectivity = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); +- average_vertex_connectivity = modelfield('default',0,'marshall',true,'format','Integer'); ++ edges = NaN ++ segments = NaN ++ segmentmarkers = NaN ++ vertexconnectivity = NaN ++ elementconnectivity = NaN ++ average_vertex_connectivity = 0; + +- x2d = modelfield('default',NaN,'marshall',false); +- y2d = modelfield('default',NaN,'marshall',false); +- elements2d = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); +- numberofvertices2d = modelfield('default',0,'marshall',true,'format','Integer'); +- numberofelements2d = modelfield('default',0,'marshall',true,'format','Integer'); ++ x2d = NaN ++ y2d = NaN ++ elements2d = NaN ++ numberofvertices2d = 0; ++ numberofelements2d = 0; + +- extractedvertices = modelfield('default',NaN,'marshall',false); +- extractedelements = modelfield('default',NaN,'marshall',false); ++ extractedvertices = NaN ++ extractedelements = NaN + end + methods + function obj = mesh(varargin) % {{{ +@@ -63,13 +63,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %the connectivity is the avergaded number of nodes linked to a + %given node through an edge. This connectivity is used to initially + %allocate memory to the stiffness matrix. A value of 16 seems to +@@ -182,5 +175,28 @@ + fielddisplay(obj,'long','vertices longitude'); + fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' '); + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','x','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','y','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','z','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','elements','format','DoubleMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','dimension','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','numberoflayers','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','numberofelements','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','numberofvertices','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','numberofedges','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','elementonbed','format','BooleanMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','elementonsurface','format','BooleanMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','vertexonbed','format','BooleanMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','vertexonsurface','format','BooleanMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','lowerelements','format','DoubleMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','upperelements','format','DoubleMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','edges','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','elementconnectivity','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','average_vertex_connectivity','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','elements2d','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','numberofvertices2d','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','numberofelements2d','format','Integer'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/autodiff.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/autodiff.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/autodiff.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef autodiff + properties (SetAccess=public) +- isautodiff = modelfield('default',false,'marshall',true,'format','Boolean'); +- forward = modelfield('default',true,'marshall',true,'format','Boolean'); +- reverse = modelfield('default',false,'marshall',true,'format','Boolean'); ++ isautodiff = false; ++ forward = true; ++ reverse = false; + end + methods + function obj = autodiff(varargin) % {{{ +@@ -27,12 +27,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -45,5 +39,10 @@ + fielddisplay(obj,'reverse','backward differentiation'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','isautodiff','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','forward','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','reverse','format','Boolean'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/balancethickness.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/balancethickness.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/balancethickness.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef balancethickness + properties (SetAccess=public) +- spcthickness = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- thickening_rate = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- stabilization = modelfield('default',0,'marshall',true,'format','Integer'); ++ spcthickness = NaN; ++ thickening_rate = NaN; ++ stabilization = 0; + end + methods + function obj = balancethickness(varargin) % {{{ +@@ -27,13 +27,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %Type of stabilization used + obj.stabilization=1; + +@@ -54,5 +47,10 @@ + fielddisplay(obj,'stabilization','0: None, 1: SU, 2: MacAyeal''s artificial diffusivity, 3:DG'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','spcthickness','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','thickening_rate','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/qmu.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/qmu.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/qmu.m (revision 10969) +@@ -5,22 +5,22 @@ + + classdef qmu + properties (SetAccess=public) +- isdakota = modelfield('default',0,'marshall',true,'format','Boolean'); +- variables = modelfield('default',struct(),'marshall',false); +- responses = modelfield('default',struct(),'marshall',false); +- method = modelfield('default',struct(),'marshall',false); +- params = modelfield('default',struct(),'marshall',false); +- results = modelfield('default',struct(),'marshall',false); +- partition = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); +- numberofpartitions = modelfield('default',0,'marshall',true,'format','Integer'); +- numberofresponses = modelfield('default',0,'marshall',true,'format','Integer'); +- variabledescriptors = modelfield('default',{},'marshall',true,'format','StringArray'); +- responsedescriptors = modelfield('default',{},'marshall',true,'format','StringArray'); +- mass_flux_profile_directory = modelfield('default',NaN,'marshall',false); +- mass_flux_profiles = modelfield('default',NaN,'marshall',false); +- mass_flux_segments = modelfield('default',{},'marshall',true,'format','MatArray'); +- adjacency = modelfield('default',NaN,'marshall',false); +- vertex_weight = modelfield('default',NaN,'marshall',false); ++ isdakota = 0; ++ variables = struct(); ++ responses = struct(); ++ method = struct(); ++ params = struct(); ++ results = struct(); ++ partition = NaN; ++ numberofpartitions = 0; ++ numberofresponses = 0; ++ variabledescriptors = {}; ++ responsedescriptors = {}; ++ mass_flux_profile_directory = NaN; ++ mass_flux_profiles = NaN; ++ mass_flux_segments = {}; ++ adjacency = NaN; ++ vertex_weight = NaN; + end + methods + function obj = qmu(varargin) % {{{ +@@ -39,13 +39,7 @@ + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ +- +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end ++ + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -164,5 +158,15 @@ + fielddisplay(obj,'vertex_weight','weight applied to each mesh vertex'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','isdakota','format','Boolean'); ++ if ~obj.isdakota, return; end ++ WriteData(fid,'object',obj,'fieldname','partition','format','DoubleMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','numberofpartitions','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','numberofresponses','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','variabledescriptors','format','StringArray'); ++ WriteData(fid,'object',obj,'fieldname','responsedescriptors','format','StringArray'); ++ WriteData(fid,'object',obj,'fieldname','mass_flux_segments','format','MatArray'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/model/model.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/model/model.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/model/model.m (revision 10969) +@@ -7,44 +7,44 @@ + properties (SetAccess=public) %Model fields + % {{{1 + %Careful here: no other class should be used as default value this is a bug of matlab +- mesh = modelfield('default',0,'marshall',true); +- mask = modelfield('default',0,'marshall',true); ++ mesh = 0; ++ mask = 0; + +- geometry = modelfield('default',0,'marshall',true); +- constants = modelfield('default',0,'marshall',true); +- surfaceforcings = modelfield('default',0,'marshall',true); +- basalforcings = modelfield('default',0,'marshall',true); +- materials = modelfield('default',0,'marshall',true); +- friction = modelfield('default',0,'marshall',true); +- flowequation = modelfield('default',0,'marshall',true); +- timestepping = modelfield('default',0,'marshall',true); +- initialization = modelfield('default',0,'marshall',true); +- rifts = modelfield('default',0,'marshall',true); ++ geometry = 0; ++ constants = 0; ++ surfaceforcings = 0; ++ basalforcings = 0; ++ materials = 0; ++ friction = 0; ++ flowequation = 0; ++ timestepping = 0; ++ initialization = 0; ++ rifts = 0; + +- debug = modelfield('default',0,'marshall',false); +- verbose = modelfield('default',0,'marshall',true,'preprocess','marshallverbose','format','Integer'); +- settings = modelfield('default',0,'marshall',true); +- solver = modelfield('default',0,'marshall',false); +- cluster = modelfield('default',0,'marshall',false); ++ debug = 0; ++ verbose = 0; ++ settings = 0; ++ solver = 0; ++ cluster = 0; + +- balancethickness = modelfield('default',0,'marshall',true); +- diagnostic = modelfield('default',0,'marshall',true); +- groundingline = modelfield('default',0,'marshall',true); +- hydrology = modelfield('default',0,'marshall',true); +- prognostic = modelfield('default',0,'marshall',true); +- thermal = modelfield('default',0,'marshall',true); +- steadystate = modelfield('default',0,'marshall',true); +- transient = modelfield('default',0,'marshall',true); ++ balancethickness = 0; ++ diagnostic = 0; ++ groundingline = 0; ++ hydrology = 0; ++ prognostic = 0; ++ thermal = 0; ++ steadystate = 0; ++ transient = 0; + +- autodiff = modelfield('default',0,'marshall',true); +- flaim = modelfield('default',0,'marshall',false); +- inversion = modelfield('default',0,'marshall',true); +- qmu = modelfield('default',0,'marshall',true); ++ autodiff = 0; ++ flaim = 0; ++ inversion = 0; ++ qmu = 0; + +- results = modelfield('default',0,'marshall',false); +- radaroverlay = modelfield('default',0,'marshall',false); +- miscellaneous = modelfield('default',0,'marshall',true); +- private = modelfield('default',0,'marshall',false); ++ results = 0; ++ radaroverlay = 0; ++ miscellaneous = 0; ++ private = 0; + + %}}} + end +@@ -387,48 +387,41 @@ + end% }}} + function md = setdefaultparameters(md) % {{{1 + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(md); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- md.(fieldname)=md.(fieldname).default; +- end +- + %initialize subclasses +- md.cluster = none; +- md.solver = solver; ++ md.mesh = mesh(); ++ md.mask = mask(); ++ md.constants = constants(); ++ md.geometry = geometry(); ++ md.initialization = initialization(); ++ md.surfaceforcings = surfaceforcings(); ++ md.basalforcings = basalforcings(); ++ md.friction = friction(); ++ md.rifts = rifts(); ++ md.timestepping = timestepping(); ++ md.groundingline = groundingline(); ++ md.materials = materials(); ++ md.flowequation = flowequation(); ++ md.debug = debug(); ++ md.verbose = verbose('solution',true,'qmu',true,'control',true); ++ md.settings = settings(); ++ md.solver = solver(); + md.solver = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions); ++ md.cluster = none(); ++ md.balancethickness = balancethickness(); ++ md.diagnostic = diagnostic(); ++ md.hydrology = hydrology(); ++ md.prognostic = prognostic(); ++ md.thermal = thermal(); ++ md.steadystate = steadystate(); ++ md.transient = transient(); ++ md.autodiff = autodiff(); ++ md.flaim = flaim(); ++ md.inversion = inversion(); ++ md.qmu = qmu(); ++ md.radaroverlay = radaroverlay(); + md.results = struct(); +- md.debug = debug; +- md.constants = constants; +- md.flaim = flaim; +- md.surfaceforcings = surfaceforcings; +- md.basalforcings = basalforcings; +- md.friction = friction; +- md.private = private; +- md.rifts = rifts; +- md.hydrology = hydrology; +- md.settings = settings; +- md.radaroverlay = radaroverlay; +- md.thermal = thermal; +- md.miscellaneous = miscellaneous; +- md.timestepping = timestepping; +- md.groundingline = groundingline; +- md.prognostic = prognostic; +- md.materials = materials; +- md.mask = mask; +- md.qmu = qmu; +- md.balancethickness = balancethickness; +- md.flowequation = flowequation; +- md.steadystate = steadystate; +- md.inversion = inversion; +- md.transient = transient; +- md.diagnostic = diagnostic; +- md.initialization = initialization; +- md.geometry = geometry; +- md.verbose = verbose('solution',true,'qmu',true,'control',true); +- md.autodiff = autodiff; +- md.mesh = mesh; ++ md.miscellaneous = miscellaneous(); ++ md.private = private(); + end + %}}} + function disp(obj) % {{{ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/verbose.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/verbose.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/verbose.m (revision 10969) +@@ -22,13 +22,13 @@ + properties (SetAccess=public) + % {{{1 + %BEGINFIELDS +- mprocessor=false; +- module=false; +- solution=false; +- solver=false; +- convergence=false; +- control=false; +- qmu=false; ++ mprocessor = false; ++ module = false; ++ solution = false; ++ solver = false; ++ convergence = false; ++ control = false; ++ qmu = false; + %ENDFIELDS + % }}} + end +@@ -116,5 +116,8 @@ + + end + %}}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'data',VerboseToBinary(obj),'enum',VerboseEnum,'format','Integer'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/transient.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/transient.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/transient.m (revision 10969) +@@ -5,11 +5,11 @@ + + classdef transient + properties (SetAccess=public) +- isprognostic = modelfield('default',0,'marshall',true,'format','Boolean'); +- isdiagnostic = modelfield('default',0,'marshall',true,'format','Boolean'); +- isthermal = modelfield('default',0,'marshall',true,'format','Boolean'); +- isgroundingline = modelfield('default',0,'marshall',true,'format','Boolean'); +- requested_outputs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); ++ isprognostic = 0; ++ isdiagnostic = 0; ++ isthermal = 0; ++ isgroundingline = 0; ++ requested_outputs = NaN; + end + methods + function obj = transient(varargin) % {{{ +@@ -29,13 +29,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %full analysis: Diagnostic, Prognostic and Thermal but no groundingline migration for now + obj.isprognostic=1; + obj.isdiagnostic=1; +@@ -64,5 +57,12 @@ + fielddisplay(obj,'requested_outputs','list of additional outputs requested'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','isprognostic','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','isdiagnostic','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','isthermal','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','isgroundingline','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/timestepping.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/timestepping.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/timestepping.m (revision 10969) +@@ -5,10 +5,10 @@ + + classdef timestepping + properties (SetAccess=public) +- time_step = modelfield('default',0,'marshall',true,'format','Double'); +- final_time = modelfield('default',0,'marshall',true,'format','Double'); +- time_adapt = modelfield('default',0,'marshall',true,'format','Boolean'); +- cfl_coefficient = modelfield('default',0,'marshall',true,'format','Double'); ++ time_step = 0; ++ final_time = 0; ++ time_adapt = 0; ++ cfl_coefficient = 0; + end + methods + function obj = timestepping(varargin) % {{{ +@@ -28,13 +28,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %time between 2 time steps + obj.time_step=1/2; + +@@ -59,5 +52,11 @@ + fielddisplay(obj,'cfl_coefficient','coefficient applied to cfl condition'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','time_step','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','final_time','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','time_adapt','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','cfl_coefficient','format','Double'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/private.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/private.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/private.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef private + properties (SetAccess=public) +- runtimename = modelfield('default','','marshall',false); +- bamg = modelfield('default',0,'marshall',false); +- solution = modelfield('default','','marshall',false); ++ runtimename = ''; ++ bamg = struct(); ++ solution = ''; + end + methods + function obj = private(varargin) % {{{ +@@ -27,13 +27,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/constants.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/constants.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/constants.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef constants + properties (SetAccess=public) +- g = modelfield('default',0,'marshall',true,'format','Double'); +- yts = modelfield('default',0,'marshall',true,'format','Double'); +- referencetemperature = modelfield('default',0,'marshall',true,'format','Double'); ++ g = 0; ++ yts = 0; ++ referencetemperature = 0; + end + methods + function obj = constants(varargin) % {{{ +@@ -27,13 +27,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %acceleration due to gravity (m/s^2) + obj.g=9.81; + +@@ -59,5 +52,10 @@ + fielddisplay(obj,'referencetemperature','reference temperature used in the enthalpy model'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','g','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','yts','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','referencetemperature','format','Double'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/inversion.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/inversion.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/inversion.m (revision 10969) +@@ -17,8 +17,6 @@ + max_parameters = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); + step_threshold = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); + gradient_only = modelfield('default',0,'marshall',true,'format','Boolean'); +- num_control_parameters = modelfield('default',0,'marshall',true,'format','Integer'); +- num_cost_functions = modelfield('default',0,'marshall',true,'format','Integer'); + vx_obs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); + vy_obs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); + vz_obs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +@@ -125,8 +123,6 @@ + fielddisplay(obj,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex'); + fielddisplay(obj,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex'); + fielddisplay(obj,'gradient_only','stop control method solution at gradient'); +- %fielddisplay(obj,'num_control_parameters','number of control_parameters'); +- %fielddisplay(obj,'num_cost_functions','number of cost_functions'); + fielddisplay(obj,'vx_obs','observed velocity x component [m/a]'); + fielddisplay(obj,'vy_obs','observed velocity y component [m/a]'); + fielddisplay(obj,'vel_obs','observed velocity magnitude [m/a]'); +@@ -142,5 +138,47 @@ + disp(' 502: RheologyBbarAbsGradient'); + disp(' 503: ThicknessAbsGradient'); + end % }}} ++ function marshall(obj,fid) % {{{ ++ ++ WriteData(fid,'object',obj,'fieldname','iscontrol','format','Boolean'); ++ if ~obj.iscontrol, return; end ++ WriteData(fid,'object',obj,'fieldname','nsteps','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','maxiter_per_step','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','cost_functions_coefficients','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','gradient_scaling','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','cost_function_threshold','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','min_parameters','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','max_parameters','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','step_threshold','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','gradient_only','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','vx_obs','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','vy_obs','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','vz_obs','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','thickness_obs','format','DoubleMat','mattype',1); ++ ++ %process control parameters ++ num_control_parameters=numel(obj.control_parameters); ++ data=zeros(1,num_control_parameters); ++ for i=1:num_control_parameters, ++ data(i)=StringToEnum(obj.control_parameters{i}); ++ end ++ WriteData(fid,'data',data,'enum',InversionControlParametersEnum,'format','DoubleMat','mattype',3); ++ WriteData(fid,'data',num_control_parameters,'enum',InversionNumControlParametersEnum,'format','Integer'); ++ ++ %process cost functions ++ num_cost_functions=size(obj.cost_functions,2); ++ data=obj.cost_functions; ++ pos=find(data==101); data(pos)=SurfaceAbsVelMisfitEnum; ++ pos=find(data==102); data(pos)=SurfaceRelVelMisfitEnum; ++ pos=find(data==103); data(pos)=SurfaceLogVelMisfitEnum; ++ pos=find(data==104); data(pos)=SurfaceLogVxVyMisfitEnum; ++ pos=find(data==105); data(pos)=SurfaceAverageVelMisfitEnum; ++ pos=find(data==201); data(pos)=ThicknessAbsMisfitEnum; ++ pos=find(data==501); data(pos)=DragCoefficientAbsGradientEnum; ++ pos=find(data==502); data(pos)=RheologyBbarAbsGradientEnum; ++ pos=find(data==503); data(pos)=ThicknessAbsGradientEnum; ++ WriteData(fid,'data',data,'enum',InversionCostFunctionsEnum,'format','DoubleMat','mattype',3); ++ WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum,'format','Integer'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/surfaceforcings.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/surfaceforcings.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/surfaceforcings.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef surfaceforcings + properties (SetAccess=public) +- accumulation_rate = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- ablation_rate = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- mass_balance = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); ++ accumulation_rate = NaN; ++ ablation_rate = NaN; ++ mass_balance = NaN; + end + methods + function obj = surfaceforcings(varargin) % {{{ +@@ -27,12 +27,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -51,5 +45,10 @@ + fielddisplay(obj,'mass_balance','surface mass balance [m]'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','accumulation_rate','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','ablation_rate','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','mass_balance','format','DoubleMat','mattype',1); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/diagnostic.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/diagnostic.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/diagnostic.m (revision 10969) +@@ -5,23 +5,23 @@ + + classdef diagnostic + properties (SetAccess=public) +- spcvx = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- spcvy = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- spcvz = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- restol = modelfield('default',0,'marshall',true,'format','Double'); +- reltol = modelfield('default',0,'marshall',true,'format','Double'); +- abstol = modelfield('default',0,'marshall',true,'format','Double'); +- stokesreconditioning = modelfield('default',0,'marshall',true,'format','Double'); +- viscosity_overshoot = modelfield('default',0,'marshall',true,'format','Double'); +- icefront = modelfield('default',NaN,'marshall',true,'preprocess','marshallicefront','format','DoubleMat','mattype',3); +- maxiter = modelfield('default',0,'marshall',true,'format','Integer'); +- shelf_dampening = modelfield('default',0,'marshall',true,'format','Integer'); +- vertex_pairing = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); +- penalty_factor = modelfield('default',0,'marshall',true,'format','Double'); +- rift_penalty_lock = modelfield('default',0,'marshall',true,'format','Integer'); +- rift_penalty_threshold = modelfield('default',0,'marshall',true,'format','Integer'); +- referential = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- requested_outputs = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); ++ spcvx = NaN; ++ spcvy = NaN; ++ spcvz = NaN; ++ restol = 0; ++ reltol = 0; ++ abstol = 0; ++ stokesreconditioning = 0; ++ viscosity_overshoot = 0; ++ icefront = NaN; ++ maxiter = 0; ++ shelf_dampening = 0; ++ vertex_pairing = NaN; ++ penalty_factor = NaN; ++ rift_penalty_lock = NaN; ++ rift_penalty_threshold = 0; ++ referential = NaN; ++ requested_outputs = NaN; + end + methods + function obj = diagnostic(varargin) % {{{ +@@ -41,13 +41,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %maximum of non-linear iterations. + obj.maxiter=100; + +@@ -156,5 +149,30 @@ + fielddisplay(obj,'requested_outputs','additional outputs requested'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','spcvx','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','spcvy','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','spcvz','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','restol','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','reltol','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','abstol','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','stokesreconditioning','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','viscosity_overshoot','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','shelf_dampening','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','vertex_pairing','format','DoubleMat','mattype',3); ++ WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','rift_penalty_lock','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','rift_penalty_threshold','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','referential','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3); ++ ++ %marshall ice front ++ data=obj.icefront; ++ pos=find(data(:,end)==0); data(pos,end)=AirEnum; ++ pos=find(data(:,end)==1); data(pos,end)=WaterEnum; ++ pos=find(data(:,end)==2); data(pos,end)=IceEnum; ++ WriteData(fid,'data',data,'enum',DiagnosticIcefrontEnum,'format','DoubleMat','mattype',3); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/rifts.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/rifts.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/rifts.m (revision 10969) +@@ -5,9 +5,8 @@ + + classdef rifts + properties (SetAccess=public) +- riftstruct = modelfield('default',NaN,'marshall',true,'preprocess','marshallrifts','format','DoubleMat','mattype',3); +- riftproperties = modelfield('default',NaN,'marshall',false); +- numrifts = modelfield('default',0,'marshall',true,'format','Integer'); ++ riftstruct = NaN; ++ riftproperties = NaN; + end + methods + function obj = rifts(varargin) % {{{ +@@ -27,15 +26,14 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ +- if obj.numrifts, ++ if isempty(obj.riftstruct) | isnans(obj.riftstruct), ++ numrifts=0; ++ else ++ numrifts=numel(obj.riftstruct); ++ end ++ if numrifts, + if ~(md.mesh.dimension==2), + checkmessage(['model not consistent: models with rifts are only supported in 2d for now!']); + end +@@ -49,7 +47,7 @@ + checkfield(md,'rifts.riftstruct.fill','values',[WaterEnum() AirEnum() IceEnum() MelangeEnum()]); + else + if ~isnans(obj.riftstruct), +- checkmessage(['riftstruct shoud be NaN since obj.numrifts is 0!']); ++ checkmessage(['riftstruct shoud be NaN since numrifts is 0!']); + end + end + end % }}} +@@ -61,5 +59,35 @@ + fielddisplay(obj,'riftproperties',''); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ ++ %Process rift info ++ if isempty(obj.riftstruct) | isnans(obj.riftstruct), ++ numrifts=0; ++ else ++ numrifts=numel(obj.riftstruct); ++ end ++ numpairs=0; ++ for i=1:numrifts, ++ numpairs=numpairs+size(obj.riftstruct(i).penaltypairs,1); ++ end ++ ++ % 2 for nodes + 2 for elements+ 2 for normals + 1 for length + 1 for fill + 1 for friction + 1 for fraction + 1 for fractionincrement + 1 for state. ++ data=zeros(numpairs,12); ++ count=1; ++ for i=1:numrifts, ++ numpairsforthisrift=size(obj.riftstruct(i).penaltypairs,1); ++ data(count:count+numpairsforthisrift-1,1:7)=obj.riftstruct(i).penaltypairs; ++ data(count:count+numpairsforthisrift-1,8)=obj.riftstruct(i).fill; ++ data(count:count+numpairsforthisrift-1,9)=obj.riftstruct(i).friction; ++ data(count:count+numpairsforthisrift-1,10)=obj.riftstruct(i).fraction; ++ data(count:count+numpairsforthisrift-1,11)=obj.riftstruct(i).fractionincrement; ++ data(count:count+numpairsforthisrift-1,12)=obj.riftstruct(i).state; ++ count=count+numpairsforthisrift; ++ end ++ ++ WriteData(fid,'data',numrifts,'enum',RiftsNumriftsEnum,'format','Integer'); ++ WriteData(fid,'data',data,'enum',RiftsRiftstructEnum,'format','DoubleMat','mattype',3); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/geometry.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/geometry.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/geometry.m (revision 10969) +@@ -5,11 +5,11 @@ + + classdef geometry + properties (SetAccess=public) +- surface = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',SurfaceEnum); +- thickness = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',ThicknessEnum); +- bed = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',BedEnum); +- bathymetry = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1,'enum',BathymetryEnum); +- hydrostatic_ratio = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); ++ surface = NaN; ++ thickness = NaN; ++ bed = NaN; ++ bathymetry = NaN; ++ hydrostatic_ratio = NaN; + end + methods + function obj = geometry(varargin) % {{{ +@@ -29,13 +29,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -56,5 +49,12 @@ + fielddisplay(obj,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum); ++ WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum); ++ WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum); ++ WriteData(fid,'data',obj.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum); ++ WriteData(fid,'object',obj,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/thermal.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/thermal.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/thermal.m (revision 10969) +@@ -5,12 +5,12 @@ + + classdef thermal + properties (SetAccess=public) +- spctemperature = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- penalty_threshold = modelfield('default',0,'marshall',true,'format','Integer'); +- stabilization = modelfield('default',0,'marshall',true,'format','Integer'); +- maxiter = modelfield('default',0,'marshall',true,'format','Integer'); +- penalty_lock = modelfield('default',0,'marshall',true,'format','Integer'); +- penalty_factor = modelfield('default',0,'marshall',true,'format','Double'); ++ spctemperature = NaN; ++ penalty_threshold = 0; ++ stabilization = 0; ++ maxiter = 0; ++ penalty_lock = 0; ++ penalty_factor = 0; + end + methods + function obj = thermal(varargin) % {{{ +@@ -30,13 +30,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %Number of unstable constraints acceptable + obj.penalty_threshold=0; + +@@ -67,5 +60,13 @@ + fielddisplay(obj,'penalty_threshold','threshold to declare convergence of thermal solution (default is 0)'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','spctemperature','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','penalty_lock','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m (revision 10969) +@@ -5,11 +5,11 @@ + + classdef settings + properties (SetAccess=public) +- io_gather = modelfield('default',0,'marshall',true,'format','Boolean'); +- lowmem = modelfield('default',0,'marshall',true,'format','Boolean'); +- results_on_vertices = modelfield('default',0,'marshall',true,'format','Boolean'); +- output_frequency = modelfield('default',0,'marshall',true,'format','Integer'); +- waitonlock = modelfield('default',0,'marshall',true,'format','Boolean'); ++ io_gather = 0; ++ lowmem = 0; ++ results_on_vertices = 0; ++ output_frequency = 0; ++ waitonlock = 0; + end + methods + function obj = settings(varargin) % {{{ +@@ -29,13 +29,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %are we short in memory ? (0 faster but requires more memory) + obj.lowmem=0; + +@@ -70,5 +63,12 @@ + fielddisplay(obj,'waitonlock','maximum number of minutes to wait for batch results, or return 0'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','io_gather','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','lowmem','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','results_on_vertices','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','output_frequency','format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','waitonlock','format','Boolean'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/miscellaneous.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/miscellaneous.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/miscellaneous.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef miscellaneous + properties (SetAccess=public) +- notes = modelfield('default','','marshall',false); +- name = modelfield('default','','marshall',true,'format','String'); +- dummy = modelfield('default',NaN,'marshall',false); ++ notes = ''; ++ name = ''; ++ dummy = struct(); + end + methods + function obj = miscellaneous(varargin) % {{{ +@@ -32,12 +32,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end + end % }}} + function disp(obj) % {{{ + disp(sprintf(' miscellaneous parameters:')); +@@ -47,5 +41,8 @@ + fielddisplay(obj,'dummy','empty field to store some data'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','name','format','String'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/groundingline.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/groundingline.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/groundingline.m (revision 10969) +@@ -5,8 +5,8 @@ + + classdef groundingline + properties (SetAccess=public) +- migration = modelfield('default','','marshall',true,'preprocess','StringToEnum','format','Integer'); +- melting_rate = modelfield('default',NaN,'marshall',true,'format','Double'); ++ migration = ''; ++ melting_rate = NaN; + end + methods + function obj = groundingline(varargin) % {{{ +@@ -26,13 +26,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %Type of migration + obj.migration='None'; + +@@ -67,5 +60,9 @@ + fielddisplay(obj,'melting_rate','melting rate applied when previously grounded parts start floating'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'data',StringToEnum(obj.migration),'enum',GroundinglineMigrationEnum,'format','Integer'); ++ WriteData(fid,'object',obj,'fieldname','melting_rate','format','Double'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/basalforcings.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/basalforcings.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/basalforcings.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef basalforcings + properties (SetAccess=public) +- melting_rate = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- melting_rate_correction = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- geothermalflux = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); ++ melting_rate = NaN; ++ melting_rate_correction = NaN; ++ geothermalflux = NaN; + end + methods + function obj = basalforcings(varargin) % {{{ +@@ -27,12 +27,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -55,5 +49,10 @@ + fielddisplay(obj,'geothermalflux','geothermal heat flux [W/m^2]'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','melting_rate','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','melting_rate_correction','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/flowequation.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/flowequation.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/flowequation.m (revision 10969) +@@ -5,14 +5,14 @@ + + classdef flowequation + properties (SetAccess=public) +- ismacayealpattyn = modelfield('default',0,'marshall',true,'format','Boolean'); +- ishutter = modelfield('default',0,'marshall',true,'format','Boolean'); +- isstokes = modelfield('default',0,'marshall',true,'format','Boolean'); +- vertex_equation = modelfield('default',NaN,'marshall',true,'preprocess','marshallapproximations','format','DoubleMat','mattype',1); +- element_equation = modelfield('default',NaN,'marshall',true,'preprocess','marshallapproximations','format','DoubleMat','mattype',2); +- bordermacayeal = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- borderpattyn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- borderstokes = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); ++ ismacayealpattyn = 0; ++ ishutter = 0; ++ isstokes = 0; ++ vertex_equation = NaN; ++ element_equation = NaN; ++ bordermacayeal = NaN; ++ borderpattyn = NaN; ++ borderstokes = NaN; + end + methods + function obj = flowequation(varargin) % {{{ +@@ -32,13 +32,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -81,5 +74,34 @@ + fielddisplay(obj,'borderstokes','vertices on Stokes'' border (for tiling)'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','ismacayealpattyn','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','ishutter','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','isstokes','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','bordermacayeal','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','borderpattyn','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','borderstokes','format','DoubleMat','mattype',1); ++ %convert approximations to enums ++ data=obj.vertex_equation; ++ pos=find(data==0); data(pos,end)=NoneApproximationEnum; ++ pos=find(data==1); data(pos,end)=HutterApproximationEnum; ++ pos=find(data==2); data(pos,end)=MacAyealApproximationEnum; ++ pos=find(data==3); data(pos,end)=PattynApproximationEnum; ++ pos=find(data==4); data(pos,end)=StokesApproximationEnum; ++ pos=find(data==5); data(pos,end)=MacAyealPattynApproximationEnum; ++ pos=find(data==6); data(pos,end)=MacAyealStokesApproximationEnum; ++ pos=find(data==7); data(pos,end)=PattynStokesApproximationEnum; ++ WriteData(fid,'data',data,'enum',FlowequationVertexEquationEnum,'format','DoubleMat','mattype',1); ++ data=obj.element_equation; ++ pos=find(data==0); data(pos,end)=NoneApproximationEnum; ++ pos=find(data==1); data(pos,end)=HutterApproximationEnum; ++ pos=find(data==2); data(pos,end)=MacAyealApproximationEnum; ++ pos=find(data==3); data(pos,end)=PattynApproximationEnum; ++ pos=find(data==4); data(pos,end)=StokesApproximationEnum; ++ pos=find(data==5); data(pos,end)=MacAyealPattynApproximationEnum; ++ pos=find(data==6); data(pos,end)=MacAyealStokesApproximationEnum; ++ pos=find(data==7); data(pos,end)=PattynStokesApproximationEnum; ++ WriteData(fid,'data',data,'enum',FlowequationElementEquationEnum,'format','DoubleMat','mattype',2); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/friction.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/friction.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/friction.m (revision 10969) +@@ -5,9 +5,9 @@ + + classdef friction + properties (SetAccess=public) +- coefficient = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- p = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); +- q = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); ++ coefficient = NaN; ++ p = NaN; ++ q = NaN; + end + methods + function obj = friction(varargin) % {{{ +@@ -27,13 +27,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + end % }}} + function checkconsistency(obj,md,solution,analyses) % {{{ + +@@ -50,5 +43,10 @@ + fielddisplay(obj,'p','p exponent'); + fielddisplay(obj,'q','q exponent'); + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','coefficient','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','p','format','DoubleMat','mattype',2); ++ WriteData(fid,'object',obj,'fieldname','q','format','DoubleMat','mattype',2); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/hydrology.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/hydrology.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/hydrology.m (revision 10969) +@@ -5,13 +5,13 @@ + + classdef hydrology + properties (SetAccess=public) +- spcwatercolumn = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- n = modelfield('default',0,'marshall',true,'format','Double'); +- CR = modelfield('default',0,'marshall',true,'format','Double'); +- p = modelfield('default',0,'marshall',true,'format','Double'); +- q = modelfield('default',0,'marshall',true,'format','Double'); +- kn = modelfield('default',0,'marshall',true,'format','Double'); +- stabilization = modelfield('default',0,'marshall',true,'format','Double'); ++ spcwatercolumn = NaN; ++ n = 0; ++ CR = 0; ++ p = 0; ++ q = 0; ++ kn = 0; ++ stabilization = 0; + end + methods + function obj = hydrology(varargin) % {{{ +@@ -31,13 +31,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %Parameters from Johnson's 2002 thesis, section 3.5.4 + obj.n=.02; + obj.CR=.01; +@@ -68,5 +61,14 @@ + fielddisplay(obj,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.'); + + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','spcwatercolumn','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','n','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','CR','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','p','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','q','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','kn','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','stabilization','format','Double'); ++ end % }}} + end + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/materials.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/materials.m (revision 10968) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/materials.m (revision 10969) +@@ -5,19 +5,19 @@ + + classdef materials + properties (SetAccess=public) +- rho_ice = modelfield('default',0,'marshall',true,'format','Double'); +- rho_water = modelfield('default',0,'marshall',true,'format','Double'); +- mu_water = modelfield('default',0,'marshall',true,'format','Double'); +- heatcapacity = modelfield('default',0,'marshall',true,'format','Double'); +- latentheat = modelfield('default',0,'marshall',true,'format','Double'); +- thermalconductivity = modelfield('default',0,'marshall',true,'format','Double'); +- meltingpoint = modelfield('default',0,'marshall',true,'format','Double'); +- beta = modelfield('default',0,'marshall',true,'format','Double'); +- mixed_layer_capacity = modelfield('default',0,'marshall',true,'format','Double'); +- thermal_exchange_velocity = modelfield('default',0,'marshall',true,'format','Double'); +- rheology_B = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); +- rheology_n = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); +- rheology_law = modelfield('default','','marshall',true,'preprocess','StringToEnum','format','Integer'); ++ rho_ice = 0; ++ rho_water = 0; ++ mu_water = 0; ++ heatcapacity = 0; ++ latentheat = 0; ++ thermalconductivity = 0; ++ meltingpoint = 0; ++ beta = 0; ++ mixed_layer_capacity = 0; ++ thermal_exchange_velocity = 0; ++ rheology_B = NaN; ++ rheology_n = NaN; ++ rheology_law = ''; + end + methods + function obj = materials(varargin) % {{{ +@@ -37,13 +37,6 @@ + end % }}} + function obj = setdefaultparameters(obj) % {{{ + +- %first, use the defaults provided by the properties definition above. +- fieldnames=fields(obj); +- for i=1:length(fieldnames), +- fieldname=fieldnames{i}; +- obj.(fieldname)=obj.(fieldname).default; +- end +- + %ice density (kg/m^3) + obj.rho_ice=917; + +@@ -103,5 +96,20 @@ + fielddisplay(obj,'rheology_n','Glen''s flow law exponent'); + fielddisplay(obj,'rheology_law','law for the temperature dependance of the rheology: ''None'', ''Paterson'' or ''Arrhenius'''); + end % }}} ++ function marshall(obj,fid) % {{{ ++ WriteData(fid,'object',obj,'fieldname','rho_ice','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','rho_water','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','mu_water','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','heatcapacity','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','latentheat','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','thermalconductivity','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','meltingpoint','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','beta','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','mixed_layer_capacity','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','thermal_exchange_velocity','format','Double'); ++ WriteData(fid,'object',obj,'fieldname','rheology_B','format','DoubleMat','mattype',1); ++ WriteData(fid,'object',obj,'fieldname','rheology_n','format','DoubleMat','mattype',2); ++ WriteData(fid,'data',StringToEnum(obj.rheology_law),'enum',MaterialsRheologyLawEnum,'format','Integer'); ++ end % }}} + end + end Index: /issm/oecreview/Archive/10937-10976/ISSM-10969-10970.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10969-10970.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10969-10970.diff (revision 10979) @@ -0,0 +1,59 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 10969) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 10970) +@@ -28,7 +28,7 @@ + /*Fetch parameters: */ + iomodel->Constant(&numberofelements,MeshNumberofelementsEnum); + iomodel->Constant(&control_analysis,InversionIscontrolEnum); +- iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); ++ if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); + + /*Now, return if no control*/ + if (!control_analysis) return; +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Materials/Matice.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 10969) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Materials/Matice.cpp (revision 10970) +@@ -668,7 +668,7 @@ + /*Fetch parameters: */ + iomodel->Constant(&dim,MeshDimensionEnum); + iomodel->Constant(&control_analysis,InversionIscontrolEnum); +- iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); ++ if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); + + /*if 2d*/ + if(dim==2){ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Elements/Tria.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 10969) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Elements/Tria.cpp (revision 10970) +@@ -1442,10 +1442,10 @@ + int num_cm_responses; + + /*Get parameters: */ ++ iomodel->Constant(&yts,ConstantsYtsEnum); + iomodel->Constant(&control_analysis,InversionIscontrolEnum); +- iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); +- iomodel->Constant(&yts,ConstantsYtsEnum); +- iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum); ++ if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); ++ if(control_analysis) iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum); + + /*Recover vertices ids needed to initialize inputs*/ + for(i=0;i<3;i++){ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Elements/Penta.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 10969) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/objects/Elements/Penta.cpp (revision 10970) +@@ -1596,8 +1596,8 @@ + /*Fetch parameters: */ + iomodel->Constant(&yts,ConstantsYtsEnum); + iomodel->Constant(&control_analysis,InversionIscontrolEnum); +- iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); +- iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum); ++ if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); ++ if(control_analysis) iomodel->Constant(&num_cm_responses,InversionNumCostFunctionsEnum); + + /*Checks if debuging*/ + /*{{{2*/ Index: /issm/oecreview/Archive/10937-10976/ISSM-10971-10972.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10971-10972.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10971-10972.diff (revision 10979) @@ -0,0 +1,40 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/startup.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/startup.m (revision 10971) ++++ /proj/ice/larour/issm-uci/trunk-jpl/startup.m (revision 10972) +@@ -10,9 +10,8 @@ + % clear the last warning to focus on the warnings of the ISSM path + lastwarn(''); + +-%Recover ISSM_TIER and USERNAME ++%Recover ISSM_TIER + ISSM_TIER=getenv('ISSM_TIER'); +-USERNAME =getenv('USER'); + if (isempty(ISSM_TIER)), + error('issmdir error message: ''ISSM_TIER'' environment variable is empty! You should define ISSM_TIER in your .cshrc or .bashrc!'); + end +@@ -31,6 +30,7 @@ + addpath(recursivepath([ISSM_TIER '/externalpackages/kml'])); + addpath(recursivepath([ISSM_TIER '/externalpackages/googleearthtoolbox/'])); + addpath(recursivepath([ISSM_TIER '/externalpackages/export_fig'])); ++clear ISSM_TIER; + + %Check on any warning messages that might indicate that the paths were not correct. + if ~isempty(lastwarn), +@@ -54,15 +54,8 @@ + nonlinear_equality_constraint; + clear ans; + +-%Now, load personal startup preferences, using the local user name: +-rmpath(recursivepath([ISSM_TIER '/src/m/usr'])); +-if exist([ISSM_TIER '/src/m/usr/' USERNAME],'dir'), +- addpath(recursivepath([ISSM_TIER '/src/m/usr/' USERNAME])); +-end +- +-clear USERNAME ISSM_TIER; +- + %disable matlab bell! + beep off; ++ + % no warning if we try to plot while in nojvm (will not be supported in future releases) + warning off MATLAB:HandleGraphics:noJVM Index: /issm/oecreview/Archive/10937-10976/ISSM-10972-10973.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10972-10973.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10972-10973.diff (revision 10979) @@ -0,0 +1,333 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/cronfiles/linux_cronfile +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/cronfiles/linux_cronfile (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/cronfiles/linux_cronfile (revision 10973) +@@ -5,9 +5,9 @@ + MAILTO=eric.larour@jpl.nasa.gov,mathieu.morlighem@jpl.nasa.gov,helene.seroussi@jpl.nasa.gov + + #cronjob +-00 09 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-30 12 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 15 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 18 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily +-00 23 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_seroussi_nightly +-00 23 * * 6 cd /u/astrid-r1b/seroussi/issm/trunk/cron/ && ./nightlyrun.sh configs/linux64_seroussi_validation ++00 09 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++30 12 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 15 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 18 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_daily ++00 23 * * 1-5 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_nightly ++00 23 * * 6 cd /u/astrid-r1b/seroussi/issm/trunk-jpl/cron/ && ./nightlyrun.sh configs/linux64_seroussi_validation +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_validation +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_validation (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_validation (revision 10973) +@@ -6,7 +6,7 @@ + + #ISSM main directory (full path) + ISSM_DIR="/u/astrid-r1b/seroussi/issm" +-ISSM_TIER="/u/astrid-r1b/seroussi/issm/trunk/cron/trunk" ++ISSM_TIER="/u/astrid-r1b/seroussi/issm/trunk-jpl/cron/trunk-jpl" + #ISSM_TIER="/u/astrid-r1b/seroussi/svn/issm/trunk/cron/issm2.2" + + #ISSM Architecture +@@ -32,7 +32,7 @@ + ISSM_INSTALLATION="checkout" + + #SVN repository +-REPOSITORY="https://issm-svn:80/svn/issm/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -48,7 +48,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="install" +-EXTERNALPACKAGESDIR="/u/astrid-r1b/seroussi/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/seroussi/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco yams" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_nightly +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_nightly (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_nightly (revision 10973) +@@ -7,7 +7,7 @@ + + #ISSM main directory (full path) + ISSM_DIR="/u/astrid-r1b/seroussi/issm" +-ISSM_TIER="/u/astrid-r1b/seroussi/issm/trunk/cron/trunk" ++ISSM_TIER="/u/astrid-r1b/seroussi/issm/trunk-jpl/cron/trunk-jpl" + #ISSM_TIER="/u/astrid-r1b/seroussi/svn/issm/trunk/cron/issm2.2" + + #ISSM Architecture +@@ -33,7 +33,7 @@ + ISSM_INSTALLATION="checkout" + + #SVN repository +-REPOSITORY="https://issm-svn:80/svn/issm/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -49,7 +49,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="install" +-EXTERNALPACKAGESDIR="/u/astrid-r1b/seroussi/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/seroussi/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi (revision 10973) +@@ -7,7 +7,7 @@ + + #ISSM main directory (full path) + ISSM_DIR="/u/wilkes-r1b/seroussi/issm" +-ISSM_TIER="/u/wilkes-r1b/seroussi/issm/trunk/cron/trunk" ++ISSM_TIER="/u/wilkes-r1b/seroussi/issm/trunk-jpl/cron/trunk-jpl" + + #ISSM Architecture + ISSM_ARCH="linux-gnu-amd64" +@@ -32,7 +32,7 @@ + ISSM_INSTALLATION="update" + + #SVN repository +-REPOSITORY="https://issm-svn:80/svn/issm/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -48,7 +48,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="none" +-EXTERNALPACKAGESDIR="/u/wilkes-r1b/seroussi/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/wilkes-r1b/seroussi/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_validation +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_validation (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_validation (revision 10973) +@@ -5,8 +5,8 @@ + #-------------------------------# + + #ISSM main directory (full path) +-ISSM_DIR="/u/astrid-r1b/morlighe/svn/issm" +-ISSM_TIER="/u/astrid-r1b/morlighe/svn/issm/trunk/cron/trunk" ++ISSM_DIR="/u/astrid-r1b/morlighe/issm" ++ISSM_TIER="/u/astrid-r1b/morlighe/issm/trunk-jpl/cron/trunk-jpl" + #ISSM_TIER="/u/astrid-r1b/morlighe/svn/issm/trunk/cron/issm2.2" + + #ISSM Architecture +@@ -32,7 +32,7 @@ + ISSM_INSTALLATION="checkout" + + #SVN repository +-REPOSITORY="http://s383-rhat/issm/svn/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -48,7 +48,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="install" +-EXTERNALPACKAGESDIR="/u/astrid-r1b/morlighe/svn/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/morlighe/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco yams" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_daily +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_daily (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_seroussi_daily (revision 10973) +@@ -7,7 +7,7 @@ + + #ISSM main directory (full paths) + ISSM_DIR="/u/astrid-r1b/seroussi/issm" +-ISSM_TIER="/u/astrid-r1b/seroussi/issm/trunk/cron/trunk" ++ISSM_TIER="/u/astrid-r1b/seroussi/issm/trunk-jpl/cron/trunk-jpl" + #ISSM_TIER="/u/astrid-r1b/seroussi/svn/issm/trunk/cron/issm2.2" + + #ISSM Architecture +@@ -33,7 +33,7 @@ + ISSM_INSTALLATION="update" + + #SVN repository +-REPOSITORY="https://issm-svn:80/svn/issm/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -49,7 +49,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="none" +-EXTERNALPACKAGESDIR="/u/astrid-r1b/seroussi/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/seroussi/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/macosx64_larour +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/macosx64_larour (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/macosx64_larour (revision 10973) +@@ -31,7 +31,7 @@ + ISSM_INSTALLATION="update" + + #SVN repository +-REPOSITORY="http://s383-rhat/issm/svn/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_nightly +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_nightly (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_nightly (revision 10973) +@@ -6,8 +6,8 @@ + #-------------------------------# + + #ISSM main directory (full path) +-ISSM_DIR="/u/astrid-r1b/morlighe/svn/issm" +-ISSM_TIER="/u/astrid-r1b/morlighe/svn/issm/trunk/cron/trunk" ++ISSM_DIR="/u/astrid-r1b/morlighe/issm" ++ISSM_TIER="/u/astrid-r1b/morlighe/issm/trunk-jpl/cron/trunk-jpl" + #ISSM_TIER="/u/astrid-r1b/morlighe/svn/issm/trunk/cron/issm2.2" + + #ISSM Architecture +@@ -33,7 +33,7 @@ + ISSM_INSTALLATION="checkout" + + #SVN repository +-REPOSITORY="http://s383-rhat/issm/svn/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -49,7 +49,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="install" +-EXTERNALPACKAGESDIR="/u/astrid-r1b/morlighe/svn/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/morlighe/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/macosx32_seroussi +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/macosx32_seroussi (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/macosx32_seroussi (revision 10973) +@@ -6,8 +6,8 @@ + #-------------------------------# + + #ISSM main directory (full path) +-ISSM_DIR="/Users/seroussi/Desktop/backup/svn/issm" +-ISSM_TIER="/Users/seroussi/Desktop/backup/svn/issm/trunk/cron/trunk" ++ISSM_DIR="/Users/seroussi/Desktop/issmuci" ++ISSM_TIER="/Users/seroussi/Desktop/issmuci/trunk-jpl/cron/trunk-jpl" + + #ISSM Architecture + ISSM_ARCH="macosx-gnu" +@@ -32,7 +32,7 @@ + ISSM_INSTALLATION="update" + + #SVN repository +-REPOSITORY="http://s383-rhat/issm/svn/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_larour +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_larour (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_larour (revision 10973) +@@ -7,7 +7,7 @@ + + #ISSM main directory (full paths) + ISSM_DIR="/u/astrid-r1b/larour/issm/" +-ISSM_TIER="/u/astrid-r1b/larour/issm/trunk/cron/trunk" ++ISSM_TIER="/u/astrid-r1b/larour/issm/trunk-jpl/cron/trunk-jpl" + #ISSM_TIER="/u/wilkes-r1b/morlighe/svn/issm/trunk/cron/issm2.2" + + #ISSM Architecture +@@ -33,7 +33,7 @@ + ISSM_INSTALLATION="update" + + #SVN repository +-REPOSITORY="http://s383-rhat/issm/svn/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -49,7 +49,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="none" +-EXTERNALPACKAGESDIR="/u/astrid-r1b/larour/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/larour/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="autoconf automake matlab mpich2 petsc metis triangle dakota chaco" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_daily +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_daily (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/linux64_morlighem_daily (revision 10973) +@@ -7,7 +7,7 @@ + + #ISSM main directory (full paths) + ISSM_DIR="/u/astrid-r1b/morlighe/svn/issm" +-ISSM_TIER="/u/astrid-r1b/morlighe/svn/issm/trunk/cron/trunk" ++ISSM_TIER="/u/astrid-r1b/morlighe/svn/issm/trunk-jpl/cron/trunk-jpl" + #ISSM_TIER="/u/astrid-r1b/morlighe/svn/issm/trunk/cron/issm2.2" + + #ISSM Architecture +@@ -33,7 +33,7 @@ + ISSM_INSTALLATION="update" + + #SVN repository +-REPOSITORY="http://s383-rhat/issm/svn/issm/trunk" ++REPOSITORY="https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs +@@ -49,7 +49,7 @@ + # - "none" leave external packages as is + # ->skip to section 4 + ISSM_EXTERNALPACKAGES="none" +-EXTERNALPACKAGESDIR="/u/astrid-r1b/morlighe/svn/issm/trunk/externalpackages" ++EXTERNALPACKAGESDIR="/u/astrid-r1b/morlighe/issm/trunk-jpl/externalpackages" + + #List of external pakages to be installed + EXTERNALPACKAGES="automake autoconf matlab mpich2 petsc metis triangle dakota chaco" +Index: /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/winxp32_larour +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/winxp32_larour (revision 10972) ++++ /proj/ice/larour/issm-uci/trunk-jpl/cron/configs/winxp32_larour (revision 10973) +@@ -6,8 +6,8 @@ + #-------------------------------# + + #ISSM main directory (full path) +-ISSM_DIR="C:/home/issm/trunk" +-ISSM_TIER="C:/home/issm/trunk/cron/trunk" ++ISSM_DIR="C:/home/issm/trunk-jpl" ++ISSM_TIER="C:/home/issm/trunk-jpl/cron/trunk-jpl" + + #ISSM Architecture + ISSM_ARCH="cygwin-intel" +@@ -32,7 +32,7 @@ + ISSM_INSTALLATION="update" + + #SVN repository +-REPOSITORY="http://s383-rhat/issm/svn/issm/trunk" ++REPOSITORY="http://s383-rhat/issm/svn/issm/trunk-jpl" + #REPOSITORY="http://s383-rhat/issm/svn/issm/branches/issm2.2" + + #execution path used for parallel runs Index: /issm/oecreview/Archive/10937-10976/ISSM-10973-10974.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10973-10974.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10973-10974.diff (revision 10979) @@ -0,0 +1,686 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 10973) ++++ /proj/ice/larour/issm-uci/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 10974) +@@ -440,6 +440,7 @@ + syn keyword cType TriaHook + syn keyword cType TriaRef + syn keyword cType KML_Attribute ++syn keyword cType KML_Comment + syn keyword cType KML_ColorStyle + syn keyword cType KML_Container + syn keyword cType KML_Document +@@ -500,6 +501,7 @@ + syn keyword cType ElementVector + syn keyword cType BoolParam + syn keyword cType DoubleMatParam ++syn keyword cType DoubleTransientMatParam + syn keyword cType DoubleMatArrayParam + syn keyword cType DoubleParam + syn keyword cType DoubleVecParam +@@ -543,202 +545,198 @@ + "ISSM's objects end + + "ISSM's Enums begin ++syn keyword cConstant AutodiffForwardEnum ++syn keyword cConstant AutodiffIsautodiffEnum ++syn keyword cConstant AutodiffReverseEnum ++syn keyword cConstant BalancethicknessSpcthicknessEnum ++syn keyword cConstant BalancethicknessStabilizationEnum ++syn keyword cConstant BalancethicknessThickeningRateEnum ++syn keyword cConstant BasalforcingsGeothermalfluxEnum ++syn keyword cConstant BasalforcingsMeltingRateCorrectionEnum ++syn keyword cConstant BasalforcingsMeltingRateEnum ++syn keyword cConstant BathymetryEnum ++syn keyword cConstant BedEnum + syn keyword cConstant ConstantsGEnum + syn keyword cConstant ConstantsReferencetemperatureEnum + syn keyword cConstant ConstantsYtsEnum +-syn keyword cConstant SurfaceforcingsAccumulationRateEnum +-syn keyword cConstant SurfaceforcingsAblationRateEnum +-syn keyword cConstant SurfaceforcingsMassBalanceEnum +-syn keyword cConstant BasalforcingsMeltingRateEnum +-syn keyword cConstant BasalforcingsMeltingRateCorrectionEnum +-syn keyword cConstant BasalforcingsGeothermalfluxEnum ++syn keyword cConstant DiagnosticAbstolEnum ++syn keyword cConstant DiagnosticIcefrontEnum ++syn keyword cConstant DiagnosticMaxiterEnum ++syn keyword cConstant DiagnosticNumRequestedOutputsEnum ++syn keyword cConstant DiagnosticPenaltyFactorEnum ++syn keyword cConstant DiagnosticReferentialEnum ++syn keyword cConstant DiagnosticReltolEnum ++syn keyword cConstant DiagnosticRequestedOutputsEnum ++syn keyword cConstant DiagnosticRestolEnum ++syn keyword cConstant DiagnosticRiftPenaltyLockEnum ++syn keyword cConstant DiagnosticRiftPenaltyThresholdEnum ++syn keyword cConstant DiagnosticShelfDampeningEnum ++syn keyword cConstant DiagnosticSpcvxEnum ++syn keyword cConstant DiagnosticSpcvyEnum ++syn keyword cConstant DiagnosticSpcvzEnum ++syn keyword cConstant DiagnosticStokesreconditioningEnum ++syn keyword cConstant DiagnosticVertexPairingEnum ++syn keyword cConstant DiagnosticViscosityOvershootEnum ++syn keyword cConstant FlowequationBordermacayealEnum ++syn keyword cConstant FlowequationBorderpattynEnum ++syn keyword cConstant FlowequationBorderstokesEnum ++syn keyword cConstant FlowequationElementEquationEnum ++syn keyword cConstant FlowequationIshutterEnum ++syn keyword cConstant FlowequationIsmacayealpattynEnum ++syn keyword cConstant FlowequationIsstokesEnum ++syn keyword cConstant FlowequationVertexEquationEnum + syn keyword cConstant FrictionCoefficientEnum + syn keyword cConstant FrictionPEnum + syn keyword cConstant FrictionQEnum +-syn keyword cConstant RiftsRiftstructEnum +-syn keyword cConstant RiftsNumriftsEnum +-syn keyword cConstant HydrologySpcwatercolumnEnum ++syn keyword cConstant GeometryHydrostaticRatioEnum ++syn keyword cConstant HydrologyCREnum + syn keyword cConstant HydrologyKnEnum + syn keyword cConstant HydrologyNEnum + syn keyword cConstant HydrologyPEnum + syn keyword cConstant HydrologyQEnum +-syn keyword cConstant HydrologyCREnum ++syn keyword cConstant HydrologySpcwatercolumnEnum + syn keyword cConstant HydrologyStabilizationEnum +-syn keyword cConstant SettingsLowmemEnum +-syn keyword cConstant SettingsIoGatherEnum +-syn keyword cConstant SettingsResultsOnVerticesEnum +-syn keyword cConstant SettingsOutputFrequencyEnum +-syn keyword cConstant SettingsWaitonlockEnum +-syn keyword cConstant ThermalSpctemperatureEnum +-syn keyword cConstant ThermalPenaltyThresholdEnum +-syn keyword cConstant ThermalPenaltyLockEnum +-syn keyword cConstant ThermalMaxiterEnum +-syn keyword cConstant ThermalStabilizationEnum +-syn keyword cConstant ThermalPenaltyFactorEnum +-syn keyword cConstant MiscellaneousNameEnum +-syn keyword cConstant TimesteppingTimeStepEnum +-syn keyword cConstant TimesteppingFinalTimeEnum +-syn keyword cConstant TimesteppingTimeAdaptEnum +-syn keyword cConstant TimesteppingCflCoefficientEnum +-syn keyword cConstant PrognosticSpcthicknessEnum +-syn keyword cConstant PrognosticHydrostaticAdjustmentEnum +-syn keyword cConstant PrognosticStabilizationEnum +-syn keyword cConstant PrognosticVertexPairingEnum +-syn keyword cConstant PrognosticPenaltyFactorEnum +-syn keyword cConstant MaterialsRheologyBEnum +-syn keyword cConstant MaterialsRheologyBbarEnum +-syn keyword cConstant MaterialsRheologyNEnum +-syn keyword cConstant MaterialsRheologyLawEnum +-syn keyword cConstant MaterialsRhoIceEnum +-syn keyword cConstant MaterialsRhoWaterEnum +-syn keyword cConstant MaterialsHeatcapacityEnum +-syn keyword cConstant MaterialsLatentheatEnum +-syn keyword cConstant MaterialsBetaEnum +-syn keyword cConstant MaterialsThermalconductivityEnum +-syn keyword cConstant MaterialsMixedLayerCapacityEnum +-syn keyword cConstant MaterialsThermalExchangeVelocityEnum +-syn keyword cConstant MaterialsMeltingpointEnum +-syn keyword cConstant MaskElementongroundediceEnum +-syn keyword cConstant MaskElementonfloatingiceEnum +-syn keyword cConstant MaskElementonwaterEnum +-syn keyword cConstant MaskVertexongroundediceEnum +-syn keyword cConstant MaskVertexonfloatingiceEnum +-syn keyword cConstant MaskVertexonwaterEnum +-syn keyword cConstant QmuIsdakotaEnum +-syn keyword cConstant QmuMassFluxSegmentsEnum +-syn keyword cConstant QmuPartitionEnum +-syn keyword cConstant QmuNumberofpartitionsEnum +-syn keyword cConstant QmuNumberofresponsesEnum +-syn keyword cConstant QmuResponsedescriptorsEnum +-syn keyword cConstant QmuVariabledescriptorsEnum +-syn keyword cConstant BalancethicknessSpcthicknessEnum +-syn keyword cConstant BalancethicknessThickeningRateEnum +-syn keyword cConstant BalancethicknessStabilizationEnum +-syn keyword cConstant FlowequationIshutterEnum +-syn keyword cConstant FlowequationIsmacayealpattynEnum +-syn keyword cConstant FlowequationIsstokesEnum +-syn keyword cConstant FlowequationElementEquationEnum +-syn keyword cConstant FlowequationVertexEquationEnum +-syn keyword cConstant FlowequationBorderstokesEnum +-syn keyword cConstant FlowequationBorderpattynEnum +-syn keyword cConstant FlowequationBordermacayealEnum +-syn keyword cConstant SteadystateRequestedOutputsEnum +-syn keyword cConstant SteadystateNumRequestedOutputsEnum +-syn keyword cConstant SteadystateReltolEnum +-syn keyword cConstant SteadystateMaxiterEnum +-syn keyword cConstant TransientIsprognosticEnum +-syn keyword cConstant TransientIsdiagnosticEnum +-syn keyword cConstant TransientIsthermalEnum +-syn keyword cConstant TransientIsgroundinglineEnum +-syn keyword cConstant TransientRequestedOutputsEnum +-syn keyword cConstant TransientNumRequestedOutputsEnum +-syn keyword cConstant InversionIscontrolEnum + syn keyword cConstant InversionControlParametersEnum +-syn keyword cConstant InversionCostFunctionsEnum + syn keyword cConstant InversionCostFunctionEnum ++syn keyword cConstant InversionCostFunctionThresholdEnum + syn keyword cConstant InversionCostFunctionsCoefficientsEnum +-syn keyword cConstant InversionNstepsEnum +-syn keyword cConstant InversionMaxiterPerStepEnum ++syn keyword cConstant InversionCostFunctionsEnum ++syn keyword cConstant InversionGradientOnlyEnum + syn keyword cConstant InversionGradientScalingEnum +-syn keyword cConstant InversionGradientOnlyEnum +-syn keyword cConstant InversionCostFunctionThresholdEnum ++syn keyword cConstant InversionIscontrolEnum + syn keyword cConstant InversionMaxParametersEnum ++syn keyword cConstant InversionMaxiterPerStepEnum + syn keyword cConstant InversionMinParametersEnum +-syn keyword cConstant InversionStepThresholdEnum ++syn keyword cConstant InversionNstepsEnum + syn keyword cConstant InversionNumControlParametersEnum + syn keyword cConstant InversionNumCostFunctionsEnum ++syn keyword cConstant InversionStepThresholdEnum ++syn keyword cConstant InversionThicknessObsEnum ++syn keyword cConstant InversionVelObsEnum + syn keyword cConstant InversionVxObsEnum + syn keyword cConstant InversionVyObsEnum + syn keyword cConstant InversionVzObsEnum +-syn keyword cConstant InversionVelObsEnum +-syn keyword cConstant InversionThicknessObsEnum +-syn keyword cConstant DiagnosticSpcvxEnum +-syn keyword cConstant DiagnosticSpcvyEnum +-syn keyword cConstant DiagnosticSpcvzEnum +-syn keyword cConstant DiagnosticStokesreconditioningEnum +-syn keyword cConstant DiagnosticIcefrontEnum +-syn keyword cConstant DiagnosticReferentialEnum +-syn keyword cConstant DiagnosticVertexPairingEnum +-syn keyword cConstant DiagnosticPenaltyFactorEnum +-syn keyword cConstant DiagnosticAbstolEnum +-syn keyword cConstant DiagnosticReltolEnum +-syn keyword cConstant DiagnosticRestolEnum +-syn keyword cConstant DiagnosticMaxiterEnum +-syn keyword cConstant DiagnosticShelfDampeningEnum +-syn keyword cConstant DiagnosticRiftPenaltyLockEnum +-syn keyword cConstant DiagnosticRiftPenaltyThresholdEnum +-syn keyword cConstant DiagnosticRequestedOutputsEnum +-syn keyword cConstant DiagnosticNumRequestedOutputsEnum +-syn keyword cConstant DiagnosticViscosityOvershootEnum +-syn keyword cConstant GeometryHydrostaticRatioEnum +-syn keyword cConstant ThicknessEnum +-syn keyword cConstant BedEnum +-syn keyword cConstant BathymetryEnum +-syn keyword cConstant SurfaceEnum +-syn keyword cConstant AutodiffIsautodiffEnum +-syn keyword cConstant AutodiffForwardEnum +-syn keyword cConstant AutodiffReverseEnum ++syn keyword cConstant MaskElementonfloatingiceEnum ++syn keyword cConstant MaskElementongroundediceEnum ++syn keyword cConstant MaskElementonwaterEnum ++syn keyword cConstant MaskVertexonfloatingiceEnum ++syn keyword cConstant MaskVertexongroundediceEnum ++syn keyword cConstant MaskVertexonwaterEnum ++syn keyword cConstant MaterialsBetaEnum ++syn keyword cConstant MaterialsHeatcapacityEnum ++syn keyword cConstant MaterialsLatentheatEnum ++syn keyword cConstant MaterialsMeltingpointEnum ++syn keyword cConstant MaterialsMixedLayerCapacityEnum ++syn keyword cConstant MaterialsRheologyBEnum ++syn keyword cConstant MaterialsRheologyBbarEnum ++syn keyword cConstant MaterialsRheologyLawEnum ++syn keyword cConstant MaterialsRheologyNEnum ++syn keyword cConstant MaterialsRhoIceEnum ++syn keyword cConstant MaterialsRhoWaterEnum ++syn keyword cConstant MaterialsMuWaterEnum ++syn keyword cConstant MaterialsThermalExchangeVelocityEnum ++syn keyword cConstant MaterialsThermalconductivityEnum + syn keyword cConstant MeshAverageVertexConnectivityEnum + syn keyword cConstant MeshDimensionEnum ++syn keyword cConstant MeshEdgesEnum ++syn keyword cConstant MeshElementconnectivityEnum ++syn keyword cConstant MeshElementonbedEnum ++syn keyword cConstant MeshElementonsurfaceEnum ++syn keyword cConstant MeshElements2dEnum ++syn keyword cConstant MeshElementsEnum ++syn keyword cConstant MeshLowerelementsEnum ++syn keyword cConstant MeshNumberofedgesEnum ++syn keyword cConstant MeshNumberofelements2dEnum + syn keyword cConstant MeshNumberofelementsEnum +-syn keyword cConstant MeshNumberofverticesEnum +-syn keyword cConstant MeshNumberofelements2dEnum +-syn keyword cConstant MeshNumberofedgesEnum + syn keyword cConstant MeshNumberoflayersEnum + syn keyword cConstant MeshNumberofvertices2dEnum +-syn keyword cConstant MeshElementconnectivityEnum +-syn keyword cConstant MeshLowerelementsEnum ++syn keyword cConstant MeshNumberofverticesEnum + syn keyword cConstant MeshUpperelementsEnum +-syn keyword cConstant MeshElementonbedEnum +-syn keyword cConstant MeshElementonsurfaceEnum + syn keyword cConstant MeshVertexonbedEnum + syn keyword cConstant MeshVertexonsurfaceEnum +-syn keyword cConstant MeshElements2dEnum +-syn keyword cConstant MeshElementsEnum +-syn keyword cConstant MeshEdgesEnum ++syn keyword cConstant MeshXEnum + syn keyword cConstant MeshYEnum + syn keyword cConstant MeshZEnum +-syn keyword cConstant MeshXEnum +-syn keyword cConstant ConstraintsEnum +-syn keyword cConstant LoadsEnum +-syn keyword cConstant MaterialsEnum +-syn keyword cConstant NodesEnum +-syn keyword cConstant ParametersEnum +-syn keyword cConstant VerticesEnum +-syn keyword cConstant ResultsEnum ++syn keyword cConstant MiscellaneousNameEnum ++syn keyword cConstant PrognosticHydrostaticAdjustmentEnum ++syn keyword cConstant PrognosticPenaltyFactorEnum ++syn keyword cConstant PrognosticSpcthicknessEnum ++syn keyword cConstant PrognosticStabilizationEnum ++syn keyword cConstant PrognosticVertexPairingEnum ++syn keyword cConstant QmuIsdakotaEnum ++syn keyword cConstant QmuMassFluxSegmentsEnum ++syn keyword cConstant QmuNumberofpartitionsEnum ++syn keyword cConstant QmuNumberofresponsesEnum ++syn keyword cConstant QmuPartitionEnum ++syn keyword cConstant QmuResponsedescriptorsEnum ++syn keyword cConstant QmuVariabledescriptorsEnum ++syn keyword cConstant RiftsNumriftsEnum ++syn keyword cConstant RiftsRiftstructEnum ++syn keyword cConstant SettingsIoGatherEnum ++syn keyword cConstant SettingsLowmemEnum ++syn keyword cConstant SettingsOutputFrequencyEnum ++syn keyword cConstant SettingsResultsAsPatchesEnum ++syn keyword cConstant SettingsWaitonlockEnum ++syn keyword cConstant SteadystateMaxiterEnum ++syn keyword cConstant SteadystateNumRequestedOutputsEnum ++syn keyword cConstant SteadystateReltolEnum ++syn keyword cConstant SteadystateRequestedOutputsEnum ++syn keyword cConstant SurfaceEnum ++syn keyword cConstant SurfaceforcingsAblationRateEnum ++syn keyword cConstant SurfaceforcingsAccumulationRateEnum ++syn keyword cConstant SurfaceforcingsMassBalanceEnum ++syn keyword cConstant ThermalMaxiterEnum ++syn keyword cConstant ThermalPenaltyFactorEnum ++syn keyword cConstant ThermalPenaltyLockEnum ++syn keyword cConstant ThermalPenaltyThresholdEnum ++syn keyword cConstant ThermalSpctemperatureEnum ++syn keyword cConstant ThermalStabilizationEnum ++syn keyword cConstant ThicknessEnum ++syn keyword cConstant TimesteppingCflCoefficientEnum ++syn keyword cConstant TimesteppingFinalTimeEnum ++syn keyword cConstant TimesteppingTimeAdaptEnum ++syn keyword cConstant TimesteppingTimeStepEnum ++syn keyword cConstant TransientIsdiagnosticEnum ++syn keyword cConstant TransientIsgroundinglineEnum ++syn keyword cConstant TransientIsprognosticEnum ++syn keyword cConstant TransientIsthermalEnum ++syn keyword cConstant TransientNumRequestedOutputsEnum ++syn keyword cConstant TransientRequestedOutputsEnum + syn keyword cConstant SolutionTypeEnum + syn keyword cConstant AnalysisTypeEnum + syn keyword cConstant ConfigurationTypeEnum ++syn keyword cConstant AdjointBalancethicknessAnalysisEnum ++syn keyword cConstant AdjointHorizAnalysisEnum ++syn keyword cConstant AdjointSolutionEnum + syn keyword cConstant AnalysisCounterEnum ++syn keyword cConstant BalancethicknessAnalysisEnum ++syn keyword cConstant BalancethicknessSolutionEnum ++syn keyword cConstant BedSlopeAnalysisEnum ++syn keyword cConstant BedSlopeSolutionEnum ++syn keyword cConstant BedSlopeXAnalysisEnum ++syn keyword cConstant BedSlopeYAnalysisEnum ++syn keyword cConstant DiagnosticHorizAnalysisEnum ++syn keyword cConstant DiagnosticHutterAnalysisEnum + syn keyword cConstant DiagnosticSolutionEnum +-syn keyword cConstant DiagnosticHorizAnalysisEnum + syn keyword cConstant DiagnosticVertAnalysisEnum +-syn keyword cConstant DiagnosticHutterAnalysisEnum +-syn keyword cConstant AdjointSolutionEnum +-syn keyword cConstant AdjointHorizAnalysisEnum +-syn keyword cConstant AdjointBalancethicknessAnalysisEnum +-syn keyword cConstant ThermalSolutionEnum +-syn keyword cConstant ThermalAnalysisEnum ++syn keyword cConstant EnthalpyAnalysisEnum ++syn keyword cConstant EnthalpySolutionEnum ++syn keyword cConstant FlaimAnalysisEnum ++syn keyword cConstant FlaimSolutionEnum ++syn keyword cConstant HydrologyAnalysisEnum + syn keyword cConstant HydrologySolutionEnum +-syn keyword cConstant HydrologyAnalysisEnum +-syn keyword cConstant TransientSolutionEnum +-syn keyword cConstant BedSlopeSolutionEnum +-syn keyword cConstant BedSlopeAnalysisEnum ++syn keyword cConstant MeltingAnalysisEnum ++syn keyword cConstant NoneAnalysisEnum ++syn keyword cConstant PrognosticAnalysisEnum ++syn keyword cConstant PrognosticSolutionEnum ++syn keyword cConstant SteadystateSolutionEnum ++syn keyword cConstant SurfaceSlopeAnalysisEnum + syn keyword cConstant SurfaceSlopeSolutionEnum +-syn keyword cConstant SurfaceSlopeAnalysisEnum +-syn keyword cConstant BedSlopeXAnalysisEnum +-syn keyword cConstant BedSlopeYAnalysisEnum + syn keyword cConstant SurfaceSlopeXAnalysisEnum + syn keyword cConstant SurfaceSlopeYAnalysisEnum +-syn keyword cConstant BalancethicknessSolutionEnum +-syn keyword cConstant BalancethicknessAnalysisEnum +-syn keyword cConstant PrognosticSolutionEnum +-syn keyword cConstant PrognosticAnalysisEnum +-syn keyword cConstant MeltingAnalysisEnum +-syn keyword cConstant SteadystateSolutionEnum +-syn keyword cConstant FlaimSolutionEnum +-syn keyword cConstant FlaimAnalysisEnum +-syn keyword cConstant NoneAnalysisEnum ++syn keyword cConstant ThermalAnalysisEnum ++syn keyword cConstant ThermalSolutionEnum ++syn keyword cConstant TransientSolutionEnum + syn keyword cConstant ApproximationEnum + syn keyword cConstant HutterApproximationEnum + syn keyword cConstant MacAyealApproximationEnum +@@ -748,133 +746,164 @@ + syn keyword cConstant PattynApproximationEnum + syn keyword cConstant PattynStokesApproximationEnum + syn keyword cConstant StokesApproximationEnum ++syn keyword cConstant ConstraintsEnum ++syn keyword cConstant LoadsEnum ++syn keyword cConstant MaterialsEnum ++syn keyword cConstant NodesEnum ++syn keyword cConstant ParametersEnum ++syn keyword cConstant VerticesEnum ++syn keyword cConstant ResultsEnum ++syn keyword cConstant BoolInputEnum ++syn keyword cConstant BoolParamEnum ++syn keyword cConstant ControlInputEnum ++syn keyword cConstant DatasetInputEnum ++syn keyword cConstant DofIndexingEnum ++syn keyword cConstant DoubleInputEnum ++syn keyword cConstant DoubleMatArrayParamEnum ++syn keyword cConstant DoubleMatParamEnum ++syn keyword cConstant DoubleParamEnum ++syn keyword cConstant DoubleVecParamEnum ++syn keyword cConstant ElementEnum ++syn keyword cConstant ElementResultEnum ++syn keyword cConstant ExternalResultEnum ++syn keyword cConstant FileParamEnum + syn keyword cConstant HookEnum +-syn keyword cConstant SegmentEnum +-syn keyword cConstant ElementEnum +-syn keyword cConstant DofIndexingEnum +-syn keyword cConstant PentaEnum +-syn keyword cConstant TriaEnum +-syn keyword cConstant NodeEnum +-syn keyword cConstant VertexEnum + syn keyword cConstant IcefrontEnum +-syn keyword cConstant NumericalfluxEnum +-syn keyword cConstant PengridEnum +-syn keyword cConstant PenpairEnum +-syn keyword cConstant RiftfrontEnum +-syn keyword cConstant SegmentRiftfrontEnum ++syn keyword cConstant InputEnum ++syn keyword cConstant IntInputEnum ++syn keyword cConstant IntParamEnum ++syn keyword cConstant IntVecParamEnum + syn keyword cConstant MacAyeal2dIceFrontEnum + syn keyword cConstant MacAyeal3dIceFrontEnum +-syn keyword cConstant PattynIceFrontEnum +-syn keyword cConstant StokesIceFrontEnum + syn keyword cConstant MaticeEnum + syn keyword cConstant MatparEnum +-syn keyword cConstant InputEnum +-syn keyword cConstant BoolInputEnum +-syn keyword cConstant DoubleInputEnum +-syn keyword cConstant IntInputEnum ++syn keyword cConstant NodeEnum ++syn keyword cConstant NumericalfluxEnum ++syn keyword cConstant ParamEnum ++syn keyword cConstant PattynIceFrontEnum ++syn keyword cConstant PengridEnum ++syn keyword cConstant PenpairEnum ++syn keyword cConstant PentaEnum + syn keyword cConstant PentaVertexInputEnum +-syn keyword cConstant TriaVertexInputEnum +-syn keyword cConstant ControlInputEnum +-syn keyword cConstant ParamEnum +-syn keyword cConstant BoolParamEnum +-syn keyword cConstant DoubleMatParamEnum +-syn keyword cConstant DoubleMatArrayParamEnum +-syn keyword cConstant DoubleParamEnum +-syn keyword cConstant DoubleVecParamEnum +-syn keyword cConstant IntParamEnum +-syn keyword cConstant IntVecParamEnum +-syn keyword cConstant FileParamEnum + syn keyword cConstant PetscMatParamEnum + syn keyword cConstant PetscVecParamEnum ++syn keyword cConstant RiftfrontEnum ++syn keyword cConstant SegmentEnum ++syn keyword cConstant SegmentRiftfrontEnum ++syn keyword cConstant SpcDynamicEnum ++syn keyword cConstant SpcStaticEnum ++syn keyword cConstant SpcTransientEnum ++syn keyword cConstant StokesIceFrontEnum + syn keyword cConstant StringArrayParamEnum + syn keyword cConstant StringParamEnum +-syn keyword cConstant ElementResultEnum +-syn keyword cConstant ExternalResultEnum +-syn keyword cConstant SpcStaticEnum +-syn keyword cConstant SpcTransientEnum +-syn keyword cConstant IceSheetEnum +-syn keyword cConstant IceShelfEnum +-syn keyword cConstant WaterEnum ++syn keyword cConstant TriaEnum ++syn keyword cConstant TriaVertexInputEnum ++syn keyword cConstant VertexEnum ++syn keyword cConstant AirEnum + syn keyword cConstant IceEnum +-syn keyword cConstant AirEnum + syn keyword cConstant MelangeEnum ++syn keyword cConstant WaterEnum ++syn keyword cConstant ClosedEnum + syn keyword cConstant FreeEnum + syn keyword cConstant OpenEnum +-syn keyword cConstant ClosedEnum ++syn keyword cConstant AdjointpEnum + syn keyword cConstant AdjointxEnum + syn keyword cConstant AdjointyEnum + syn keyword cConstant AdjointzEnum +-syn keyword cConstant AdjointpEnum + syn keyword cConstant BedSlopeXEnum + syn keyword cConstant BedSlopeYEnum + syn keyword cConstant BoundaryEnum + syn keyword cConstant ConstantEnum + syn keyword cConstant ConvergedEnum ++syn keyword cConstant ExtToIuEnum + syn keyword cConstant FillEnum + syn keyword cConstant FractionIncrementEnum + syn keyword cConstant FrictionEnum ++syn keyword cConstant GroundinglineMeltingRateEnum + syn keyword cConstant InternalEnum + syn keyword cConstant IuToExtEnum +-syn keyword cConstant ExtToIuEnum + syn keyword cConstant MassFluxEnum +-syn keyword cConstant ThicknessAbsMisfitEnum +-syn keyword cConstant SurfaceAbsVelMisfitEnum +-syn keyword cConstant SurfaceRelVelMisfitEnum +-syn keyword cConstant SurfaceLogVelMisfitEnum +-syn keyword cConstant SurfaceLogVxVyMisfitEnum +-syn keyword cConstant SurfaceAverageVelMisfitEnum + syn keyword cConstant MaxPenetrationEnum + syn keyword cConstant MeltingOffsetEnum +-syn keyword cConstant GroundinglineMeltingRateEnum + syn keyword cConstant MisfitEnum + syn keyword cConstant NumberNodeToElementConnectivityEnum + syn keyword cConstant PressureEnum + syn keyword cConstant PressurePicardEnum +-syn keyword cConstant VelocityEnum + syn keyword cConstant QmuPressureEnum ++syn keyword cConstant QmuVxEnum ++syn keyword cConstant QmuVyEnum ++syn keyword cConstant QmuVzEnum ++syn keyword cConstant QmuThicknessEnum ++syn keyword cConstant QmuBedEnum ++syn keyword cConstant QmuSurfaceEnum ++syn keyword cConstant QmuMeltingEnum + syn keyword cConstant ResetPenaltiesEnum + syn keyword cConstant SegmentOnIceShelfEnum ++syn keyword cConstant SurfaceAbsVelMisfitEnum + syn keyword cConstant SurfaceAreaEnum ++syn keyword cConstant SurfaceAverageVelMisfitEnum ++syn keyword cConstant SurfaceLogVelMisfitEnum ++syn keyword cConstant SurfaceLogVxVyMisfitEnum ++syn keyword cConstant SurfaceRelVelMisfitEnum + syn keyword cConstant SurfaceSlopeXEnum + syn keyword cConstant SurfaceSlopeYEnum + syn keyword cConstant TemperatureEnum ++syn keyword cConstant TemperatureOldEnum + syn keyword cConstant TemperaturePicardEnum +-syn keyword cConstant TemperatureOldEnum ++syn keyword cConstant ThicknessAbsMisfitEnum + syn keyword cConstant TypeEnum + syn keyword cConstant VelEnum ++syn keyword cConstant VelocityEnum + syn keyword cConstant VxAverageEnum + syn keyword cConstant VxEnum + syn keyword cConstant VxPicardEnum +-syn keyword cConstant QmuVxEnum + syn keyword cConstant VyAverageEnum + syn keyword cConstant VyEnum + syn keyword cConstant VyPicardEnum +-syn keyword cConstant QmuVyEnum + syn keyword cConstant VzEnum +-syn keyword cConstant VzPicardEnum + syn keyword cConstant VzMacAyealEnum + syn keyword cConstant VzPattynEnum ++syn keyword cConstant VzPicardEnum + syn keyword cConstant VzStokesEnum +-syn keyword cConstant QmuVzEnum ++syn keyword cConstant VxMeshEnum ++syn keyword cConstant VyMeshEnum ++syn keyword cConstant VzMeshEnum ++syn keyword cConstant EnthalpyEnum ++syn keyword cConstant EnthalpyPicardEnum ++syn keyword cConstant ThicknessAbsGradientEnum ++syn keyword cConstant StepResponsesEnum ++syn keyword cConstant IntMatParamEnum ++syn keyword cConstant RheologyBbarAbsGradientEnum ++syn keyword cConstant DragCoefficientAbsGradientEnum ++syn keyword cConstant TransientInputEnum ++syn keyword cConstant OutputfilenameEnum ++syn keyword cConstant WaterfractionEnum ++syn keyword cConstant WatercolumnEnum ++syn keyword cConstant BasalFrictionEnum ++syn keyword cConstant ViscousHeatingEnum ++syn keyword cConstant QmuTemperatureEnum ++syn keyword cConstant HydrologyWaterVxEnum ++syn keyword cConstant HydrologyWaterVyEnum ++syn keyword cConstant IceVolumeEnum + syn keyword cConstant P0Enum + syn keyword cConstant P1Enum + syn keyword cConstant P1DGEnum +-syn keyword cConstant DoubleElementResultEnum +-syn keyword cConstant TriaVertexElementResultEnum +-syn keyword cConstant PentaVertexElementResultEnum + syn keyword cConstant BoolElementResultEnum + syn keyword cConstant BoolExternalResultEnum ++syn keyword cConstant DoubleElementResultEnum + syn keyword cConstant DoubleExternalResultEnum ++syn keyword cConstant DoubleMatExternalResultEnum + syn keyword cConstant DoubleVecExternalResultEnum +-syn keyword cConstant DoubleMatExternalResultEnum + syn keyword cConstant IntExternalResultEnum +-syn keyword cConstant PetscVecExternalResultEnum +-syn keyword cConstant StringExternalResultEnum + syn keyword cConstant JEnum + syn keyword cConstant PatchEnum ++syn keyword cConstant PatchNodesEnum + syn keyword cConstant PatchVerticesEnum +-syn keyword cConstant PatchNodesEnum ++syn keyword cConstant PentaVertexElementResultEnum ++syn keyword cConstant PetscVecExternalResultEnum ++syn keyword cConstant StringExternalResultEnum + syn keyword cConstant TimeEnum ++syn keyword cConstant TriaVertexElementResultEnum + syn keyword cConstant WaterColumnOldEnum + syn keyword cConstant MinVelEnum + syn keyword cConstant MaxVelEnum +@@ -890,39 +919,41 @@ + syn keyword cConstant RelativeEnum + syn keyword cConstant AbsoluteEnum + syn keyword cConstant IncrementalEnum ++syn keyword cConstant AgressiveMigrationEnum + syn keyword cConstant NoneEnum +-syn keyword cConstant AgressiveMigrationEnum + syn keyword cConstant SoftMigrationEnum + syn keyword cConstant StokesSolverEnum +-syn keyword cConstant IntersectEnum ++syn keyword cConstant AdjointEnum + syn keyword cConstant ColinearEnum +-syn keyword cConstant SeparateEnum +-syn keyword cConstant AdjointEnum +-syn keyword cConstant GradientEnum ++syn keyword cConstant ControlSteadyEnum ++syn keyword cConstant FsetEnum + syn keyword cConstant Gradient1Enum + syn keyword cConstant Gradient2Enum + syn keyword cConstant Gradient3Enum ++syn keyword cConstant GradientEnum ++syn keyword cConstant GroundinglineMigrationEnum ++syn keyword cConstant GsetEnum ++syn keyword cConstant IndexEnum ++syn keyword cConstant IndexedEnum ++syn keyword cConstant IntersectEnum ++syn keyword cConstant NodalEnum + syn keyword cConstant OldGradientEnum +-syn keyword cConstant ControlSteadyEnum + syn keyword cConstant OutputFilePointerEnum ++syn keyword cConstant PetscOptionsAnalysesEnum ++syn keyword cConstant PetscOptionsStringsEnum + syn keyword cConstant QmuErrNameEnum + syn keyword cConstant QmuInNameEnum + syn keyword cConstant QmuOutNameEnum +-syn keyword cConstant IndexedEnum + syn keyword cConstant RegularEnum +-syn keyword cConstant IndexEnum + syn keyword cConstant ScaledEnum +-syn keyword cConstant NodalEnum ++syn keyword cConstant SeparateEnum ++syn keyword cConstant SsetEnum + syn keyword cConstant VerboseEnum +-syn keyword cConstant PetscOptionsStringsEnum +-syn keyword cConstant PetscOptionsAnalysesEnum +-syn keyword cConstant GsetEnum +-syn keyword cConstant FsetEnum +-syn keyword cConstant SsetEnum +-syn keyword cConstant GroundinglineMigrationEnum + syn keyword cConstant TriangleInterpEnum + syn keyword cConstant BilinearInterpEnum + syn keyword cConstant NearestInterpEnum ++syn keyword cConstant XYEnum ++syn keyword cConstant XYZPEnum + syn keyword cConstant OptionEnum + syn keyword cConstant OptionCellEnum + syn keyword cConstant OptionCharEnum +@@ -931,30 +962,6 @@ + syn keyword cConstant OptionLogicalEnum + syn keyword cConstant PatersonEnum + syn keyword cConstant ArrheniusEnum +-syn keyword cConstant VxMeshEnum +-syn keyword cConstant VyMeshEnum +-syn keyword cConstant VzMeshEnum +-syn keyword cConstant EnthalpySolutionEnum +-syn keyword cConstant EnthalpyAnalysisEnum +-syn keyword cConstant EnthalpyEnum +-syn keyword cConstant EnthalpyPicardEnum +-syn keyword cConstant ThicknessAbsGradientEnum +-syn keyword cConstant DatasetInputEnum +-syn keyword cConstant StepResponsesEnum +-syn keyword cConstant IntMatParamEnum +-syn keyword cConstant RheologyBbarAbsGradientEnum +-syn keyword cConstant DragCoefficientAbsGradientEnum +-syn keyword cConstant TransientInputEnum +-syn keyword cConstant OutputfilenameEnum +-syn keyword cConstant WaterfractionEnum +-syn keyword cConstant WatercolumnEnum +-syn keyword cConstant BasalFrictionEnum +-syn keyword cConstant ViscousHeatingEnum +-syn keyword cConstant QmuTemperatureEnum +-syn keyword cConstant HydrologyWaterVxEnum +-syn keyword cConstant HydrologyWaterVyEnum +-syn keyword cConstant SpcDynamicEnum +-syn keyword cConstant IceVolumeEnum + "ISSM's Enums end + """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" + Index: /issm/oecreview/Archive/10937-10976/ISSM-10974-10975.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10974-10975.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10974-10975.diff (revision 10979) @@ -0,0 +1,234 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 10975) +@@ -141,7 +141,7 @@ + SettingsIoGatherEnum, + SettingsLowmemEnum, + SettingsOutputFrequencyEnum, +- SettingsResultsOnVerticesEnum, ++ SettingsResultsAsPatchesEnum, + SettingsWaitonlockEnum, + SteadystateMaxiterEnum, + SteadystateNumRequestedOutputsEnum, +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/Container/Elements.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/Container/Elements.cpp (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/Container/Elements.cpp (revision 10975) +@@ -172,16 +172,16 @@ + double *vector_serial= NULL; + Vec vector = NULL; + bool io_gather; +- bool results_on_vertices; ++ bool results_as_patches; + int numberofvertices; + int numberofresults; + + /*Recover parameters: */ + parameters->FindParam(&io_gather,SettingsIoGatherEnum); +- parameters->FindParam(&results_on_vertices,SettingsResultsOnVerticesEnum); ++ parameters->FindParam(&results_as_patches,SettingsResultsAsPatchesEnum); + parameters->FindParam(&numberofvertices,MeshNumberofverticesEnum); + +- if(results_on_vertices){ ++ if(!results_as_patches){ + /*No patch here, we prepare vectors*/ + + /*OK, see what the first element of this partition has in stock (this is common to all partitions)*/ +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 10975) +@@ -143,7 +143,7 @@ + else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum; + else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum; + else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum; +- else if (strcmp(name,"SettingsResultsOnVertices")==0) return SettingsResultsOnVerticesEnum; ++ else if (strcmp(name,"SettingsResultsAsPatches")==0) return SettingsResultsAsPatchesEnum; + else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum; + else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; + else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 10975) +@@ -145,7 +145,7 @@ + case SettingsIoGatherEnum : return "SettingsIoGather"; + case SettingsLowmemEnum : return "SettingsLowmem"; + case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency"; +- case SettingsResultsOnVerticesEnum : return "SettingsResultsOnVertices"; ++ case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches"; + case SettingsWaitonlockEnum : return "SettingsWaitonlock"; + case SteadystateMaxiterEnum : return "SteadystateMaxiter"; + case SteadystateNumRequestedOutputsEnum : return "SteadystateNumRequestedOutputs"; +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 10975) +@@ -70,7 +70,7 @@ + parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofelementsEnum)); + parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofverticesEnum)); + parameters->AddObject(iomodel->CopyConstantObject(SettingsIoGatherEnum)); +- parameters->AddObject(iomodel->CopyConstantObject(SettingsResultsOnVerticesEnum)); ++ parameters->AddObject(iomodel->CopyConstantObject(SettingsResultsAsPatchesEnum)); + parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIsdiagnosticEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIsprognosticEnum)); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/ad/validation/Update/update.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/ad/validation/Update/update.m (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/ad/validation/Update/update.m (revision 10975) +@@ -4,7 +4,6 @@ + md=setmask(md,'all',''); + md=parameterize(md,'SquareShelfConstrained.par'); + md=setflowequation(md,'macayeal','all'); +-md.settings.results_on_vertices=1; + md.cluster=generic('name',oshostname(),'np',3); + md.cluster.executionpath=[issmtier() '/src/ad/validation/Validation/']; + +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m (revision 10975) +@@ -1,11 +0,0 @@ +-function macro=SettingsResultsOnVerticesEnum() +-%SETTINGSRESULTSONVERTICESENUM - Enum of SettingsResultsOnVertices +-% +-% WARNING: DO NOT MODIFY THIS FILE +-% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +-% Please read src/c/EnumDefinitions/README for more information +-% +-% Usage: +-% macro=SettingsResultsOnVerticesEnum() +- +-macro=StringToEnum('SettingsResultsOnVertices'); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuBedEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuBedEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuBedEnum.m (revision 10975) +@@ -0,0 +1,11 @@ ++function macro=QmuBedEnum() ++%QMUBEDENUM - Enum of QmuBed ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=QmuBedEnum() ++ ++macro=StringToEnum('QmuBed'); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuMeltingEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuMeltingEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuMeltingEnum.m (revision 10975) +@@ -0,0 +1,11 @@ ++function macro=QmuMeltingEnum() ++%QMUMELTINGENUM - Enum of QmuMelting ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=QmuMeltingEnum() ++ ++macro=StringToEnum('QmuMelting'); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuThicknessEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuThicknessEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuThicknessEnum.m (revision 10975) +@@ -0,0 +1,11 @@ ++function macro=QmuThicknessEnum() ++%QMUTHICKNESSENUM - Enum of QmuThickness ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=QmuThicknessEnum() ++ ++macro=StringToEnum('QmuThickness'); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m (revision 10975) +@@ -0,0 +1,11 @@ ++function macro=SettingsResultsAsPatchesEnum() ++%SETTINGSRESULTSASPATCHESENUM - Enum of SettingsResultsAsPatches ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=SettingsResultsAsPatchesEnum() ++ ++macro=StringToEnum('SettingsResultsAsPatches'); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuSurfaceEnum.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuSurfaceEnum.m (revision 0) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/enum/QmuSurfaceEnum.m (revision 10975) +@@ -0,0 +1,11 @@ ++function macro=QmuSurfaceEnum() ++%QMUSURFACEENUM - Enum of QmuSurface ++% ++% WARNING: DO NOT MODIFY THIS FILE ++% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh ++% Please read src/c/EnumDefinitions/README for more information ++% ++% Usage: ++% macro=QmuSurfaceEnum() ++ ++macro=StringToEnum('QmuSurface'); +Index: /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m (revision 10974) ++++ /proj/ice/larour/issm-uci/trunk-jpl/src/m/classes/settings.m (revision 10975) +@@ -7,7 +7,7 @@ + properties (SetAccess=public) + io_gather = 0; + lowmem = 0; +- results_on_vertices = 0; ++ results_as_patches = 0; + output_frequency = 0; + waitonlock = 0; + end +@@ -38,6 +38,9 @@ + %results frequency by default every step + obj.output_frequency=1; + ++ %do not use patches by default (difficult to plot) ++ obj.results_as_patches=0; ++ + %this option can be activated to load automatically the results + %onto the model after a parallel run by waiting for the lock file + %N minutes that is generated once the solution has converged +@@ -48,7 +51,7 @@ + + checkfield(md,'settings.io_gather','numel',1,'values',[0 1]); + checkfield(md,'settings.lowmem','numel',1,'values',[0 1]); +- checkfield(md,'settings.results_on_vertices','numel',1,'values',[0 1]); ++ checkfield(md,'settings.results_as_patches','numel',1,'values',[0 1]); + checkfield(md,'settings.output_frequency','numel',1,'>=',1); + checkfield(md,'settings.waitonlock','numel',1); + +@@ -58,7 +61,7 @@ + + fielddisplay(obj,'io_gather','I/O gathering strategy for result outputs (default 1)'); + fielddisplay(obj,'lowmem','is the memory limited ? (0 or 1)'); +- fielddisplay(obj,'results_on_vertices','provide results on vertices instead of patch (0 or 1)'); ++ fielddisplay(obj,'results_as_patches','provide results as patches for each element (0 or 1)'); + fielddisplay(obj,'output_frequency','frequency at which results are saved in all solutions with multiple time_steps'); + fielddisplay(obj,'waitonlock','maximum number of minutes to wait for batch results, or return 0'); + +@@ -66,7 +69,7 @@ + function marshall(obj,fid) % {{{ + WriteData(fid,'object',obj,'fieldname','io_gather','format','Boolean'); + WriteData(fid,'object',obj,'fieldname','lowmem','format','Boolean'); +- WriteData(fid,'object',obj,'fieldname','results_on_vertices','format','Boolean'); ++ WriteData(fid,'object',obj,'fieldname','results_as_patches','format','Boolean'); + WriteData(fid,'object',obj,'fieldname','output_frequency','format','Integer'); + WriteData(fid,'object',obj,'fieldname','waitonlock','format','Boolean'); + end % }}} Index: /issm/oecreview/Archive/10937-10976/ISSM-10975-10976.diff =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-10975-10976.diff (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-10975-10976.diff (revision 10979) @@ -0,0 +1,7652 @@ +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test320.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test320.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test320.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test401.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test401.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test401.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test222.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test222.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test222.m (revision 10976) +@@ -16,34 +16,34 @@ + 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,... + 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test303.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test303.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test303.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test205.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test205.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test205.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test124.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test124.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test124.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test107.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test107.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test107.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test622.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test622.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test622.m (revision 10976) +@@ -24,8 +24,8 @@ + field_names ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'}; + field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Gradient1),... ++ (md.results.BalancethicknessSolution.Gradient1),... + md.results.BalancethicknessSolution.J,... +- PatchToVec(md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... +- PatchToVec(md.results.BalancethicknessSolution.Thickness) ++ (md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... ++ (md.results.BalancethicknessSolution.Thickness) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test605.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test605.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test605.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test524.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test524.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test524.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test443.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test443.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test443.m (revision 10976) +@@ -11,9 +11,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-06,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test264.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test264.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test264.m (revision 10976) +@@ -13,12 +13,12 @@ + 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).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(2).Temperature),... +- PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(3).Temperature),... +- PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(4).Temperature),... +- PatchToVec(md.results.ThermalSolution(4).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(2).Temperature),... ++ (md.results.ThermalSolution(2).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(3).Temperature),... ++ (md.results.ThermalSolution(3).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(4).Temperature),... ++ (md.results.ThermalSolution(4).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test345.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test345.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test345.m (revision 10976) +@@ -11,25 +11,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test507.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test507.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test507.m (revision 10976) +@@ -9,18 +9,18 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test409.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test409.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test409.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test328.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test328.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test328.m (revision 10976) +@@ -9,25 +9,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test247.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test247.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test247.m (revision 10976) +@@ -13,34 +13,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1202.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1202.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1202.m (revision 10976) +@@ -13,8 +13,8 @@ + md=solve(md,DiagnosticSolutionEnum); + + %plot results +-vx=PatchToVec(md.results.DiagnosticSolution.Vx); +-vy=PatchToVec(md.results.DiagnosticSolution.Vy); ++vx=(md.results.DiagnosticSolution.Vx); ++vy=(md.results.DiagnosticSolution.Vy); + + plotmodel(md,'data',vx,'contourlevels',{0,20,40,60,60,100,120,140,160,180,-20,-40,-60,-80,-100,-120,-140,-160,-180}, ... + 'contourcolor','k') +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1104.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1104.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1104.m (revision 10976) +@@ -39,9 +39,9 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + + plotmodel(md,'data',vx,'data',vy,'data',vz,'layer#all',md.mesh.numberoflayers) +@@ -68,8 +68,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test410.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test410.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test410.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test312.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test312.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test312.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test133.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test133.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test133.m (revision 10976) +@@ -13,5 +13,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test214.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test214.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test214.m (revision 10976) +@@ -10,10 +10,10 @@ + 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).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(2).Temperature),... +- PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(3).Temperature),... +- PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(2).Temperature),... ++ (md.results.ThermalSolution(2).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(3).Temperature),... ++ (md.results.ThermalSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test116.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test116.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test116.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test452.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test452.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test452.m (revision 10976) +@@ -28,16 +28,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-11,1e-11,1e-11,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test614.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test614.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test614.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test516.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test516.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test516.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-08 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test256.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test256.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test256.m (revision 10976) +@@ -29,36 +29,36 @@ + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test418.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test418.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test418.m (revision 10976) +@@ -15,34 +15,34 @@ + 1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,... + 1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test337.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test337.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test337.m (revision 10976) +@@ -23,11 +23,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test239.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test239.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test239.m (revision 10976) +@@ -9,9 +9,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test240.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test240.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test240.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-06,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test321.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test321.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test321.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test402.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test402.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test402.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test223.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test223.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test223.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyBbar),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyBbar),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test304.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test304.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test304.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test206.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test206.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test206.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test125.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test125.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test125.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test108.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test108.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test108.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test623.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test623.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test623.m (revision 10976) +@@ -25,8 +25,8 @@ + field_names ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'}; + field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Gradient1),... ++ (md.results.BalancethicknessSolution.Gradient1),... + md.results.BalancethicknessSolution.J,... +- PatchToVec(md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... +- PatchToVec(md.results.BalancethicknessSolution.Thickness) ++ (md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... ++ (md.results.BalancethicknessSolution.Thickness) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test606.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test606.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test606.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test525.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test525.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test525.m (revision 10976) +@@ -25,14 +25,14 @@ + 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={... +- PatchToVec(md.results.SteadystateSolution.Gradient1),... ++ (md.results.SteadystateSolution.Gradient1),... + md.results.SteadystateSolution.J,... +- PatchToVec(md.results.SteadystateSolution.FrictionCoefficient),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) ++ (md.results.SteadystateSolution.FrictionCoefficient),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test444.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test444.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test444.m (revision 10976) +@@ -11,9 +11,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-06,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test265.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test265.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test265.m (revision 10976) +@@ -19,44 +19,44 @@ + 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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vz),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).Temperature),... +- PatchToVec(md.results.TransientSolution(4).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vz),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).Temperature),... ++ (md.results.TransientSolution(4).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test346.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test346.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test346.m (revision 10976) +@@ -11,25 +11,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test508.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test508.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test508.m (revision 10976) +@@ -9,18 +9,18 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test248.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test248.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test248.m (revision 10976) +@@ -16,34 +16,34 @@ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test329.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test329.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test329.m (revision 10976) +@@ -14,34 +14,34 @@ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1203.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1203.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1203.m (revision 10976) +@@ -16,8 +16,8 @@ + md.cluster=generic('name',oshostname(),'np',8); + md=solve(md,DiagnosticSolutionEnum); + +-vx=PatchToVec(md.results.DiagnosticSolution.Vx); +-vy=PatchToVec(md.results.DiagnosticSolution.Vy); ++vx=(md.results.DiagnosticSolution.Vx); ++vy=(md.results.DiagnosticSolution.Vy); + + %plot results + plotmodel(md,'data',vx,'contourlevels',{0,20,40,60,80,100,-20,-40,-60,-80,-100},... +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1105.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1105.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1105.m (revision 10976) +@@ -65,9 +65,9 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + minvx(i)=min(vx(end-md.mesh.numberofvertices2d+1:end)); + maxvx(i)=max(vx(end-md.mesh.numberofvertices2d+1:end)); +@@ -152,8 +152,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test330.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test330.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test330.m (revision 10976) +@@ -14,34 +14,34 @@ + 5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-10, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test411.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test411.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test411.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test232.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test232.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test232.m (revision 10976) +@@ -17,8 +17,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-11,1e-11,1e-11,1e-11}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test313.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test313.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test313.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test215.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test215.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test215.m (revision 10976) +@@ -9,25 +9,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test134.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test134.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test134.m (revision 10976) +@@ -13,5 +13,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test117.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test117.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test117.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution(1).Temperature),... +- PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test453.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test453.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test453.m (revision 10976) +@@ -26,16 +26,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test615.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test615.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test615.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test517.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test517.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test517.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test419.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test419.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test419.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test338.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test338.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test338.m (revision 10976) +@@ -23,11 +23,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test257.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test257.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test257.m (revision 10976) +@@ -29,36 +29,36 @@ + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test101.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test101.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test101.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test501.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test501.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test501.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test420.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test420.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test420.m (revision 10976) +@@ -11,11 +11,11 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-10,1e-10,1e-09,1e-10,1e-13,1e-10,1e-06}; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test403.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test403.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test403.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test322.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test322.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test322.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test241.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test241.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test241.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test305.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test305.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test305.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test224.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test224.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test224.m (revision 10976) +@@ -23,11 +23,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyBbar),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyBbar),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test126.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test126.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test126.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test207.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test207.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test207.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test109.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test109.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test109.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test624.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test624.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test624.m (revision 10976) +@@ -25,8 +25,8 @@ + field_names ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'}; + field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Gradient1),... ++ (md.results.BalancethicknessSolution.Gradient1),... + md.results.BalancethicknessSolution.J,... +- PatchToVec(md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... +- PatchToVec(md.results.BalancethicknessSolution.Thickness) ++ (md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... ++ (md.results.BalancethicknessSolution.Thickness) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test445.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test445.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test445.m (revision 10976) +@@ -25,11 +25,11 @@ + %test different grounding line dynamics + md.groundingline.migration='AgressiveMigration'; + md=solve(md,TransientSolutionEnum); +-element_on_iceshelf_agressive=PatchToVec(md.results.TransientSolution.MaskElementonfloatingice); ++element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice); + + md.groundingline.migration='SoftMigration'; + md=solve(md,TransientSolutionEnum); +-element_on_iceshelf_soft=PatchToVec(md.results.TransientSolution.MaskElementonfloatingice); ++element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice); + + %Fields and tolerances to track changes + field_names ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft'}; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test526.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test526.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test526.m (revision 10976) +@@ -25,14 +25,14 @@ + 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={... +- PatchToVec(md.results.SteadystateSolution.Gradient1),... ++ (md.results.SteadystateSolution.Gradient1),... + md.results.SteadystateSolution.J,... +- PatchToVec(md.results.SteadystateSolution.FrictionCoefficient),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) ++ (md.results.SteadystateSolution.FrictionCoefficient),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test607.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test607.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test607.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test509.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test509.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test509.m (revision 10976) +@@ -11,24 +11,24 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test347.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test347.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test347.m (revision 10976) +@@ -16,34 +16,34 @@ + 1e-12,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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +-% PatchToVec(md.results.TransientSolution(3).Vx),... +-% PatchToVec(md.results.TransientSolution(3).Vy),... +-% PatchToVec(md.results.TransientSolution(3).Vz),... +-% PatchToVec(md.results.TransientSolution(3).Vel),... +-% PatchToVec(md.results.TransientSolution(3).Pressure),... +-% PatchToVec(md.results.TransientSolution(3).Bed),... +-% PatchToVec(md.results.TransientSolution(3).Surface),... +-% PatchToVec(md.results.TransientSolution(3).Thickness),... +-% PatchToVec(md.results.TransientSolution(3).Temperature),... +-% PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++% (md.results.TransientSolution(3).Vx),... ++% (md.results.TransientSolution(3).Vy),... ++% (md.results.TransientSolution(3).Vz),... ++% (md.results.TransientSolution(3).Vel),... ++% (md.results.TransientSolution(3).Pressure),... ++% (md.results.TransientSolution(3).Bed),... ++% (md.results.TransientSolution(3).Surface),... ++% (md.results.TransientSolution(3).Thickness),... ++% (md.results.TransientSolution(3).Temperature),... ++% (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test266.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test266.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test266.m (revision 10976) +@@ -19,44 +19,44 @@ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vz),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).Temperature),... +- PatchToVec(md.results.TransientSolution(4).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vz),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).Temperature),... ++ (md.results.TransientSolution(4).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test249.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test249.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test249.m (revision 10976) +@@ -14,34 +14,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1204.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1204.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1204.m (revision 10976) +@@ -17,29 +17,29 @@ + md=solve(md,DiagnosticSolutionEnum); + + %plot results +-md.initialization.vx=PatchToVec(md.results.DiagnosticSolution.Vx); +-md.initialization.vy=PatchToVec(md.results.DiagnosticSolution.Vy); ++md.initialization.vx=(md.results.DiagnosticSolution.Vx); ++md.initialization.vy=(md.results.DiagnosticSolution.Vy); + + md.timestepping.time_step=1; + md.timestepping.final_time=5000; + md.prognostic.stabilization=1; + md=solve(md,TransientSolutionEnum); + +-plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Vx)) ++plotmodel(md,'data',(md.results.TransientSolution(end).Vx)) + if printingflag, + set(gcf,'Color','w') + printmodel('eisminttrans2vx','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off'); + system(['mv eisminttrans2vx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']); + end + +-plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Vy)) ++plotmodel(md,'data',(md.results.TransientSolution(end).Vy)) + if printingflag, + set(gcf,'Color','w') + printmodel('eisminttrans2vy','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off'); + system(['mv eisminttrans2vy.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceShelf ']); + end + +-plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Thickness)) ++plotmodel(md,'data',(md.results.TransientSolution(end).Thickness)) + if printingflag, + set(gcf,'Color','w') + printmodel('eisminttrans2thickness','png','margin','on','marginsize',25,'frame','off','resolution',2,'hardcopy','off'); +@@ -50,7 +50,7 @@ + field_names ={'Vx','Vy','Thickness'}; + field_tolerances={1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(end).Vx), ... +- PatchToVec(md.results.TransientSolution(end).Vy), ... +- PatchToVec(md.results.TransientSolution(end).Thickness), ... ++ (md.results.TransientSolution(end).Vx), ... ++ (md.results.TransientSolution(end).Vy), ... ++ (md.results.TransientSolution(end).Thickness), ... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1106.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1106.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1106.m (revision 10976) +@@ -32,9 +32,9 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + + plotmodel(md,'data',vx,'data',vy,'data',vz,'layer#all',md.mesh.numberoflayers) +@@ -61,8 +61,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test110.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test110.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test110.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test510.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test510.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test510.m (revision 10976) +@@ -11,24 +11,24 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test412.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test412.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test412.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test331.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test331.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test331.m (revision 10976) +@@ -9,25 +9,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test250.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test250.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test250.m (revision 10976) +@@ -17,34 +17,34 @@ + 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-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test314.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test314.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test314.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-10,1e-10,1e-10}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test233.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test233.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test233.m (revision 10976) +@@ -66,4 +66,4 @@ + %Fields and tolerances to track changes + field_names ={'Vy'}; + field_tolerances={1e-13}; +-field_values={PatchToVec(md.results.DiagnosticSolution.Vy)}; ++field_values={(md.results.DiagnosticSolution.Vy)}; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test135.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test135.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test135.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test216.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test216.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test216.m (revision 10976) +@@ -9,25 +9,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test118.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test118.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test118.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution(1).Temperature),... +- PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test454.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test454.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test454.m (revision 10976) +@@ -26,16 +26,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test616.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test616.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test616.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test518.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test518.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test518.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test437.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test437.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test437.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test339.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test339.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test339.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test258.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test258.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test258.m (revision 10976) +@@ -29,36 +29,36 @@ + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test102.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test102.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test102.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test502.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test502.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test502.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test421.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test421.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test421.m (revision 10976) +@@ -11,11 +11,11 @@ + 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={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test340.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test340.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test340.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test404.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test404.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test404.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test323.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test323.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test323.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test242.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test242.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test242.m (revision 10976) +@@ -11,9 +11,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-06,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test306.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test306.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test306.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test225.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test225.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test225.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test127.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test127.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test127.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test208.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test208.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test208.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test625.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test625.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test625.m (revision 10976) +@@ -31,10 +31,10 @@ + field_names ={'Gradient1' 'Gradient2' 'Misfits' 'Vx' 'Vy' 'Thickness'}; + field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Gradient1),... +- PatchToVec(md.results.BalancethicknessSolution.Gradient2),... ++ (md.results.BalancethicknessSolution.Gradient1),... ++ (md.results.BalancethicknessSolution.Gradient2),... + md.results.BalancethicknessSolution.J,... +- PatchToVec(md.results.BalancethicknessSolution.Vx),... +- PatchToVec(md.results.BalancethicknessSolution.Vy),... +- PatchToVec(md.results.BalancethicknessSolution.Thickness) ++ (md.results.BalancethicknessSolution.Vx),... ++ (md.results.BalancethicknessSolution.Vy),... ++ (md.results.BalancethicknessSolution.Thickness) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test446.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test446.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test446.m (revision 10976) +@@ -25,11 +25,11 @@ + %test different grounding line dynamics. + md.groundingline.migration='AgressiveMigration'; + md=solve(md,TransientSolutionEnum); +-element_on_iceshelf_agressive=PatchToVec(md.results.TransientSolution.MaskElementonfloatingice); ++element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice); + + md.groundingline.migration='SoftMigration'; + md=solve(md,TransientSolutionEnum); +-element_on_iceshelf_soft=PatchToVec(md.results.TransientSolution.MaskElementonfloatingice); ++element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice); + + %Fields and tolerances to track changes + field_names ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft'}; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test608.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test608.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test608.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test348.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test348.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test348.m (revision 10976) +@@ -16,34 +16,34 @@ + 5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-10, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +-% PatchToVec(md.results.TransientSolution(3).Vx),... +-% PatchToVec(md.results.TransientSolution(3).Vy),... +-% PatchToVec(md.results.TransientSolution(3).Vz),... +-% PatchToVec(md.results.TransientSolution(3).Vel),... +-% PatchToVec(md.results.TransientSolution(3).Pressure),... +-% PatchToVec(md.results.TransientSolution(3).Bed),... +-% PatchToVec(md.results.TransientSolution(3).Surface),... +-% PatchToVec(md.results.TransientSolution(3).Thickness),... +-% PatchToVec(md.results.TransientSolution(3).Temperature),... +-% PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++% (md.results.TransientSolution(3).Vx),... ++% (md.results.TransientSolution(3).Vy),... ++% (md.results.TransientSolution(3).Vz),... ++% (md.results.TransientSolution(3).Vel),... ++% (md.results.TransientSolution(3).Pressure),... ++% (md.results.TransientSolution(3).Bed),... ++% (md.results.TransientSolution(3).Surface),... ++% (md.results.TransientSolution(3).Thickness),... ++% (md.results.TransientSolution(3).Temperature),... ++% (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test429.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test429.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test429.m (revision 10976) +@@ -25,14 +25,14 @@ + 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={... +- PatchToVec(md.results.SteadystateSolution.Gradient1),... ++ (md.results.SteadystateSolution.Gradient1),... + md.results.SteadystateSolution.J,... +- PatchToVec(md.results.SteadystateSolution.FrictionCoefficient),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) ++ (md.results.SteadystateSolution.FrictionCoefficient),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1205.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1205.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1205.m (revision 10976) +@@ -31,8 +31,8 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Calculate the depth averaged velocity field (2d): +-vx=PatchToVec(md.results.DiagnosticSolution.Vx); +-vy=PatchToVec(md.results.DiagnosticSolution.Vy); ++vx=(md.results.DiagnosticSolution.Vx); ++vy=(md.results.DiagnosticSolution.Vy); + vel=zeros(md.mesh.numberofvertices2d,1); + + node_vel=0; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1107.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1107.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1107.m (revision 10976) +@@ -60,9 +60,9 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + minvx(i)=min(vx(end-md.mesh.numberofvertices2d+1:end)); + maxvx(i)=max(vx(end-md.mesh.numberofvertices2d+1:end)); +@@ -141,8 +141,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test111.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test111.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test111.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test430.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test430.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test430.m (revision 10976) +@@ -26,14 +26,14 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; + field_tolerances={1e-11,1e-10,1e-11,1e-13,1e-10,1e-10,1e-10,1e-9,1e-10,1e-6}; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Gradient1),... ++ (md.results.SteadystateSolution.Gradient1),... + md.results.SteadystateSolution.J,... +- PatchToVec(md.results.SteadystateSolution.FrictionCoefficient),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) ++ (md.results.SteadystateSolution.FrictionCoefficient),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test511.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test511.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test511.m (revision 10976) +@@ -12,24 +12,24 @@ + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test251.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test251.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test251.m (revision 10976) +@@ -11,25 +11,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test332.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test332.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test332.m (revision 10976) +@@ -9,25 +9,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test413.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test413.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test413.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution(1).Temperature),... +- PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test234.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test234.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test234.m (revision 10976) +@@ -66,4 +66,4 @@ + %Fields and tolerances to track changes + field_names ={'Vy'}; + field_tolerances={1e-13}; +-field_values={PatchToVec(md.results.DiagnosticSolution.Vy)}; ++field_values={(md.results.DiagnosticSolution.Vy)}; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test315.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test315.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test315.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test217.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test217.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test217.m (revision 10976) +@@ -12,34 +12,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test136.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test136.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test136.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test119.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test119.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test119.m (revision 10976) +@@ -15,25 +15,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test617.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test617.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test617.m (revision 10976) +@@ -11,5 +11,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test438.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test438.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test438.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test519.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test519.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test519.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test259.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test259.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test259.m (revision 10976) +@@ -30,40 +30,40 @@ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vz),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vz),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test201.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test201.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test201.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test120.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test120.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test120.m (revision 10976) +@@ -12,25 +12,25 @@ + 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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test103.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test103.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test103.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test601.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test601.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test601.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test520.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test520.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test520.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test260.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test260.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test260.m (revision 10976) +@@ -30,40 +30,40 @@ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vz),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vz),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test341.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test341.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test341.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test422.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test422.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test422.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-09,1e-09,1e-08,1e-09,1e-09,1e-08,1e-05 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test503.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test503.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test503.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test243.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test243.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test243.m (revision 10976) +@@ -10,25 +10,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test324.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test324.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test324.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test405.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test405.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test405.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test226.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test226.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test226.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test307.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test307.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test307.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test209.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test209.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test209.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test128.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test128.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test128.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test626.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test626.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test626.m (revision 10976) +@@ -31,10 +31,10 @@ + field_names ={'Gradient1' 'Gradient2' 'Misfits' 'Vx' 'Vy' 'Thickness'}; + field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Gradient1),... +- PatchToVec(md.results.BalancethicknessSolution.Gradient2),... ++ (md.results.BalancethicknessSolution.Gradient1),... ++ (md.results.BalancethicknessSolution.Gradient2),... + md.results.BalancethicknessSolution.J,... +- PatchToVec(md.results.BalancethicknessSolution.Vx),... +- PatchToVec(md.results.BalancethicknessSolution.Vy),... +- PatchToVec(md.results.BalancethicknessSolution.Thickness) ++ (md.results.BalancethicknessSolution.Vx),... ++ (md.results.BalancethicknessSolution.Vy),... ++ (md.results.BalancethicknessSolution.Thickness) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test609.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test609.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test609.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test447.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test447.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test447.m (revision 10976) +@@ -24,16 +24,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1206.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1206.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1206.m (revision 10976) +@@ -31,8 +31,8 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Calculate the depth averaged velocity field (2d): +-vx=PatchToVec(md.results.DiagnosticSolution.Vx); +-vy=PatchToVec(md.results.DiagnosticSolution.Vy); ++vx=(md.results.DiagnosticSolution.Vx); ++vy=(md.results.DiagnosticSolution.Vy); + vel=zeros(md.mesh.numberofvertices2d,1); + + node_vel=0; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1108.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1108.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1108.m (revision 10976) +@@ -40,9 +40,9 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + + plotmodel(md,'data',vx,'data',vy,'data',vz,'layer#all',md.mesh.numberoflayers) +@@ -69,8 +69,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test210.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test210.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test210.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test112.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test112.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test112.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test610.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test610.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test610.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test431.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test431.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test431.m (revision 10976) +@@ -25,14 +25,14 @@ + 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={... +- PatchToVec(md.results.SteadystateSolution.Gradient1),... ++ (md.results.SteadystateSolution.Gradient1),... + md.results.SteadystateSolution.J,... +- PatchToVec(md.results.SteadystateSolution.FrictionCoefficient),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) ++ (md.results.SteadystateSolution.FrictionCoefficient),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test512.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test512.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test512.m (revision 10976) +@@ -12,24 +12,24 @@ + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test252.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test252.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test252.m (revision 10976) +@@ -11,25 +11,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test333.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test333.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test333.m (revision 10976) +@@ -14,34 +14,34 @@ + 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-9,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test414.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test414.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test414.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution(1).Temperature),... +- PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test316.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test316.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test316.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test218.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test218.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test218.m (revision 10976) +@@ -12,34 +12,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test618.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test618.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test618.m (revision 10976) +@@ -11,5 +11,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test202.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test202.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test202.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test121.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test121.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test121.m (revision 10976) +@@ -12,34 +12,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test104.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test104.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test104.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test602.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test602.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test602.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test521.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test521.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test521.m (revision 10976) +@@ -29,11 +29,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test261.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test261.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test261.m (revision 10976) +@@ -30,40 +30,40 @@ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vz),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vz),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test342.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test342.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test342.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-08,1e-07,1e-10,1e-10,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test504.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test504.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test504.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test244.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test244.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test244.m (revision 10976) +@@ -10,25 +10,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test325.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test325.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test325.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution(1).Temperature),... +- PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test406.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test406.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test406.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test227.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test227.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test227.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test308.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test308.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test308.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test129.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test129.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test129.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test529.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test529.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test529.m (revision 10976) +@@ -11,8 +11,8 @@ + '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).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(2).Temperature),... +- PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(2).Temperature),... ++ (md.results.ThermalSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test448.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test448.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test448.m (revision 10976) +@@ -26,16 +26,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1101.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1101.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1101.m (revision 10976) +@@ -42,9 +42,9 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + minvx(i)=min(vx(end-md.mesh.numberofvertices2d+1:end)); + maxvx(i)=max(vx(end-md.mesh.numberofvertices2d+1:end)); +@@ -129,8 +129,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1501.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1501.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1501.m (revision 10976) +@@ -20,7 +20,7 @@ + + for i=1:10 + md=solve(md,PrognosticSolutionEnum); +- md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - (PatchToVec(md.results.PrognosticSolution.Thickness)-md.geometry.thickness); ++ md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - ((md.results.PrognosticSolution.Thickness)-md.geometry.thickness); + end + + %Set up transient +@@ -46,46 +46,46 @@ + 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... +- PatchToVec(md.results.TransientSolution(400).Vx),... +- PatchToVec(md.results.TransientSolution(400).Vy),... +- PatchToVec(md.results.TransientSolution(400).Vel),... +- PatchToVec(md.results.TransientSolution(400).Pressure),... +- PatchToVec(md.results.TransientSolution(400).Bed),... +- PatchToVec(md.results.TransientSolution(400).Surface),... +- PatchToVec(md.results.TransientSolution(400).Thickness),... +- PatchToVec(md.results.TransientSolution(400).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(800).Vx),... +- PatchToVec(md.results.TransientSolution(800).Vy),... +- PatchToVec(md.results.TransientSolution(800).Vel),... +- PatchToVec(md.results.TransientSolution(800).Pressure),... +- PatchToVec(md.results.TransientSolution(800).Bed),... +- PatchToVec(md.results.TransientSolution(800).Surface),... +- PatchToVec(md.results.TransientSolution(800).Thickness),... +- PatchToVec(md.results.TransientSolution(800).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(1200).Vx),... +- PatchToVec(md.results.TransientSolution(1200).Vy),... +- PatchToVec(md.results.TransientSolution(1200).Vel),... +- PatchToVec(md.results.TransientSolution(1200).Pressure),... +- PatchToVec(md.results.TransientSolution(1200).Bed),... +- PatchToVec(md.results.TransientSolution(1200).Surface),... +- PatchToVec(md.results.TransientSolution(1200).Thickness),... +- PatchToVec(md.results.TransientSolution(1200).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(1600).Vx),... +- PatchToVec(md.results.TransientSolution(1600).Vy),... +- PatchToVec(md.results.TransientSolution(1600).Vel),... +- PatchToVec(md.results.TransientSolution(1600).Pressure),... +- PatchToVec(md.results.TransientSolution(1600).Bed),... +- PatchToVec(md.results.TransientSolution(1600).Surface),... +- PatchToVec(md.results.TransientSolution(1600).Thickness),... +- PatchToVec(md.results.TransientSolution(1600).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2000).Vx),... +- PatchToVec(md.results.TransientSolution(2000).Vy),... +- PatchToVec(md.results.TransientSolution(2000).Vel),... +- PatchToVec(md.results.TransientSolution(2000).Pressure),... +- PatchToVec(md.results.TransientSolution(2000).Bed),... +- PatchToVec(md.results.TransientSolution(2000).Surface),... +- PatchToVec(md.results.TransientSolution(2000).Thickness),... +- PatchToVec(md.results.TransientSolution(2000).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(400).Vx),... ++ (md.results.TransientSolution(400).Vy),... ++ (md.results.TransientSolution(400).Vel),... ++ (md.results.TransientSolution(400).Pressure),... ++ (md.results.TransientSolution(400).Bed),... ++ (md.results.TransientSolution(400).Surface),... ++ (md.results.TransientSolution(400).Thickness),... ++ (md.results.TransientSolution(400).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(800).Vx),... ++ (md.results.TransientSolution(800).Vy),... ++ (md.results.TransientSolution(800).Vel),... ++ (md.results.TransientSolution(800).Pressure),... ++ (md.results.TransientSolution(800).Bed),... ++ (md.results.TransientSolution(800).Surface),... ++ (md.results.TransientSolution(800).Thickness),... ++ (md.results.TransientSolution(800).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1200).Vx),... ++ (md.results.TransientSolution(1200).Vy),... ++ (md.results.TransientSolution(1200).Vel),... ++ (md.results.TransientSolution(1200).Pressure),... ++ (md.results.TransientSolution(1200).Bed),... ++ (md.results.TransientSolution(1200).Surface),... ++ (md.results.TransientSolution(1200).Thickness),... ++ (md.results.TransientSolution(1200).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1600).Vx),... ++ (md.results.TransientSolution(1600).Vy),... ++ (md.results.TransientSolution(1600).Vel),... ++ (md.results.TransientSolution(1600).Pressure),... ++ (md.results.TransientSolution(1600).Bed),... ++ (md.results.TransientSolution(1600).Surface),... ++ (md.results.TransientSolution(1600).Thickness),... ++ (md.results.TransientSolution(1600).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2000).Vx),... ++ (md.results.TransientSolution(2000).Vy),... ++ (md.results.TransientSolution(2000).Vel),... ++ (md.results.TransientSolution(2000).Pressure),... ++ (md.results.TransientSolution(2000).Bed),... ++ (md.results.TransientSolution(2000).Surface),... ++ (md.results.TransientSolution(2000).Thickness),... ++ (md.results.TransientSolution(2000).SurfaceforcingsMassBalance),... + }; + + if printingflag, +@@ -105,10 +105,10 @@ + massbal = []; + velocity = []; + for t=starttime:endtime +- thickness = [thickness PatchToVec(md.results.TransientSolution(t).Thickness)]; ++ thickness = [thickness (md.results.TransientSolution(t).Thickness)]; + volume = [volume mean(md.results.TransientSolution(t).Thickness.value,2).*areas]; +- massbal = [massbal PatchToVec(md.results.TransientSolution(t).SurfaceforcingsMassBalance)]; +- velocity = [velocity PatchToVec(md.results.TransientSolution(t).Vel)]; ++ massbal = [massbal (md.results.TransientSolution(t).SurfaceforcingsMassBalance)]; ++ velocity = [velocity (md.results.TransientSolution(t).Vel)]; + end + + figure('Position', [0 0 860 932]) +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1207.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1207.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1207.m (revision 10976) +@@ -31,8 +31,8 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Calculate the depth averaged velocity field (2d): +-vx=PatchToVec(md.results.DiagnosticSolution.Vx); +-vy=PatchToVec(md.results.DiagnosticSolution.Vy); ++vx=(md.results.DiagnosticSolution.Vx); ++vy=(md.results.DiagnosticSolution.Vy); + vel=zeros(md.mesh.numberofvertices2d,1); + + node_vel=0; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1109.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1109.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1109.m (revision 10976) +@@ -50,9 +50,9 @@ + md.cluster=generic('name',oshostname(),'np',8); + md=solve(md,DiagnosticSolutionEnum); + +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + + if i==1, +@@ -102,8 +102,8 @@ + for i=1:4, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test211.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test211.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test211.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test130.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test130.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test130.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test113.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test113.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test113.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test611.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test611.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test611.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test530.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test530.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test530.m (revision 10976) +@@ -12,8 +12,8 @@ + '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).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(2).Temperature),... +- PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(2).Temperature),... ++ (md.results.ThermalSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test432.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test432.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test432.m (revision 10976) +@@ -25,14 +25,14 @@ + 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={... +- PatchToVec(md.results.SteadystateSolution.Gradient1),... ++ (md.results.SteadystateSolution.Gradient1),... + md.results.SteadystateSolution.J,... +- PatchToVec(md.results.SteadystateSolution.FrictionCoefficient),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate) ++ (md.results.SteadystateSolution.FrictionCoefficient),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test513.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test513.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test513.m (revision 10976) +@@ -12,24 +12,24 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test253.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test253.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test253.m (revision 10976) +@@ -16,34 +16,34 @@ + 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-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test334.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test334.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test334.m (revision 10976) +@@ -14,34 +14,34 @@ + 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... + 1e-09,5e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test415.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test415.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test415.m (revision 10976) +@@ -9,25 +9,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test317.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test317.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test317.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test219.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test219.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test219.m (revision 10976) +@@ -12,34 +12,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test619.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test619.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test619.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1110.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1110.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1110.m (revision 10976) +@@ -63,9 +63,9 @@ + + %Now plot vx and delta surface + if (i==1 | i==3), +- plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Vx),'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Velocity (m/yr)','linewidth',3,'grid','on','unit','km','ylim',[91 100]) ++ plotmodel(md,'data',(md.results.TransientSolution(end).Vx),'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Velocity (m/yr)','linewidth',3,'grid','on','unit','km','ylim',[91 100]) + elseif (i==2 | i==4), +- plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Vx),'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Velocity (m/yr)','linewidth',3,'grid','on','unit','km','ylim',[185 200]) ++ plotmodel(md,'data',(md.results.TransientSolution(end).Vx),'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Velocity (m/yr)','linewidth',3,'grid','on','unit','km','ylim',[185 200]) + end + if printingflag, + set(gcf,'Color','w') +@@ -84,7 +84,7 @@ + end + end + +- plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Surface)-md.geometry.surface,'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Surface (m)','linewidth',3,'grid','on','unit','km','ylim',[-30 50]) ++ plotmodel(md,'data',(md.results.TransientSolution(end).Surface)-md.geometry.surface,'layer',md.mesh.numberoflayers,'sectionvalue','../Exp/ISMIP100000.exp','title','','xlabel','','ylabel','Surface (m)','linewidth',3,'grid','on','unit','km','ylim',[-30 50]) + if printingflag, + set(gcf,'Color','w') + if i==1, +@@ -120,9 +120,9 @@ + for i=1:4, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... +- PatchToVec(result.Surface)-md.geometry.surface,... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... ++ (result.Surface)-md.geometry.surface,... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test220.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test220.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test220.m (revision 10976) +@@ -15,34 +15,34 @@ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test301.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test301.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test301.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test203.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test203.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test203.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test122.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test122.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test122.m (revision 10976) +@@ -12,34 +12,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test105.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test105.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test105.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test620.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test620.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test620.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test603.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test603.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test603.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test522.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test522.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test522.m (revision 10976) +@@ -29,11 +29,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-11,1e-12,1e-12,1e-09,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test441.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test441.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test441.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test262.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test262.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test262.m (revision 10976) +@@ -30,40 +30,40 @@ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vz),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vz),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test343.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test343.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test343.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test505.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test505.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test505.m (revision 10976) +@@ -9,9 +9,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test245.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test245.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test245.m (revision 10976) +@@ -11,25 +11,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test326.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test326.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test326.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution(1).Temperature),... +- PatchToVec(md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test407.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test407.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test407.m (revision 10976) +@@ -9,9 +9,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test228.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test228.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test228.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test309.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test309.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test309.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test449.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test449.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test449.m (revision 10976) +@@ -24,16 +24,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1102.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1102.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1102.m (revision 10976) +@@ -51,10 +51,10 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); +- pressure=PatchToVec(md.results.DiagnosticSolution.Pressure); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); ++ pressure=(md.results.DiagnosticSolution.Pressure); + results{i}=md.results.DiagnosticSolution; + minvx(i)=min(vx(end-md.mesh.numberofvertices2d+1:end)); + maxvx(i)=max(vx(end-md.mesh.numberofvertices2d+1:end)); +@@ -139,8 +139,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1502.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1502.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1502.m (revision 10976) +@@ -21,7 +21,7 @@ + + for i=1:10 + md=solve(md,PrognosticSolutionEnum); +- md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - (PatchToVec(md.results.PrognosticSolution.Thickness)-md.geometry.thickness); ++ md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - ((md.results.PrognosticSolution.Thickness)-md.geometry.thickness); + end + + %Set up transient +@@ -47,51 +47,51 @@ + 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={... +- PatchToVec(md.results.TransientSolution(400).Vx),... +- PatchToVec(md.results.TransientSolution(400).Vy),... +- PatchToVec(md.results.TransientSolution(400).Vz),... +- PatchToVec(md.results.TransientSolution(400).Vel),... +- PatchToVec(md.results.TransientSolution(400).Pressure),... +- PatchToVec(md.results.TransientSolution(400).Bed),... +- PatchToVec(md.results.TransientSolution(400).Surface),... +- PatchToVec(md.results.TransientSolution(400).Thickness),... +- PatchToVec(md.results.TransientSolution(400).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(800).Vx),... +- PatchToVec(md.results.TransientSolution(800).Vy),... +- PatchToVec(md.results.TransientSolution(800).Vz),... +- PatchToVec(md.results.TransientSolution(800).Vel),... +- PatchToVec(md.results.TransientSolution(800).Pressure),... +- PatchToVec(md.results.TransientSolution(800).Bed),... +- PatchToVec(md.results.TransientSolution(800).Surface),... +- PatchToVec(md.results.TransientSolution(800).Thickness),... +- PatchToVec(md.results.TransientSolution(800).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(1200).Vx),... +- PatchToVec(md.results.TransientSolution(1200).Vy),... +- PatchToVec(md.results.TransientSolution(1200).Vz),... +- PatchToVec(md.results.TransientSolution(1200).Vel),... +- PatchToVec(md.results.TransientSolution(1200).Pressure),... +- PatchToVec(md.results.TransientSolution(1200).Bed),... +- PatchToVec(md.results.TransientSolution(1200).Surface),... +- PatchToVec(md.results.TransientSolution(1200).Thickness),... +- PatchToVec(md.results.TransientSolution(1200).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(1600).Vx),... +- PatchToVec(md.results.TransientSolution(1600).Vy),... +- PatchToVec(md.results.TransientSolution(1600).Vz),... +- PatchToVec(md.results.TransientSolution(1600).Vel),... +- PatchToVec(md.results.TransientSolution(1600).Pressure),... +- PatchToVec(md.results.TransientSolution(1600).Bed),... +- PatchToVec(md.results.TransientSolution(1600).Surface),... +- PatchToVec(md.results.TransientSolution(1600).Thickness),... +- PatchToVec(md.results.TransientSolution(1600).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2000).Vx),... +- PatchToVec(md.results.TransientSolution(2000).Vy),... +- PatchToVec(md.results.TransientSolution(2000).Vz),... +- PatchToVec(md.results.TransientSolution(2000).Vel),... +- PatchToVec(md.results.TransientSolution(2000).Pressure),... +- PatchToVec(md.results.TransientSolution(2000).Bed),... +- PatchToVec(md.results.TransientSolution(2000).Surface),... +- PatchToVec(md.results.TransientSolution(2000).Thickness),... +- PatchToVec(md.results.TransientSolution(2000).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(400).Vx),... ++ (md.results.TransientSolution(400).Vy),... ++ (md.results.TransientSolution(400).Vz),... ++ (md.results.TransientSolution(400).Vel),... ++ (md.results.TransientSolution(400).Pressure),... ++ (md.results.TransientSolution(400).Bed),... ++ (md.results.TransientSolution(400).Surface),... ++ (md.results.TransientSolution(400).Thickness),... ++ (md.results.TransientSolution(400).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(800).Vx),... ++ (md.results.TransientSolution(800).Vy),... ++ (md.results.TransientSolution(800).Vz),... ++ (md.results.TransientSolution(800).Vel),... ++ (md.results.TransientSolution(800).Pressure),... ++ (md.results.TransientSolution(800).Bed),... ++ (md.results.TransientSolution(800).Surface),... ++ (md.results.TransientSolution(800).Thickness),... ++ (md.results.TransientSolution(800).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1200).Vx),... ++ (md.results.TransientSolution(1200).Vy),... ++ (md.results.TransientSolution(1200).Vz),... ++ (md.results.TransientSolution(1200).Vel),... ++ (md.results.TransientSolution(1200).Pressure),... ++ (md.results.TransientSolution(1200).Bed),... ++ (md.results.TransientSolution(1200).Surface),... ++ (md.results.TransientSolution(1200).Thickness),... ++ (md.results.TransientSolution(1200).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1600).Vx),... ++ (md.results.TransientSolution(1600).Vy),... ++ (md.results.TransientSolution(1600).Vz),... ++ (md.results.TransientSolution(1600).Vel),... ++ (md.results.TransientSolution(1600).Pressure),... ++ (md.results.TransientSolution(1600).Bed),... ++ (md.results.TransientSolution(1600).Surface),... ++ (md.results.TransientSolution(1600).Thickness),... ++ (md.results.TransientSolution(1600).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2000).Vx),... ++ (md.results.TransientSolution(2000).Vy),... ++ (md.results.TransientSolution(2000).Vz),... ++ (md.results.TransientSolution(2000).Vel),... ++ (md.results.TransientSolution(2000).Pressure),... ++ (md.results.TransientSolution(2000).Bed),... ++ (md.results.TransientSolution(2000).Surface),... ++ (md.results.TransientSolution(2000).Thickness),... ++ (md.results.TransientSolution(2000).SurfaceforcingsMassBalance),... + }; + + if printingflag, +@@ -111,10 +111,10 @@ + massbal = []; + velocity = []; + for t=starttime:endtime +- thickness = [thickness PatchToVec(md.results.TransientSolution(t).Thickness)]; ++ thickness = [thickness (md.results.TransientSolution(t).Thickness)]; + volume = [volume mean(md.results.TransientSolution(t).Thickness.value,2).*areas]; +- massbal = [massbal PatchToVec(md.results.TransientSolution(t).SurfaceforcingsMassBalance)]; +- velocity = [velocity PatchToVec(md.results.TransientSolution(t).Vel)]; ++ massbal = [massbal (md.results.TransientSolution(t).SurfaceforcingsMassBalance)]; ++ velocity = [velocity (md.results.TransientSolution(t).Vel)]; + end + + figure('Position', [0 0 1060 1060]) +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1208.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1208.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1208.m (revision 10976) +@@ -32,14 +32,14 @@ + 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={... +- PatchToVec(md.results.TransientSolution(end).Vx),... +- PatchToVec(md.results.TransientSolution(end).Vy),... +- PatchToVec(md.results.TransientSolution(end).Vz),... +- PatchToVec(md.results.TransientSolution(end).Vel),... +- PatchToVec(md.results.TransientSolution(end).Pressure),... +- PatchToVec(md.results.TransientSolution(end).Thickness),... +- PatchToVec(md.results.TransientSolution(end).Bed),... +- PatchToVec(md.results.TransientSolution(end).Surface),... +- PatchToVec(md.results.TransientSolution(end).Temperature),... +- PatchToVec(md.results.TransientSolution(end).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(end).Vx),... ++ (md.results.TransientSolution(end).Vy),... ++ (md.results.TransientSolution(end).Vz),... ++ (md.results.TransientSolution(end).Vel),... ++ (md.results.TransientSolution(end).Pressure),... ++ (md.results.TransientSolution(end).Thickness),... ++ (md.results.TransientSolution(end).Bed),... ++ (md.results.TransientSolution(end).Surface),... ++ (md.results.TransientSolution(end).Temperature),... ++ (md.results.TransientSolution(end).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test310.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test310.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test310.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test212.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test212.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test212.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test131.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test131.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test131.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test114.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test114.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test114.m (revision 10976) +@@ -10,5 +10,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test612.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test612.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test612.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test531.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test531.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test531.m (revision 10976) +@@ -12,6 +12,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-12}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test450.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test450.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test450.m (revision 10976) +@@ -26,16 +26,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test514.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test514.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test514.m (revision 10976) +@@ -12,24 +12,24 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test335.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test335.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test335.m (revision 10976) +@@ -13,11 +13,11 @@ + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test416.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test416.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test416.m (revision 10976) +@@ -9,25 +9,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test254.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test254.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test254.m (revision 10976) +@@ -17,34 +17,34 @@ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,... + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test318.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test318.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test318.m (revision 10976) +@@ -9,5 +9,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test237.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test237.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test237.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test302.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test302.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test302.m (revision 10976) +@@ -9,8 +9,8 @@ + field_names ={'Vx','Vy','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test221.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test221.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test221.m (revision 10976) +@@ -15,34 +15,34 @@ + 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-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test123.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test123.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test123.m (revision 10976) +@@ -9,6 +9,6 @@ + field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeX),... +- PatchToVec(md.results.SurfaceSlopeSolution.SurfaceSlopeY),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeX),... ++ (md.results.SurfaceSlopeSolution.SurfaceSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test204.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test204.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test204.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test106.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test106.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test106.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test621.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test621.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test621.m (revision 10976) +@@ -24,8 +24,8 @@ + field_names ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'}; + field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Gradient1),... ++ (md.results.BalancethicknessSolution.Gradient1),... + md.results.BalancethicknessSolution.J,... +- PatchToVec(md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... +- PatchToVec(md.results.BalancethicknessSolution.Thickness) ++ (md.results.BalancethicknessSolution.BalancethicknessThickeningRate),... ++ (md.results.BalancethicknessSolution.Thickness) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test442.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test442.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test442.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-08,1e-09,1e-05,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test523.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test523.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test523.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test604.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test604.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test604.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test506.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test506.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test506.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test344.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test344.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test344.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-06,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.FrictionCoefficient),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.FrictionCoefficient),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test263.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test263.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test263.m (revision 10976) +@@ -13,12 +13,12 @@ + 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).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(2).Temperature),... +- PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(3).Temperature),... +- PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(4).Temperature),... +- PatchToVec(md.results.ThermalSolution(4).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(2).Temperature),... ++ (md.results.ThermalSolution(2).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(3).Temperature),... ++ (md.results.ThermalSolution(3).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(4).Temperature),... ++ (md.results.ThermalSolution(4).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test408.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test408.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test408.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-07,1e-07,1e-06,1e-07,1e-07}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test327.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test327.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test327.m (revision 10976) +@@ -13,25 +13,25 @@ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test246.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test246.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test246.m (revision 10976) +@@ -11,25 +11,25 @@ + field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; + 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}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test229.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test229.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test229.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1201.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1201.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1201.m (revision 10976) +@@ -40,7 +40,7 @@ + md.settings.output_frequency=500; %keep only last step + md.verbose=verbose(); + md=solve(md,TransientSolutionEnum); +- results{stabilization}=PatchToVec(md.results.TransientSolution(end).Thickness); ++ results{stabilization}=(md.results.TransientSolution(end).Thickness); + end + + %plot results +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1103.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1103.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test1103.m (revision 10976) +@@ -39,9 +39,9 @@ + md=solve(md,DiagnosticSolutionEnum); + + %Plot the results and save them +- vx=PatchToVec(md.results.DiagnosticSolution.Vx); +- vy=PatchToVec(md.results.DiagnosticSolution.Vy); +- vz=PatchToVec(md.results.DiagnosticSolution.Vz); ++ vx=(md.results.DiagnosticSolution.Vx); ++ vy=(md.results.DiagnosticSolution.Vy); ++ vz=(md.results.DiagnosticSolution.Vz); + results{i}=md.results.DiagnosticSolution; + minvx(i)=min(vx(end-md.mesh.numberofvertices2d+1:end)); + maxvx(i)=max(vx(end-md.mesh.numberofvertices2d+1:end)); +@@ -120,8 +120,8 @@ + for i=1:6, + result=results{i}; + field_values={field_values{:},... +- PatchToVec(result.Vx),... +- PatchToVec(result.Vy),... +- PatchToVec(result.Vz),... ++ (result.Vx),... ++ (result.Vy),... ++ (result.Vz),... + }; + end +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test311.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test311.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test311.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test230.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test230.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test230.m (revision 10976) +@@ -24,11 +24,11 @@ + field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; + field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Gradient1),... ++ (md.results.DiagnosticSolution.Gradient1),... + md.results.DiagnosticSolution.J,... +- PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy) ++ (md.results.DiagnosticSolution.MaterialsRheologyB),... ++ (md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy) + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test132.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test132.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test132.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.BalancethicknessSolution.Thickness),... ++ (md.results.BalancethicknessSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test213.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test213.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test213.m (revision 10976) +@@ -10,10 +10,10 @@ + 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).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(2).Temperature),... +- PatchToVec(md.results.ThermalSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.ThermalSolution(3).Temperature),... +- PatchToVec(md.results.ThermalSolution(3).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(1).Temperature),... ++ (md.results.ThermalSolution(1).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(2).Temperature),... ++ (md.results.ThermalSolution(2).BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution(3).Temperature),... ++ (md.results.ThermalSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test115.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test115.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test115.m (revision 10976) +@@ -11,6 +11,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test451.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test451.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test451.m (revision 10976) +@@ -27,16 +27,16 @@ + 1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).MaskElementonfloatingice),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).MaskElementonfloatingice),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).MaskElementonfloatingice),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).MaskElementonfloatingice),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).MaskElementonfloatingice),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test532.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test532.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test532.m (revision 10976) +@@ -13,6 +13,6 @@ + field_names ={'Temperature','BasalforcingsMeltingRate'}; + field_tolerances={1e-11,1e-11}; + field_values={... +- PatchToVec(md.results.ThermalSolution.Temperature),... +- PatchToVec(md.results.ThermalSolution.BasalforcingsMeltingRate),... ++ (md.results.ThermalSolution.Temperature),... ++ (md.results.ThermalSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test613.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test613.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test613.m (revision 10976) +@@ -10,6 +10,6 @@ + field_names ={'BedSlopeX','BedSlopeY'}; + field_tolerances={1e-13,1e-13}; + field_values={... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeX),... +- PatchToVec(md.results.BedSlopeSolution.BedSlopeY),... ++ (md.results.BedSlopeSolution.BedSlopeX),... ++ (md.results.BedSlopeSolution.BedSlopeY),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test515.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test515.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test515.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test417.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test417.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test417.m (revision 10976) +@@ -12,34 +12,34 @@ + '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={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vz),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).Temperature),... +- PatchToVec(md.results.TransientSolution(1).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vz),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).Temperature),... +- PatchToVec(md.results.TransientSolution(2).BasalforcingsMeltingRate),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vz),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).Temperature),... +- PatchToVec(md.results.TransientSolution(3).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vz),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).Temperature),... ++ (md.results.TransientSolution(1).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vz),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).Temperature),... ++ (md.results.TransientSolution(2).BasalforcingsMeltingRate),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vz),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).Temperature),... ++ (md.results.TransientSolution(3).BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test336.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test336.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test336.m (revision 10976) +@@ -12,11 +12,11 @@ + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 + }; + field_values={... +- PatchToVec(md.results.SteadystateSolution.Vx),... +- PatchToVec(md.results.SteadystateSolution.Vy),... +- PatchToVec(md.results.SteadystateSolution.Vz),... +- PatchToVec(md.results.SteadystateSolution.Vel),... +- PatchToVec(md.results.SteadystateSolution.Pressure),... +- PatchToVec(md.results.SteadystateSolution.Temperature),... +- PatchToVec(md.results.SteadystateSolution.BasalforcingsMeltingRate),... ++ (md.results.SteadystateSolution.Vx),... ++ (md.results.SteadystateSolution.Vy),... ++ (md.results.SteadystateSolution.Vz),... ++ (md.results.SteadystateSolution.Vel),... ++ (md.results.SteadystateSolution.Pressure),... ++ (md.results.SteadystateSolution.Temperature),... ++ (md.results.SteadystateSolution.BasalforcingsMeltingRate),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test255.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test255.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test255.m (revision 10976) +@@ -29,36 +29,36 @@ + 1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; + + field_values={... +- PatchToVec(md.results.TransientSolution(1).Vx),... +- PatchToVec(md.results.TransientSolution(1).Vy),... +- PatchToVec(md.results.TransientSolution(1).Vel),... +- PatchToVec(md.results.TransientSolution(1).Pressure),... +- PatchToVec(md.results.TransientSolution(1).Bed),... +- PatchToVec(md.results.TransientSolution(1).Surface),... +- PatchToVec(md.results.TransientSolution(1).Thickness),... +- PatchToVec(md.results.TransientSolution(1).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(2).Vx),... +- PatchToVec(md.results.TransientSolution(2).Vy),... +- PatchToVec(md.results.TransientSolution(2).Vel),... +- PatchToVec(md.results.TransientSolution(2).Pressure),... +- PatchToVec(md.results.TransientSolution(2).Bed),... +- PatchToVec(md.results.TransientSolution(2).Surface),... +- PatchToVec(md.results.TransientSolution(2).Thickness),... +- PatchToVec(md.results.TransientSolution(2).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(3).Vx),... +- PatchToVec(md.results.TransientSolution(3).Vy),... +- PatchToVec(md.results.TransientSolution(3).Vel),... +- PatchToVec(md.results.TransientSolution(3).Pressure),... +- PatchToVec(md.results.TransientSolution(3).Bed),... +- PatchToVec(md.results.TransientSolution(3).Surface),... +- PatchToVec(md.results.TransientSolution(3).Thickness),... +- PatchToVec(md.results.TransientSolution(3).SurfaceforcingsMassBalance),... +- PatchToVec(md.results.TransientSolution(4).Vx),... +- PatchToVec(md.results.TransientSolution(4).Vy),... +- PatchToVec(md.results.TransientSolution(4).Vel),... +- PatchToVec(md.results.TransientSolution(4).Pressure),... +- PatchToVec(md.results.TransientSolution(4).Bed),... +- PatchToVec(md.results.TransientSolution(4).Surface),... +- PatchToVec(md.results.TransientSolution(4).Thickness),... +- PatchToVec(md.results.TransientSolution(4).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(1).Vx),... ++ (md.results.TransientSolution(1).Vy),... ++ (md.results.TransientSolution(1).Vel),... ++ (md.results.TransientSolution(1).Pressure),... ++ (md.results.TransientSolution(1).Bed),... ++ (md.results.TransientSolution(1).Surface),... ++ (md.results.TransientSolution(1).Thickness),... ++ (md.results.TransientSolution(1).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(2).Vx),... ++ (md.results.TransientSolution(2).Vy),... ++ (md.results.TransientSolution(2).Vel),... ++ (md.results.TransientSolution(2).Pressure),... ++ (md.results.TransientSolution(2).Bed),... ++ (md.results.TransientSolution(2).Surface),... ++ (md.results.TransientSolution(2).Thickness),... ++ (md.results.TransientSolution(2).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(3).Vx),... ++ (md.results.TransientSolution(3).Vy),... ++ (md.results.TransientSolution(3).Vel),... ++ (md.results.TransientSolution(3).Pressure),... ++ (md.results.TransientSolution(3).Bed),... ++ (md.results.TransientSolution(3).Surface),... ++ (md.results.TransientSolution(3).Thickness),... ++ (md.results.TransientSolution(3).SurfaceforcingsMassBalance),... ++ (md.results.TransientSolution(4).Vx),... ++ (md.results.TransientSolution(4).Vy),... ++ (md.results.TransientSolution(4).Vel),... ++ (md.results.TransientSolution(4).Pressure),... ++ (md.results.TransientSolution(4).Bed),... ++ (md.results.TransientSolution(4).Surface),... ++ (md.results.TransientSolution(4).Thickness),... ++ (md.results.TransientSolution(4).SurfaceforcingsMassBalance),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test319.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test319.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test319.m (revision 10976) +@@ -12,5 +12,5 @@ + field_names ={'Thickness'}; + field_tolerances={1e-13}; + field_values={... +- PatchToVec(md.results.PrognosticSolution.Thickness),... ++ (md.results.PrognosticSolution.Thickness),... + }; +Index: /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test238.m +=================================================================== +--- /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test238.m (revision 10975) ++++ /proj/ice/larour/issm-uci/trunk-jpl/test/NightlyRun/test238.m (revision 10976) +@@ -10,9 +10,9 @@ + field_names ={'Vx','Vy','Vz','Vel','Pressure'}; + field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-13}; + field_values={... +- PatchToVec(md.results.DiagnosticSolution.Vx),... +- PatchToVec(md.results.DiagnosticSolution.Vy),... +- PatchToVec(md.results.DiagnosticSolution.Vz),... +- PatchToVec(md.results.DiagnosticSolution.Vel),... +- PatchToVec(md.results.DiagnosticSolution.Pressure),... ++ (md.results.DiagnosticSolution.Vx),... ++ (md.results.DiagnosticSolution.Vy),... ++ (md.results.DiagnosticSolution.Vz),... ++ (md.results.DiagnosticSolution.Vel),... ++ (md.results.DiagnosticSolution.Pressure),... + }; Index: /issm/oecreview/Archive/10937-10976/ISSM-DocReview-10937-10976.tex =================================================================== --- /issm/oecreview/Archive/10937-10976/ISSM-DocReview-10937-10976.tex (revision 10979) +++ /issm/oecreview/Archive/10937-10976/ISSM-DocReview-10937-10976.tex (revision 10979) @@ -0,0 +1,67 @@ +\documentclass[]{report} % list options between brackets +\usepackage{graphicx} % list packages between braces + +% type user-defined commands here + +\begin{document} + +\title{JPL EXPORT ADMINISTRATION \\ DOCUMENT REVIEW RECORD} % type title between braces +\author{Tom Scavo} % type author(s) between braces +\date{October 27, 1995} % type date between braces +%\maketitle + + +\begin{center} +\begin{tabular}{ |c|c| } +\hline +JPL EXPORT ADMINISTRATION \\ +\textit{ DOCUMENT REVIEW RECORD} \\ +\hline +\end{tabular} +\end{center} + +\hfill Log \#: \underline{\input{LogNumber}} + +\vspace{1cm} +\noindent (Note: This form and process do not replace the procedures described in JPL Policy relating to review and approval of proposals and contractual +documents. This process is intended to document the review and coordination of requests to ascertain the export control ramifications relating to specific +documents. Export Administration signature does not convey authority to export or release the "Exporter of Record" from any export laws or regulations.)\\ + +\noindent \textbf{Program:} \underline{ISSM: Ice Sheet System Model} \\ \\ +\noindent \textbf{Person Requesting or Initiating Export}: \underline{Dr. Eric Larour}\\ \\ +\noindent \textbf{Date Received}: \underline{\input{Date}}\\ \\ +\noindent \textbf{Document Title/Description}: ISSM changes from revision \input{r1} to revision \input{r2} \\ \\ +\noindent \textbf{Release to:} \underline{http://issm.ess.uci.edu/svn/issm/issm/trunk on ISSM svn repository}\\ \\ +\noindent \textbf{JPL Intranet:} \underline{murdo.jpl.nasa.gov/proj/ice/larour/issm-uci/trunk-jpl}\\ \\ + +\noindent \textbf{Disposition: 6 } +Does not contain export-controlled information. May be released/disclosed as requested subject to +Company guidelines on protection of proprietary information (if applicable). \\ + +\noindent \textbf{Comments:} see table of changes below. \\ \\ +\noindent \textbf{Reviewed by ISSM Export Transfer Liaison:} Dr. Eric Larour \hfill \textbf{Date:} \input{Date} \\ +\includegraphics[scale=1]{signature.eps} + +\noindent JPL Export Administration Form TBS – June 29, 2011 + +\begin{center} +\line(1,0){250} +\end{center} + +\noindent \textbf{Disposition:} \\ +1: Public Domain Information (Ref ITAR Section 120.11) \\ +2: Qualifies for ITAR Exemption \\ +3: Covered by Department of State License/Agreement Number \\ +4: Covered by Department of Commerce validated license or exception \\ +5: New License Required \\ +6: Does not contain export-controlled information. May be released/disclosed as requested subject + to Company guidelines on protection of proprietary information (if applicable). \\ +7: Other (specify) +\begin{center} +\line(1,0){250} +\end{center} + + +\input{log} + +\end{document} Index: /issm/oecreview/Archive/10937-10976/LogNumber.tex =================================================================== --- /issm/oecreview/Archive/10937-10976/LogNumber.tex (revision 10979) +++ /issm/oecreview/Archive/10937-10976/LogNumber.tex (revision 10979) @@ -0,0 +1,1 @@ +10937-10976 Index: /issm/oecreview/Archive/10937-10976/Makefile =================================================================== --- /issm/oecreview/Archive/10937-10976/Makefile (revision 10979) +++ /issm/oecreview/Archive/10937-10976/Makefile (revision 10979) @@ -0,0 +1,11 @@ +name=ISSM-DocReview-10937-10976 + + +all: + latex $(name).tex + dvips $(name).dvi + ps2pdf $(name).ps $(name).pdf + rm -rf *.dvi *.log *.aux *.ps + +clean: + rm -rf *.dvi *.log *.aux Index: /issm/oecreview/Archive/10937-10976/log.tex =================================================================== --- /issm/oecreview/Archive/10937-10976/log.tex (revision 10979) +++ /issm/oecreview/Archive/10937-10976/log.tex (revision 10979) @@ -0,0 +1,40 @@ +\noindent \textbf{Change \#1} with diff file ISSM-10937-10938.diff: \\ Function name: \\A /issm/trunk-jpl (from /issm/trunk:10935) R /issm/trunk-jpl/tidbits (from /issm/trunk/tidbits:10936) \\ Export determination: 6. \\Rationale: Branching JPL \\\\ +\noindent \textbf{Change \#2} with diff file ISSM-10938-10939.diff: \\ Function name: \\M /issm/trunk-jpl/startup.py \\ Export determination: 6. \\Rationale: simpler startup header \\\\ +\noindent \textbf{Change \#3} with diff file ISSM-10939-10940.diff: \\ Function name: \\M /issm/trunk-jpl/startup.py \\ Export determination: 6. \\Rationale: simpler startup header +M /issm/trunk-jpl M /issm/trunk-jpl/startup.m Sync with current trunk revision \\\\ +\noindent \textbf{Change \#4} with diff file ISSM-10940-10941.diff: \\ Function name: \\M /issm/trunk-jpl M /issm/trunk-jpl/startup.m \\ Export determination: 6. \\Rationale: Sync with current trunk revision +M /issm/trunk-jpl Merge from branch \\\\ +\noindent \textbf{Change \#5} with diff file ISSM-10941-10942.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: Merge from branch +M /issm/trunk-jpl test \\\\ +\noindent \textbf{Change \#6} with diff file ISSM-10942-10943.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: test \\\\ +\noindent \textbf{Change \#7} with diff file ISSM-10943-10944.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: new jpl branch from 10943 \\\\ +\noindent \textbf{Change \#8} with diff file ISSM-10944-10945.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: new jpl branch from 10943 \\\\ +\noindent \textbf{Change \#9} with diff file ISSM-10946-10947.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/clusters/pfe.m M /issm/trunk-jpl/src/m/model/plot/plot\_mesh.m \\ Export determination: 6. \\Rationale: Fixed plot mesh for export\_fig and added queues in pfe \\\\ +\noindent \textbf{Change \#10} with diff file ISSM-10947-10948.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/clusters/pfe.m M /issm/trunk-jpl/src/m/model/plot/plot\_mesh.m \\ Export determination: 6. \\Rationale: Fixed plot mesh for export\_fig and added queues in pfe \\\\ +\noindent \textbf{Change \#11} with diff file ISSM-10948-10949.diff: \\ Function name: \\M /issm/trunk-jpl A /issm/trunk-jpl/scripts/SyncBranches.sh (from /issm/trunk/scripts/SyncBranches.sh:10948) M /issm/trunk-jpl/src/m/classes/clusters/generic.m M /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp M /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp M /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp \\ Export determination: 6. \\Rationale: merged trunk and trunk-jpl \\\\ +\noindent \textbf{Change \#12} with diff file ISSM-10949-10950.diff: \\ Function name: \\M /issm/trunk-jpl A /issm/trunk-jpl/scripts/SyncBranches.sh (from /issm/trunk/scripts/SyncBranches.sh:10948) M /issm/trunk-jpl/src/m/classes/clusters/generic.m M /issm/trunk-jpl/src/mex/InterpFromGridToMesh/InterpFromGridToMesh.cpp M /issm/trunk-jpl/src/mex/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp M /issm/trunk-jpl/src/mex/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp \\ Export determination: 6. \\Rationale: merged trunk and trunk-jpl \\\\ +\noindent \textbf{Change \#13} with diff file ISSM-10952-10953.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: Block revision 10949 from being merged into trunk-jpl \\\\ +\noindent \textbf{Change \#14} with diff file ISSM-10953-10954.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: Block revision 10949 from being merged into trunk-jpl \\\\ +\noindent \textbf{Change \#15} with diff file ISSM-10958-10959.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/petsc/configs/3.2/macmathieu64/configure.sh \\ Export determination: 6. \\Rationale: minor \\\\ +\noindent \textbf{Change \#16} with diff file ISSM-10959-10960.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/petsc/configs/3.2/macmathieu64/configure.sh \\ Export determination: 6. \\Rationale: minor +M /issm/trunk-jpl D /issm/trunk-jpl/examples/Bumps D /issm/trunk-jpl/examples/IceStream A /issm/trunk-jpl/lib (from /issm/trunk/lib:10959) D /issm/trunk-jpl/scripts/SyncBranches.sh M /issm/trunk-jpl/test/NightlyRun/test420.m M /issm/trunk-jpl/test/NightlyRun/test452.m merged trunk and trunk-jpl \\\\ +\noindent \textbf{Change \#17} with diff file ISSM-10960-10961.diff: \\ Function name: \\M /issm/trunk-jpl D /issm/trunk-jpl/examples/Bumps D /issm/trunk-jpl/examples/IceStream A /issm/trunk-jpl/lib (from /issm/trunk/lib:10959) D /issm/trunk-jpl/scripts/SyncBranches.sh M /issm/trunk-jpl/test/NightlyRun/test420.m M /issm/trunk-jpl/test/NightlyRun/test452.m \\ Export determination: 6. \\Rationale: merged trunk and trunk-jpl \\\\ +\noindent \textbf{Change \#18} with diff file ISSM-10961-10962.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: Block revision 10960 from being merged into trunk-jpl \\\\ +\noindent \textbf{Change \#19} with diff file ISSM-10962-10963.diff: \\ Function name: \\M /issm/trunk-jpl \\ Export determination: 6. \\Rationale: Block revision 10960 from being merged into trunk-jpl \\\\ +\noindent \textbf{Change \#20} with diff file ISSM-10964-10965.diff: \\ Function name: \\D /issm/trunk-jpl/.ignore.txt D /issm/trunk-jpl/bin/.ignore.txt D /issm/trunk-jpl/externalpackages/.ignore.txt D /issm/trunk-jpl/externalpackages/adic/.ignore.txt D /issm/trunk-jpl/externalpackages/adolc/.ignore.txt D /issm/trunk-jpl/externalpackages/angel/.ignore.txt D /issm/trunk-jpl/externalpackages/appscan/.ignore.txt D /issm/trunk-jpl/externalpackages/autoconf/.ignore.txt D /issm/trunk-jpl/externalpackages/automake/.ignore.txt D /issm/trunk-jpl/externalpackages/bbftp/.ignore.txt D /issm/trunk-jpl/externalpackages/boost/.ignore.txt D /issm/trunk-jpl/externalpackages/chaco/.ignore.txt D /issm/trunk-jpl/externalpackages/cmake/.ignore.txt D /issm/trunk-jpl/externalpackages/colpack/.ignore.txt D /issm/trunk-jpl/externalpackages/cppcheck/.ignore.txt D /issm/trunk-jpl/externalpackages/dakota/.ignore.txt D /issm/trunk-jpl/externalpackages/doxygen/.ignore.txt D /issm/trunk-jpl/externalpackages/dyson/.ignore.txt D /issm/trunk-jpl/externalpackages/flaim/.ignore.txt D /issm/trunk-jpl/externalpackages/gdal/.ignore.txt D /issm/trunk-jpl/externalpackages/googleearthtoolbox/.ignore.txt D /issm/trunk-jpl/externalpackages/graphviz/.ignore.txt D /issm/trunk-jpl/externalpackages/kml/.ignore.txt D /issm/trunk-jpl/externalpackages/latex2rtf/.ignore.txt D /issm/trunk-jpl/externalpackages/libtool/.ignore.txt D /issm/trunk-jpl/externalpackages/m2html/.ignore.txt D /issm/trunk-jpl/externalpackages/matlab/.ignore.txt D /issm/trunk-jpl/externalpackages/mercurial/.ignore.txt D /issm/trunk-jpl/externalpackages/metis/.ignore.txt D /issm/trunk-jpl/externalpackages/mpich2/.ignore.txt D /issm/trunk-jpl/externalpackages/netcdf/.ignore.txt D /issm/trunk-jpl/externalpackages/openanalysis/.ignore.txt D /issm/trunk-jpl/externalpackages/petsc/.ignore.txt D /issm/trunk-jpl/externalpackages/rats/.ignore.txt D /issm/trunk-jpl/externalpackages/rose/.ignore.txt D /issm/trunk-jpl/externalpackages/satstress/.ignore.txt D /issm/trunk-jpl/externalpackages/scotch/.ignore.txt D /issm/trunk-jpl/externalpackages/shapelib/.ignore.txt D /issm/trunk-jpl/externalpackages/tao/.ignore.txt D /issm/trunk-jpl/externalpackages/triangle/.ignore.txt D /issm/trunk-jpl/externalpackages/valgrind/.ignore.txt D /issm/trunk-jpl/externalpackages/vim/.ignore.txt D /issm/trunk-jpl/externalpackages/xaifbooster/.ignore.txt D /issm/trunk-jpl/externalpackages/xerces/.ignore.txt D /issm/trunk-jpl/src/.ignore.txt D /issm/trunk-jpl/src/ad/.ignore.txt D /issm/trunk-jpl/src/c/.ignore.txt D /issm/trunk-jpl/src/mex/.ignore.txt D /issm/trunk-jpl/test/NightlyRun/.ignore.txt \\ Export determination: 6. \\Rationale: removed all ignore.txt, use -> svn propedit svn:ignore . \\\\ +\noindent \textbf{Change \#21} with diff file ISSM-10965-10966.diff: \\ Function name: \\D /issm/trunk-jpl/.ignore.txt D /issm/trunk-jpl/bin/.ignore.txt D /issm/trunk-jpl/externalpackages/.ignore.txt D /issm/trunk-jpl/externalpackages/adic/.ignore.txt D /issm/trunk-jpl/externalpackages/adolc/.ignore.txt D /issm/trunk-jpl/externalpackages/angel/.ignore.txt D /issm/trunk-jpl/externalpackages/appscan/.ignore.txt D /issm/trunk-jpl/externalpackages/autoconf/.ignore.txt D /issm/trunk-jpl/externalpackages/automake/.ignore.txt D /issm/trunk-jpl/externalpackages/bbftp/.ignore.txt D /issm/trunk-jpl/externalpackages/boost/.ignore.txt D /issm/trunk-jpl/externalpackages/chaco/.ignore.txt D /issm/trunk-jpl/externalpackages/cmake/.ignore.txt D /issm/trunk-jpl/externalpackages/colpack/.ignore.txt D /issm/trunk-jpl/externalpackages/cppcheck/.ignore.txt D /issm/trunk-jpl/externalpackages/dakota/.ignore.txt D /issm/trunk-jpl/externalpackages/doxygen/.ignore.txt D /issm/trunk-jpl/externalpackages/dyson/.ignore.txt D /issm/trunk-jpl/externalpackages/flaim/.ignore.txt D /issm/trunk-jpl/externalpackages/gdal/.ignore.txt D /issm/trunk-jpl/externalpackages/googleearthtoolbox/.ignore.txt D /issm/trunk-jpl/externalpackages/graphviz/.ignore.txt D /issm/trunk-jpl/externalpackages/kml/.ignore.txt D /issm/trunk-jpl/externalpackages/latex2rtf/.ignore.txt D /issm/trunk-jpl/externalpackages/libtool/.ignore.txt D /issm/trunk-jpl/externalpackages/m2html/.ignore.txt D /issm/trunk-jpl/externalpackages/matlab/.ignore.txt D /issm/trunk-jpl/externalpackages/mercurial/.ignore.txt D /issm/trunk-jpl/externalpackages/metis/.ignore.txt D /issm/trunk-jpl/externalpackages/mpich2/.ignore.txt D /issm/trunk-jpl/externalpackages/netcdf/.ignore.txt D /issm/trunk-jpl/externalpackages/openanalysis/.ignore.txt D /issm/trunk-jpl/externalpackages/petsc/.ignore.txt D /issm/trunk-jpl/externalpackages/rats/.ignore.txt D /issm/trunk-jpl/externalpackages/rose/.ignore.txt D /issm/trunk-jpl/externalpackages/satstress/.ignore.txt D /issm/trunk-jpl/externalpackages/scotch/.ignore.txt D /issm/trunk-jpl/externalpackages/shapelib/.ignore.txt D /issm/trunk-jpl/externalpackages/tao/.ignore.txt D /issm/trunk-jpl/externalpackages/triangle/.ignore.txt D /issm/trunk-jpl/externalpackages/valgrind/.ignore.txt D /issm/trunk-jpl/externalpackages/vim/.ignore.txt D /issm/trunk-jpl/externalpackages/xaifbooster/.ignore.txt D /issm/trunk-jpl/externalpackages/xerces/.ignore.txt D /issm/trunk-jpl/src/.ignore.txt D /issm/trunk-jpl/src/ad/.ignore.txt D /issm/trunk-jpl/src/c/.ignore.txt D /issm/trunk-jpl/src/mex/.ignore.txt D /issm/trunk-jpl/test/NightlyRun/.ignore.txt \\ Export determination: 6. \\Rationale: removed all ignore.txt, use -> svn propedit svn:ignore . \\\\ +\noindent \textbf{Change \#22} with diff file ISSM-10968-10969.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/autodiff.m M /issm/trunk-jpl/src/m/classes/balancethickness.m M /issm/trunk-jpl/src/m/classes/basalforcings.m M /issm/trunk-jpl/src/m/classes/constants.m M /issm/trunk-jpl/src/m/classes/diagnostic.m M /issm/trunk-jpl/src/m/classes/flowequation.m M /issm/trunk-jpl/src/m/classes/friction.m M /issm/trunk-jpl/src/m/classes/geometry.m M /issm/trunk-jpl/src/m/classes/groundingline.m M /issm/trunk-jpl/src/m/classes/hydrology.m M /issm/trunk-jpl/src/m/classes/initialization.m M /issm/trunk-jpl/src/m/classes/inversion.m M /issm/trunk-jpl/src/m/classes/mask.m M /issm/trunk-jpl/src/m/classes/materials.m M /issm/trunk-jpl/src/m/classes/mesh.m M /issm/trunk-jpl/src/m/classes/miscellaneous.m M /issm/trunk-jpl/src/m/classes/model/model.m M /issm/trunk-jpl/src/m/classes/private.m M /issm/trunk-jpl/src/m/classes/prognostic.m M /issm/trunk-jpl/src/m/classes/qmu.m M /issm/trunk-jpl/src/m/classes/rifts.m M /issm/trunk-jpl/src/m/classes/settings.m M /issm/trunk-jpl/src/m/classes/steadystate.m M /issm/trunk-jpl/src/m/classes/surfaceforcings.m M /issm/trunk-jpl/src/m/classes/thermal.m M /issm/trunk-jpl/src/m/classes/timestepping.m M /issm/trunk-jpl/src/m/classes/transient.m M /issm/trunk-jpl/src/m/classes/verbose.m A /issm/trunk-jpl/src/m/model/WriteData.m M /issm/trunk-jpl/src/m/model/marshall.m D /issm/trunk-jpl/src/m/model/presolve.m M /issm/trunk-jpl/src/m/model/solve.m \\ Export determination: 6. \\Rationale: Improvement: marshall is now a method of all model fields, removed unnecessary model fields (numcontrols... etc) \\\\ +\noindent \textbf{Change \#23} with diff file ISSM-10969-10970.diff: \\ Function name: \\M /issm/trunk-jpl/src/m/classes/autodiff.m M /issm/trunk-jpl/src/m/classes/balancethickness.m M /issm/trunk-jpl/src/m/classes/basalforcings.m M /issm/trunk-jpl/src/m/classes/constants.m M /issm/trunk-jpl/src/m/classes/diagnostic.m M /issm/trunk-jpl/src/m/classes/flowequation.m M /issm/trunk-jpl/src/m/classes/friction.m M /issm/trunk-jpl/src/m/classes/geometry.m M /issm/trunk-jpl/src/m/classes/groundingline.m M /issm/trunk-jpl/src/m/classes/hydrology.m M /issm/trunk-jpl/src/m/classes/initialization.m M /issm/trunk-jpl/src/m/classes/inversion.m M /issm/trunk-jpl/src/m/classes/mask.m M /issm/trunk-jpl/src/m/classes/materials.m M /issm/trunk-jpl/src/m/classes/mesh.m M /issm/trunk-jpl/src/m/classes/miscellaneous.m M /issm/trunk-jpl/src/m/classes/model/model.m M /issm/trunk-jpl/src/m/classes/private.m M /issm/trunk-jpl/src/m/classes/prognostic.m M /issm/trunk-jpl/src/m/classes/qmu.m M /issm/trunk-jpl/src/m/classes/rifts.m M /issm/trunk-jpl/src/m/classes/settings.m M /issm/trunk-jpl/src/m/classes/steadystate.m M /issm/trunk-jpl/src/m/classes/surfaceforcings.m M /issm/trunk-jpl/src/m/classes/thermal.m M /issm/trunk-jpl/src/m/classes/timestepping.m M /issm/trunk-jpl/src/m/classes/transient.m M /issm/trunk-jpl/src/m/classes/verbose.m A /issm/trunk-jpl/src/m/model/WriteData.m M /issm/trunk-jpl/src/m/model/marshall.m D /issm/trunk-jpl/src/m/model/presolve.m M /issm/trunk-jpl/src/m/model/solve.m \\ Export determination: 6. \\Rationale: Improvement: marshall is now a method of all model fields, removed unnecessary model fields (numcontrols... etc) +M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp Improvement: do not load control parameters if iscontrol=0 \\\\ +\noindent \textbf{Change \#24} with diff file ISSM-10970-10971.diff: \\ Function name: \\M /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp M /issm/trunk-jpl/src/c/objects/Elements/Penta.cpp M /issm/trunk-jpl/src/c/objects/Elements/Tria.cpp M /issm/trunk-jpl/src/c/objects/Materials/Matice.cpp \\ Export determination: 6. \\Rationale: Improvement: do not load control parameters if iscontrol=0 +D /issm/trunk-jpl/src/m/usr removed usr directory from trunk (these are personnal data, moved to issmjpl/usr) \\\\ +\noindent \textbf{Change \#25} with diff file ISSM-10971-10972.diff: \\ Function name: \\D /issm/trunk-jpl/src/m/usr \\ Export determination: 6. \\Rationale: removed usr directory from trunk (these are personnal data, moved to issmjpl/usr) +M /issm/trunk-jpl/startup.m correction: do not load user's specific directory anymore. This should be done in the matlab alias \\\\ +\noindent \textbf{Change \#26} with diff file ISSM-10972-10973.diff: \\ Function name: \\M /issm/trunk-jpl/startup.m \\ Export determination: 6. \\Rationale: correction: do not load user's specific directory anymore. This should be done in the matlab alias +M /issm/trunk-jpl/cron/configs/linux64\_larour M /issm/trunk-jpl/cron/configs/linux64\_morlighem\_daily M /issm/trunk-jpl/cron/configs/linux64\_morlighem\_nightly M /issm/trunk-jpl/cron/configs/linux64\_morlighem\_validation M /issm/trunk-jpl/cron/configs/linux64\_seroussi M /issm/trunk-jpl/cron/configs/linux64\_seroussi\_daily M /issm/trunk-jpl/cron/configs/linux64\_seroussi\_nightly M /issm/trunk-jpl/cron/configs/linux64\_seroussi\_validation M /issm/trunk-jpl/cron/configs/macosx32\_seroussi M /issm/trunk-jpl/cron/configs/macosx64\_larour M /issm/trunk-jpl/cron/configs/winxp32\_larour M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile config files for nightly runs \\\\ +\noindent \textbf{Change \#27} with diff file ISSM-10973-10974.diff: \\ Function name: \\M /issm/trunk-jpl/cron/configs/linux64\_larour M /issm/trunk-jpl/cron/configs/linux64\_morlighem\_daily M /issm/trunk-jpl/cron/configs/linux64\_morlighem\_nightly M /issm/trunk-jpl/cron/configs/linux64\_morlighem\_validation M /issm/trunk-jpl/cron/configs/linux64\_seroussi M /issm/trunk-jpl/cron/configs/linux64\_seroussi\_daily M /issm/trunk-jpl/cron/configs/linux64\_seroussi\_nightly M /issm/trunk-jpl/cron/configs/linux64\_seroussi\_validation M /issm/trunk-jpl/cron/configs/macosx32\_seroussi M /issm/trunk-jpl/cron/configs/macosx64\_larour M /issm/trunk-jpl/cron/configs/winxp32\_larour M /issm/trunk-jpl/cron/cronfiles/linux\_cronfile \\ Export determination: 6. \\Rationale: config files for nightly runs +M /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim improvement: synchronized enums with vim syntax highlighting \\\\ +\noindent \textbf{Change \#28} with diff file ISSM-10974-10975.diff: \\ Function name: \\M /issm/trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim \\ Export determination: 6. \\Rationale: improvement: synchronized enums with vim syntax highlighting +M /issm/trunk-jpl/src/ad/validation/Update/update.m M /issm/trunk-jpl/src/c/Container/Elements.cpp M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/m/classes/settings.m A /issm/trunk-jpl/src/m/enum/QmuBedEnum.m A /issm/trunk-jpl/src/m/enum/QmuMeltingEnum.m A /issm/trunk-jpl/src/m/enum/QmuSurfaceEnum.m A /issm/trunk-jpl/src/m/enum/QmuThicknessEnum.m A /issm/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m D /issm/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m moved md.settings.results\_on\_vertices to md.settings.results\_as\_patches which is 0 by default \\\\ +\noindent \textbf{Change \#29} with diff file ISSM-10975-10976.diff: \\ Function name: \\M /issm/trunk-jpl/src/ad/validation/Update/update.m M /issm/trunk-jpl/src/c/Container/Elements.cpp M /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h M /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp M /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp M /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp M /issm/trunk-jpl/src/m/classes/settings.m A /issm/trunk-jpl/src/m/enum/QmuBedEnum.m A /issm/trunk-jpl/src/m/enum/QmuMeltingEnum.m A /issm/trunk-jpl/src/m/enum/QmuSurfaceEnum.m A /issm/trunk-jpl/src/m/enum/QmuThicknessEnum.m A /issm/trunk-jpl/src/m/enum/SettingsResultsAsPatchesEnum.m D /issm/trunk-jpl/src/m/enum/SettingsResultsOnVerticesEnum.m \\ Export determination: 6. \\Rationale: moved md.settings.results\_on\_vertices to md.settings.results\_as\_patches which is 0 by default +M /issm/trunk-jpl/test/NightlyRun/test101.m M /issm/trunk-jpl/test/NightlyRun/test102.m M /issm/trunk-jpl/test/NightlyRun/test103.m M /issm/trunk-jpl/test/NightlyRun/test104.m M /issm/trunk-jpl/test/NightlyRun/test105.m M /issm/trunk-jpl/test/NightlyRun/test106.m M /issm/trunk-jpl/test/NightlyRun/test107.m M /issm/trunk-jpl/test/NightlyRun/test108.m M /issm/trunk-jpl/test/NightlyRun/test109.m M /issm/trunk-jpl/test/NightlyRun/test110.m M /issm/trunk-jpl/test/NightlyRun/test1101.m M /issm/trunk-jpl/test/NightlyRun/test1102.m M /issm/trunk-jpl/test/NightlyRun/test1103.m M /issm/trunk-jpl/test/NightlyRun/test1104.m M /issm/trunk-jpl/test/NightlyRun/test1105.m M /issm/trunk-jpl/test/NightlyRun/test1106.m M /issm/trunk-jpl/test/NightlyRun/test1107.m M /issm/trunk-jpl/test/NightlyRun/test1108.m M /issm/trunk-jpl/test/NightlyRun/test1109.m M /issm/trunk-jpl/test/NightlyRun/test111.m M /issm/trunk-jpl/test/NightlyRun/test1110.m M /issm/trunk-jpl/test/NightlyRun/test112.m M /issm/trunk-jpl/test/NightlyRun/test113.m M /issm/trunk-jpl/test/NightlyRun/test114.m M /issm/trunk-jpl/test/NightlyRun/test115.m M /issm/trunk-jpl/test/NightlyRun/test116.m M /issm/trunk-jpl/test/NightlyRun/test117.m M /issm/trunk-jpl/test/NightlyRun/test118.m M /issm/trunk-jpl/test/NightlyRun/test119.m M /issm/trunk-jpl/test/NightlyRun/test120.m M /issm/trunk-jpl/test/NightlyRun/test1201.m M /issm/trunk-jpl/test/NightlyRun/test1202.m M /issm/trunk-jpl/test/NightlyRun/test1203.m M /issm/trunk-jpl/test/NightlyRun/test1204.m M /issm/trunk-jpl/test/NightlyRun/test1205.m M /issm/trunk-jpl/test/NightlyRun/test1206.m M /issm/trunk-jpl/test/NightlyRun/test1207.m M /issm/trunk-jpl/test/NightlyRun/test1208.m M /issm/trunk-jpl/test/NightlyRun/test121.m M /issm/trunk-jpl/test/NightlyRun/test122.m M /issm/trunk-jpl/test/NightlyRun/test123.m M /issm/trunk-jpl/test/NightlyRun/test124.m M /issm/trunk-jpl/test/NightlyRun/test125.m M /issm/trunk-jpl/test/NightlyRun/test126.m M /issm/trunk-jpl/test/NightlyRun/test127.m M /issm/trunk-jpl/test/NightlyRun/test128.m M /issm/trunk-jpl/test/NightlyRun/test129.m M /issm/trunk-jpl/test/NightlyRun/test130.m M /issm/trunk-jpl/test/NightlyRun/test131.m M /issm/trunk-jpl/test/NightlyRun/test132.m M /issm/trunk-jpl/test/NightlyRun/test133.m M /issm/trunk-jpl/test/NightlyRun/test134.m M /issm/trunk-jpl/test/NightlyRun/test135.m M /issm/trunk-jpl/test/NightlyRun/test136.m M /issm/trunk-jpl/test/NightlyRun/test1501.m M /issm/trunk-jpl/test/NightlyRun/test1502.m M /issm/trunk-jpl/test/NightlyRun/test201.m M /issm/trunk-jpl/test/NightlyRun/test202.m M /issm/trunk-jpl/test/NightlyRun/test203.m M /issm/trunk-jpl/test/NightlyRun/test204.m M /issm/trunk-jpl/test/NightlyRun/test205.m M /issm/trunk-jpl/test/NightlyRun/test206.m M /issm/trunk-jpl/test/NightlyRun/test207.m M /issm/trunk-jpl/test/NightlyRun/test208.m M /issm/trunk-jpl/test/NightlyRun/test209.m M /issm/trunk-jpl/test/NightlyRun/test210.m M /issm/trunk-jpl/test/NightlyRun/test211.m M /issm/trunk-jpl/test/NightlyRun/test212.m M /issm/trunk-jpl/test/NightlyRun/test213.m M /issm/trunk-jpl/test/NightlyRun/test214.m M /issm/trunk-jpl/test/NightlyRun/test215.m M /issm/trunk-jpl/test/NightlyRun/test216.m M /issm/trunk-jpl/test/NightlyRun/test217.m M /issm/trunk-jpl/test/NightlyRun/test218.m M /issm/trunk-jpl/test/NightlyRun/test219.m M /issm/trunk-jpl/test/NightlyRun/test220.m M /issm/trunk-jpl/test/NightlyRun/test221.m M /issm/trunk-jpl/test/NightlyRun/test222.m M /issm/trunk-jpl/test/NightlyRun/test223.m M /issm/trunk-jpl/test/NightlyRun/test224.m M /issm/trunk-jpl/test/NightlyRun/test225.m M /issm/trunk-jpl/test/NightlyRun/test226.m M /issm/trunk-jpl/test/NightlyRun/test227.m M /issm/trunk-jpl/test/NightlyRun/test228.m M /issm/trunk-jpl/test/NightlyRun/test229.m M /issm/trunk-jpl/test/NightlyRun/test230.m M /issm/trunk-jpl/test/NightlyRun/test232.m M /issm/trunk-jpl/test/NightlyRun/test233.m M /issm/trunk-jpl/test/NightlyRun/test234.m M /issm/trunk-jpl/test/NightlyRun/test237.m M /issm/trunk-jpl/test/NightlyRun/test238.m M /issm/trunk-jpl/test/NightlyRun/test239.m M /issm/trunk-jpl/test/NightlyRun/test240.m M /issm/trunk-jpl/test/NightlyRun/test241.m M /issm/trunk-jpl/test/NightlyRun/test242.m M /issm/trunk-jpl/test/NightlyRun/test243.m M /issm/trunk-jpl/test/NightlyRun/test244.m M /issm/trunk-jpl/test/NightlyRun/test245.m M /issm/trunk-jpl/test/NightlyRun/test246.m M /issm/trunk-jpl/test/NightlyRun/test247.m M /issm/trunk-jpl/test/NightlyRun/test248.m M /issm/trunk-jpl/test/NightlyRun/test249.m M /issm/trunk-jpl/test/NightlyRun/test250.m M /issm/trunk-jpl/test/NightlyRun/test251.m M /issm/trunk-jpl/test/NightlyRun/test252.m M /issm/trunk-jpl/test/NightlyRun/test253.m M /issm/trunk-jpl/test/NightlyRun/test254.m M /issm/trunk-jpl/test/NightlyRun/test255.m M /issm/trunk-jpl/test/NightlyRun/test256.m M /issm/trunk-jpl/test/NightlyRun/test257.m M /issm/trunk-jpl/test/NightlyRun/test258.m M /issm/trunk-jpl/test/NightlyRun/test259.m M /issm/trunk-jpl/test/NightlyRun/test260.m M /issm/trunk-jpl/test/NightlyRun/test261.m M /issm/trunk-jpl/test/NightlyRun/test262.m M /issm/trunk-jpl/test/NightlyRun/test263.m M /issm/trunk-jpl/test/NightlyRun/test264.m M /issm/trunk-jpl/test/NightlyRun/test265.m M /issm/trunk-jpl/test/NightlyRun/test266.m M /issm/trunk-jpl/test/NightlyRun/test301.m M /issm/trunk-jpl/test/NightlyRun/test302.m M /issm/trunk-jpl/test/NightlyRun/test303.m M /issm/trunk-jpl/test/NightlyRun/test304.m M /issm/trunk-jpl/test/NightlyRun/test305.m M /issm/trunk-jpl/test/NightlyRun/test306.m M /issm/trunk-jpl/test/NightlyRun/test307.m M /issm/trunk-jpl/test/NightlyRun/test308.m M /issm/trunk-jpl/test/NightlyRun/test309.m M /issm/trunk-jpl/test/NightlyRun/test310.m M /issm/trunk-jpl/test/NightlyRun/test311.m M /issm/trunk-jpl/test/NightlyRun/test312.m M /issm/trunk-jpl/test/NightlyRun/test313.m M /issm/trunk-jpl/test/NightlyRun/test314.m M /issm/trunk-jpl/test/NightlyRun/test315.m M /issm/trunk-jpl/test/NightlyRun/test316.m M /issm/trunk-jpl/test/NightlyRun/test317.m M /issm/trunk-jpl/test/NightlyRun/test318.m M /issm/trunk-jpl/test/NightlyRun/test319.m M /issm/trunk-jpl/test/NightlyRun/test320.m M /issm/trunk-jpl/test/NightlyRun/test321.m M /issm/trunk-jpl/test/NightlyRun/test322.m M /issm/trunk-jpl/test/NightlyRun/test323.m M /issm/trunk-jpl/test/NightlyRun/test324.m M /issm/trunk-jpl/test/NightlyRun/test325.m M /issm/trunk-jpl/test/NightlyRun/test326.m M /issm/trunk-jpl/test/NightlyRun/test327.m M /issm/trunk-jpl/test/NightlyRun/test328.m M /issm/trunk-jpl/test/NightlyRun/test329.m M /issm/trunk-jpl/test/NightlyRun/test330.m M /issm/trunk-jpl/test/NightlyRun/test331.m M /issm/trunk-jpl/test/NightlyRun/test332.m M /issm/trunk-jpl/test/NightlyRun/test333.m M /issm/trunk-jpl/test/NightlyRun/test334.m M /issm/trunk-jpl/test/NightlyRun/test335.m M /issm/trunk-jpl/test/NightlyRun/test336.m M /issm/trunk-jpl/test/NightlyRun/test337.m M /issm/trunk-jpl/test/NightlyRun/test338.m M /issm/trunk-jpl/test/NightlyRun/test339.m M /issm/trunk-jpl/test/NightlyRun/test340.m M /issm/trunk-jpl/test/NightlyRun/test341.m M /issm/trunk-jpl/test/NightlyRun/test342.m M /issm/trunk-jpl/test/NightlyRun/test343.m M /issm/trunk-jpl/test/NightlyRun/test344.m M /issm/trunk-jpl/test/NightlyRun/test345.m M /issm/trunk-jpl/test/NightlyRun/test346.m M /issm/trunk-jpl/test/NightlyRun/test347.m M /issm/trunk-jpl/test/NightlyRun/test348.m M /issm/trunk-jpl/test/NightlyRun/test401.m M /issm/trunk-jpl/test/NightlyRun/test402.m M /issm/trunk-jpl/test/NightlyRun/test403.m M /issm/trunk-jpl/test/NightlyRun/test404.m M /issm/trunk-jpl/test/NightlyRun/test405.m M /issm/trunk-jpl/test/NightlyRun/test406.m M /issm/trunk-jpl/test/NightlyRun/test407.m M /issm/trunk-jpl/test/NightlyRun/test408.m M /issm/trunk-jpl/test/NightlyRun/test409.m M /issm/trunk-jpl/test/NightlyRun/test410.m M /issm/trunk-jpl/test/NightlyRun/test411.m M /issm/trunk-jpl/test/NightlyRun/test412.m M /issm/trunk-jpl/test/NightlyRun/test413.m M /issm/trunk-jpl/test/NightlyRun/test414.m M /issm/trunk-jpl/test/NightlyRun/test415.m M /issm/trunk-jpl/test/NightlyRun/test416.m M /issm/trunk-jpl/test/NightlyRun/test417.m M /issm/trunk-jpl/test/NightlyRun/test418.m M /issm/trunk-jpl/test/NightlyRun/test419.m M /issm/trunk-jpl/test/NightlyRun/test420.m M /issm/trunk-jpl/test/NightlyRun/test421.m M /issm/trunk-jpl/test/NightlyRun/test422.m M /issm/trunk-jpl/test/NightlyRun/test429.m M /issm/trunk-jpl/test/NightlyRun/test430.m M /issm/trunk-jpl/test/NightlyRun/test431.m M /issm/trunk-jpl/test/NightlyRun/test432.m M /issm/trunk-jpl/test/NightlyRun/test437.m M /issm/trunk-jpl/test/NightlyRun/test438.m M /issm/trunk-jpl/test/NightlyRun/test441.m M /issm/trunk-jpl/test/NightlyRun/test442.m M /issm/trunk-jpl/test/NightlyRun/test443.m M /issm/trunk-jpl/test/NightlyRun/test444.m M /issm/trunk-jpl/test/NightlyRun/test445.m M /issm/trunk-jpl/test/NightlyRun/test446.m M /issm/trunk-jpl/test/NightlyRun/test447.m M /issm/trunk-jpl/test/NightlyRun/test448.m M /issm/trunk-jpl/test/NightlyRun/test449.m M /issm/trunk-jpl/test/NightlyRun/test450.m M /issm/trunk-jpl/test/NightlyRun/test451.m M /issm/trunk-jpl/test/NightlyRun/test452.m M /issm/trunk-jpl/test/NightlyRun/test453.m M /issm/trunk-jpl/test/NightlyRun/test454.m M /issm/trunk-jpl/test/NightlyRun/test501.m M /issm/trunk-jpl/test/NightlyRun/test502.m M /issm/trunk-jpl/test/NightlyRun/test503.m M /issm/trunk-jpl/test/NightlyRun/test504.m M /issm/trunk-jpl/test/NightlyRun/test505.m M /issm/trunk-jpl/test/NightlyRun/test506.m M /issm/trunk-jpl/test/NightlyRun/test507.m M /issm/trunk-jpl/test/NightlyRun/test508.m M /issm/trunk-jpl/test/NightlyRun/test509.m M /issm/trunk-jpl/test/NightlyRun/test510.m M /issm/trunk-jpl/test/NightlyRun/test511.m M /issm/trunk-jpl/test/NightlyRun/test512.m M /issm/trunk-jpl/test/NightlyRun/test513.m M /issm/trunk-jpl/test/NightlyRun/test514.m M /issm/trunk-jpl/test/NightlyRun/test515.m M /issm/trunk-jpl/test/NightlyRun/test516.m M /issm/trunk-jpl/test/NightlyRun/test517.m M /issm/trunk-jpl/test/NightlyRun/test518.m M /issm/trunk-jpl/test/NightlyRun/test519.m M /issm/trunk-jpl/test/NightlyRun/test520.m M /issm/trunk-jpl/test/NightlyRun/test521.m M /issm/trunk-jpl/test/NightlyRun/test522.m M /issm/trunk-jpl/test/NightlyRun/test523.m M /issm/trunk-jpl/test/NightlyRun/test524.m M /issm/trunk-jpl/test/NightlyRun/test525.m M /issm/trunk-jpl/test/NightlyRun/test526.m M /issm/trunk-jpl/test/NightlyRun/test529.m M /issm/trunk-jpl/test/NightlyRun/test530.m M /issm/trunk-jpl/test/NightlyRun/test531.m M /issm/trunk-jpl/test/NightlyRun/test532.m M /issm/trunk-jpl/test/NightlyRun/test601.m M /issm/trunk-jpl/test/NightlyRun/test602.m M /issm/trunk-jpl/test/NightlyRun/test603.m M /issm/trunk-jpl/test/NightlyRun/test604.m M /issm/trunk-jpl/test/NightlyRun/test605.m M /issm/trunk-jpl/test/NightlyRun/test606.m M /issm/trunk-jpl/test/NightlyRun/test607.m M /issm/trunk-jpl/test/NightlyRun/test608.m M /issm/trunk-jpl/test/NightlyRun/test609.m M /issm/trunk-jpl/test/NightlyRun/test610.m M /issm/trunk-jpl/test/NightlyRun/test611.m M /issm/trunk-jpl/test/NightlyRun/test612.m M /issm/trunk-jpl/test/NightlyRun/test613.m M /issm/trunk-jpl/test/NightlyRun/test614.m M /issm/trunk-jpl/test/NightlyRun/test615.m M /issm/trunk-jpl/test/NightlyRun/test616.m M /issm/trunk-jpl/test/NightlyRun/test617.m M /issm/trunk-jpl/test/NightlyRun/test618.m M /issm/trunk-jpl/test/NightlyRun/test619.m M /issm/trunk-jpl/test/NightlyRun/test620.m M /issm/trunk-jpl/test/NightlyRun/test621.m M /issm/trunk-jpl/test/NightlyRun/test622.m M /issm/trunk-jpl/test/NightlyRun/test623.m M /issm/trunk-jpl/test/NightlyRun/test624.m M /issm/trunk-jpl/test/NightlyRun/test625.m M /issm/trunk-jpl/test/NightlyRun/test626.m removed all PatchToVec not needed anymore as default is md.settings.results\_as\_patches = 0 \\\\ Index: /issm/oecreview/Archive/10937-10976/r1.tex =================================================================== --- /issm/oecreview/Archive/10937-10976/r1.tex (revision 10979) +++ /issm/oecreview/Archive/10937-10976/r1.tex (revision 10979) @@ -0,0 +1,1 @@ +10937 Index: /issm/oecreview/Archive/10937-10976/r2.tex =================================================================== --- /issm/oecreview/Archive/10937-10976/r2.tex (revision 10979) +++ /issm/oecreview/Archive/10937-10976/r2.tex (revision 10979) @@ -0,0 +1,1 @@ +10976