Index: sm/trunk/.ignore.txt =================================================================== --- /issm/trunk/.ignore.txt (revision 10980) +++ (revision ) @@ -1,18 +1,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: sm/trunk/bin/.ignore.txt =================================================================== --- /issm/trunk/bin/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -*.mexa64 -Makefile -Makefile.in -issm.exe Index: /issm/trunk/cron/configs/linux64_larour =================================================================== --- /issm/trunk/cron/configs/linux64_larour (revision 10980) +++ /issm/trunk/cron/configs/linux64_larour (revision 10981) @@ -8,5 +8,5 @@ #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" @@ -34,5 +34,5 @@ #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" @@ -50,5 +50,5 @@ # ->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 Index: /issm/trunk/cron/configs/linux64_morlighem_daily =================================================================== --- /issm/trunk/cron/configs/linux64_morlighem_daily (revision 10980) +++ /issm/trunk/cron/configs/linux64_morlighem_daily (revision 10981) @@ -8,5 +8,5 @@ #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" @@ -34,5 +34,5 @@ #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" @@ -50,5 +50,5 @@ # ->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 Index: /issm/trunk/cron/configs/linux64_morlighem_nightly =================================================================== --- /issm/trunk/cron/configs/linux64_morlighem_nightly (revision 10980) +++ /issm/trunk/cron/configs/linux64_morlighem_nightly (revision 10981) @@ -7,6 +7,6 @@ #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" @@ -34,5 +34,5 @@ #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" @@ -50,5 +50,5 @@ # ->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 Index: /issm/trunk/cron/configs/linux64_morlighem_validation =================================================================== --- /issm/trunk/cron/configs/linux64_morlighem_validation (revision 10980) +++ /issm/trunk/cron/configs/linux64_morlighem_validation (revision 10981) @@ -6,6 +6,6 @@ #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" @@ -33,5 +33,5 @@ #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" @@ -49,5 +49,5 @@ # ->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 Index: /issm/trunk/cron/configs/linux64_seroussi =================================================================== --- /issm/trunk/cron/configs/linux64_seroussi (revision 10980) +++ /issm/trunk/cron/configs/linux64_seroussi (revision 10981) @@ -8,5 +8,5 @@ #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 @@ -33,5 +33,5 @@ #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" @@ -49,5 +49,5 @@ # ->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 Index: /issm/trunk/cron/configs/linux64_seroussi_daily =================================================================== --- /issm/trunk/cron/configs/linux64_seroussi_daily (revision 10980) +++ /issm/trunk/cron/configs/linux64_seroussi_daily (revision 10981) @@ -8,5 +8,5 @@ #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" @@ -34,5 +34,5 @@ #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" @@ -50,5 +50,5 @@ # ->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 Index: /issm/trunk/cron/configs/linux64_seroussi_nightly =================================================================== --- /issm/trunk/cron/configs/linux64_seroussi_nightly (revision 10980) +++ /issm/trunk/cron/configs/linux64_seroussi_nightly (revision 10981) @@ -8,5 +8,5 @@ #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" @@ -34,5 +34,5 @@ #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" @@ -50,5 +50,5 @@ # ->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 Index: /issm/trunk/cron/configs/linux64_seroussi_validation =================================================================== --- /issm/trunk/cron/configs/linux64_seroussi_validation (revision 10980) +++ /issm/trunk/cron/configs/linux64_seroussi_validation (revision 10981) @@ -7,5 +7,5 @@ #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" @@ -33,5 +33,5 @@ #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" @@ -49,5 +49,5 @@ # ->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 Index: /issm/trunk/cron/configs/macosx32_seroussi =================================================================== --- /issm/trunk/cron/configs/macosx32_seroussi (revision 10980) +++ /issm/trunk/cron/configs/macosx32_seroussi (revision 10981) @@ -7,6 +7,6 @@ #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 @@ -33,5 +33,5 @@ #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" Index: /issm/trunk/cron/configs/macosx64_larour =================================================================== --- /issm/trunk/cron/configs/macosx64_larour (revision 10980) +++ /issm/trunk/cron/configs/macosx64_larour (revision 10981) @@ -32,5 +32,5 @@ #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" Index: /issm/trunk/cron/configs/winxp32_larour =================================================================== --- /issm/trunk/cron/configs/winxp32_larour (revision 10980) +++ /issm/trunk/cron/configs/winxp32_larour (revision 10981) @@ -7,6 +7,6 @@ #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 @@ -33,5 +33,5 @@ #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" Index: /issm/trunk/cron/cronfiles/linux_cronfile =================================================================== --- /issm/trunk/cron/cronfiles/linux_cronfile (revision 10980) +++ /issm/trunk/cron/cronfiles/linux_cronfile (revision 10981) @@ -6,8 +6,8 @@ #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: sm/trunk/externalpackages/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -MITgcm -OpenAD Index: sm/trunk/externalpackages/adic/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/adic/.ignore.txt (revision 10980) +++ (revision ) @@ -1,5 +1,0 @@ -source -build -install -src -.ignore.txt Index: sm/trunk/externalpackages/adolc/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/adolc/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install* -src -configure.sh -.ignore.txt Index: sm/trunk/externalpackages/angel/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/angel/.ignore.txt (revision 10980) +++ (revision ) @@ -1,1 +1,0 @@ -angel Index: sm/trunk/externalpackages/appscan/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/appscan/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -logs -logs1 Index: sm/trunk/externalpackages/autoconf/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/autoconf/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/automake/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/automake/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/bbftp/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/bbftp/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/boost/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/boost/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/chaco/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/chaco/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install -src -.ignore.txt -old Index: sm/trunk/externalpackages/cmake/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/cmake/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -install -src Index: sm/trunk/externalpackages/colpack/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/colpack/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/cppcheck/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/cppcheck/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/dakota/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/dakota/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install* -src* -configure.sh -.ignore.txt Index: sm/trunk/externalpackages/doxygen/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/doxygen/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/dyson/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/dyson/.ignore.txt (revision 10980) +++ (revision ) @@ -1,1 +1,0 @@ -jplusers.db Index: sm/trunk/externalpackages/flaim/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/flaim/.ignore.txt (revision 10980) +++ (revision ) @@ -1,1 +1,0 @@ -install Index: sm/trunk/externalpackages/gdal/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/gdal/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install* -src -.ignore.txt Index: sm/trunk/externalpackages/googleearthtoolbox/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/googleearthtoolbox/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/graphviz/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/graphviz/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install* -src -configure.sh -.ignore.txt Index: sm/trunk/externalpackages/kml/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/kml/.ignore.txt (revision 10980) +++ (revision ) @@ -1,5 +1,0 @@ -install -src -license.txt -myKML.kml -kml_shapefile.m Index: sm/trunk/externalpackages/latex2rtf/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/latex2rtf/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -cfg -latex2rtf-2.0.0 Index: sm/trunk/externalpackages/libtool/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/libtool/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/m2html/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/m2html/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/matlab/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/matlab/.ignore.txt (revision 10980) +++ (revision ) @@ -1,1 +1,0 @@ -install Index: sm/trunk/externalpackages/mercurial/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/mercurial/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -install -src Index: sm/trunk/externalpackages/metis/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/metis/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install* -src -Makefile.in.patch - Index: sm/trunk/externalpackages/mpich2/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/mpich2/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install* -src -configure.sh -.ignore.txt Index: sm/trunk/externalpackages/netcdf/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/netcdf/.ignore.txt (revision 10980) +++ (revision ) @@ -1,1 +1,0 @@ -install Index: sm/trunk/externalpackages/openanalysis/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/openanalysis/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install -src -openanalysis -.ignore.txt Index: sm/trunk/externalpackages/petsc/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/petsc/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install* -src -configure.sh -.ignore.txt Index: sm/trunk/externalpackages/rats/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/rats/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/rose/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/rose/.ignore.txt (revision 10980) +++ (revision ) @@ -1,5 +1,0 @@ -install -build -source -src -.ignore.txt Index: sm/trunk/externalpackages/satstress/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/satstress/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/externalpackages/scotch/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/scotch/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -install -src Index: sm/trunk/externalpackages/shapelib/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/shapelib/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install* -src - Index: sm/trunk/externalpackages/tao/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/tao/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -install -src Index: sm/trunk/externalpackages/triangle/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/triangle/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -install -configure.make Index: sm/trunk/externalpackages/valgrind/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/valgrind/.ignore.txt (revision 10980) +++ (revision ) @@ -1,4 +1,0 @@ -install -configure.sh -src -.ignore.txt Index: sm/trunk/externalpackages/vim/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/vim/.ignore.txt (revision 10980) +++ (revision ) @@ -1,2 +1,0 @@ -install -src Index: /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim =================================================================== --- /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 10980) +++ /issm/trunk/externalpackages/vim/addons/vim/syntax/c.vim (revision 10981) @@ -441,4 +441,5 @@ syn keyword cType TriaRef syn keyword cType KML_Attribute +syn keyword cType KML_Comment syn keyword cType KML_ColorStyle syn keyword cType KML_Container @@ -501,4 +502,5 @@ syn keyword cType BoolParam syn keyword cType DoubleMatParam +syn keyword cType DoubleTransientMatParam syn keyword cType DoubleMatArrayParam syn keyword cType DoubleParam @@ -544,200 +546,196 @@ "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 InversionControlParametersEnum +syn keyword cConstant InversionCostFunctionEnum +syn keyword cConstant InversionCostFunctionThresholdEnum +syn keyword cConstant InversionCostFunctionsCoefficientsEnum +syn keyword cConstant InversionCostFunctionsEnum +syn keyword cConstant InversionGradientOnlyEnum +syn keyword cConstant InversionGradientScalingEnum syn keyword cConstant InversionIscontrolEnum -syn keyword cConstant InversionControlParametersEnum -syn keyword cConstant InversionCostFunctionsEnum -syn keyword cConstant InversionCostFunctionEnum -syn keyword cConstant InversionCostFunctionsCoefficientsEnum +syn keyword cConstant InversionMaxParametersEnum +syn keyword cConstant InversionMaxiterPerStepEnum +syn keyword cConstant InversionMinParametersEnum syn keyword cConstant InversionNstepsEnum -syn keyword cConstant InversionMaxiterPerStepEnum -syn keyword cConstant InversionGradientScalingEnum -syn keyword cConstant InversionGradientOnlyEnum -syn keyword cConstant InversionCostFunctionThresholdEnum -syn keyword cConstant InversionMaxParametersEnum -syn keyword cConstant InversionMinParametersEnum -syn keyword cConstant InversionStepThresholdEnum 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 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 HydrologySolutionEnum -syn keyword cConstant HydrologyAnalysisEnum -syn keyword cConstant TransientSolutionEnum +syn keyword cConstant BalancethicknessAnalysisEnum +syn keyword cConstant BalancethicknessSolutionEnum +syn keyword cConstant BedSlopeAnalysisEnum syn keyword cConstant BedSlopeSolutionEnum -syn keyword cConstant BedSlopeAnalysisEnum -syn keyword cConstant SurfaceSlopeSolutionEnum -syn keyword cConstant SurfaceSlopeAnalysisEnum syn keyword cConstant BedSlopeXAnalysisEnum syn keyword cConstant BedSlopeYAnalysisEnum +syn keyword cConstant DiagnosticHorizAnalysisEnum +syn keyword cConstant DiagnosticHutterAnalysisEnum +syn keyword cConstant DiagnosticSolutionEnum +syn keyword cConstant DiagnosticVertAnalysisEnum +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 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 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 @@ -749,61 +747,68 @@ 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 IcefrontEnum +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 MaticeEnum +syn keyword cConstant MatparEnum syn keyword cConstant NodeEnum -syn keyword cConstant VertexEnum -syn keyword cConstant IcefrontEnum syn keyword cConstant NumericalfluxEnum +syn keyword cConstant ParamEnum +syn keyword cConstant PattynIceFrontEnum syn keyword cConstant PengridEnum syn keyword cConstant PenpairEnum -syn keyword cConstant RiftfrontEnum -syn keyword cConstant SegmentRiftfrontEnum -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 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 TriaEnum +syn keyword cConstant TriaVertexInputEnum +syn keyword cConstant VertexEnum +syn keyword cConstant AirEnum +syn keyword cConstant IceEnum +syn keyword cConstant MelangeEnum syn keyword cConstant WaterEnum -syn keyword cConstant IceEnum -syn keyword cConstant AirEnum -syn keyword cConstant MelangeEnum +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 @@ -811,69 +816,93 @@ 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 JEnum +syn keyword cConstant PatchEnum +syn keyword cConstant PatchNodesEnum +syn keyword cConstant PatchVerticesEnum +syn keyword cConstant PentaVertexElementResultEnum syn keyword cConstant PetscVecExternalResultEnum syn keyword cConstant StringExternalResultEnum -syn keyword cConstant JEnum -syn keyword cConstant PatchEnum -syn keyword cConstant PatchVerticesEnum -syn keyword cConstant PatchNodesEnum syn keyword cConstant TimeEnum +syn keyword cConstant TriaVertexElementResultEnum syn keyword cConstant WaterColumnOldEnum syn keyword cConstant MinVelEnum @@ -891,37 +920,39 @@ 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 @@ -932,28 +963,4 @@ 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: sm/trunk/externalpackages/xaifbooster/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/xaifbooster/.ignore.txt (revision 10980) +++ (revision ) @@ -1,1 +1,0 @@ -xaifBooster Index: sm/trunk/externalpackages/xerces/.ignore.txt =================================================================== --- /issm/trunk/externalpackages/xerces/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -install -src -.ignore.txt Index: sm/trunk/src/.ignore.txt =================================================================== --- /issm/trunk/src/.ignore.txt (revision 10980) +++ (revision ) @@ -1,3 +1,0 @@ -Makefile -ignore.txt -Makefile.in Index: sm/trunk/src/ad/.ignore.txt =================================================================== --- /issm/trunk/src/ad/.ignore.txt (revision 10980) +++ (revision ) @@ -1,19 +1,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: /issm/trunk/src/ad/validation/Update/update.m =================================================================== --- /issm/trunk/src/ad/validation/Update/update.m (revision 10980) +++ /issm/trunk/src/ad/validation/Update/update.m (revision 10981) @@ -5,5 +5,4 @@ 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: sm/trunk/src/c/.ignore.txt =================================================================== --- /issm/trunk/src/c/.ignore.txt (revision 10980) +++ (revision ) @@ -1,15 +1,0 @@ -Makefile -Makefile.in -.ignore.txt -*.o -*.exe -appscan.* -ouncemake* -list -*.ppf_cache -.deps -config -g++results -probe.results -stXXXX* - Index: /issm/trunk/src/c/Container/Elements.cpp =================================================================== --- /issm/trunk/src/c/Container/Elements.cpp (revision 10980) +++ /issm/trunk/src/c/Container/Elements.cpp (revision 10981) @@ -173,5 +173,5 @@ Vec vector = NULL; bool io_gather; - bool results_on_vertices; + bool results_as_patches; int numberofvertices; int numberofresults; @@ -179,8 +179,8 @@ /*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*/ Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 10980) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 10981) @@ -142,5 +142,5 @@ SettingsLowmemEnum, SettingsOutputFrequencyEnum, - SettingsResultsOnVerticesEnum, + SettingsResultsAsPatchesEnum, SettingsWaitonlockEnum, SteadystateMaxiterEnum, Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 10980) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 10981) @@ -146,5 +146,5 @@ case SettingsLowmemEnum : return "SettingsLowmem"; case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency"; - case SettingsResultsOnVerticesEnum : return "SettingsResultsOnVertices"; + case SettingsResultsAsPatchesEnum : return "SettingsResultsAsPatches"; case SettingsWaitonlockEnum : return "SettingsWaitonlock"; case SteadystateMaxiterEnum : return "SteadystateMaxiter"; Index: /issm/trunk/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 10980) +++ /issm/trunk/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 10981) @@ -29,5 +29,5 @@ 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*/ Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 10980) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 10981) @@ -71,5 +71,5 @@ 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)); Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 10980) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 10981) @@ -144,5 +144,5 @@ 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; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 10980) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 10981) @@ -1597,6 +1597,6 @@ 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*/ Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 10980) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 10981) @@ -1443,8 +1443,8 @@ /*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*/ Index: /issm/trunk/src/c/objects/Materials/Matice.cpp =================================================================== --- /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 10980) +++ /issm/trunk/src/c/objects/Materials/Matice.cpp (revision 10981) @@ -669,5 +669,5 @@ 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*/ Index: /issm/trunk/src/m/classes/autodiff.m =================================================================== --- /issm/trunk/src/m/classes/autodiff.m (revision 10980) +++ /issm/trunk/src/m/classes/autodiff.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -28,10 +28,4 @@ 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) % {{{ @@ -46,4 +40,9 @@ 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: /issm/trunk/src/m/classes/balancethickness.m =================================================================== --- /issm/trunk/src/m/classes/balancethickness.m (revision 10980) +++ /issm/trunk/src/m/classes/balancethickness.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -27,11 +27,4 @@ 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 @@ -55,4 +48,9 @@ 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: /issm/trunk/src/m/classes/basalforcings.m =================================================================== --- /issm/trunk/src/m/classes/basalforcings.m (revision 10980) +++ /issm/trunk/src/m/classes/basalforcings.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -28,10 +28,4 @@ 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,4 +50,9 @@ 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: /issm/trunk/src/m/classes/constants.m =================================================================== --- /issm/trunk/src/m/classes/constants.m (revision 10980) +++ /issm/trunk/src/m/classes/constants.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -27,11 +27,4 @@ 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) @@ -60,4 +53,9 @@ 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: /issm/trunk/src/m/classes/diagnostic.m =================================================================== --- /issm/trunk/src/m/classes/diagnostic.m (revision 10980) +++ /issm/trunk/src/m/classes/diagnostic.m (revision 10981) @@ -6,21 +6,21 @@ 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 @@ -41,11 +41,4 @@ 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. @@ -157,4 +150,29 @@ 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: /issm/trunk/src/m/classes/flowequation.m =================================================================== --- /issm/trunk/src/m/classes/flowequation.m (revision 10980) +++ /issm/trunk/src/m/classes/flowequation.m (revision 10981) @@ -6,12 +6,12 @@ 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 @@ -32,11 +32,4 @@ 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 % }}} @@ -82,4 +75,33 @@ 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: /issm/trunk/src/m/classes/friction.m =================================================================== --- /issm/trunk/src/m/classes/friction.m (revision 10980) +++ /issm/trunk/src/m/classes/friction.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -28,11 +28,4 @@ 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,4 +44,9 @@ 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: /issm/trunk/src/m/classes/geometry.m =================================================================== --- /issm/trunk/src/m/classes/geometry.m (revision 10980) +++ /issm/trunk/src/m/classes/geometry.m (revision 10981) @@ -6,9 +6,9 @@ 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 @@ -29,11 +29,4 @@ 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 % }}} @@ -57,4 +50,11 @@ 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: /issm/trunk/src/m/classes/groundingline.m =================================================================== --- /issm/trunk/src/m/classes/groundingline.m (revision 10980) +++ /issm/trunk/src/m/classes/groundingline.m (revision 10981) @@ -6,6 +6,6 @@ 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 @@ -26,11 +26,4 @@ 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 @@ -68,4 +61,8 @@ 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: /issm/trunk/src/m/classes/hydrology.m =================================================================== --- /issm/trunk/src/m/classes/hydrology.m (revision 10980) +++ /issm/trunk/src/m/classes/hydrology.m (revision 10981) @@ -6,11 +6,11 @@ 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 @@ -31,11 +31,4 @@ 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 @@ -69,4 +62,13 @@ 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: /issm/trunk/src/m/classes/initialization.m =================================================================== --- /issm/trunk/src/m/classes/initialization.m (revision 10980) +++ /issm/trunk/src/m/classes/initialization.m (revision 10981) @@ -6,12 +6,12 @@ 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 @@ -32,11 +32,4 @@ 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 % }}} @@ -83,4 +76,13 @@ 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: /issm/trunk/src/m/classes/inversion.m =================================================================== --- /issm/trunk/src/m/classes/inversion.m (revision 10980) +++ /issm/trunk/src/m/classes/inversion.m (revision 10981) @@ -18,6 +18,4 @@ 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); @@ -126,6 +124,4 @@ 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]'); @@ -143,4 +139,46 @@ 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: /issm/trunk/src/m/classes/mask.m =================================================================== --- /issm/trunk/src/m/classes/mask.m (revision 10980) +++ /issm/trunk/src/m/classes/mask.m (revision 10981) @@ -6,10 +6,10 @@ 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 @@ -31,11 +31,4 @@ 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) % {{{ @@ -49,5 +42,4 @@ end % }}} function disp(obj) % {{{ - fielddisplay(obj,'elementonfloatingice','element on floating ice flags list'); fielddisplay(obj,'vertexonfloatingice','vertex on floating ice flags list'); @@ -57,4 +49,12 @@ 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: /issm/trunk/src/m/classes/materials.m =================================================================== --- /issm/trunk/src/m/classes/materials.m (revision 10980) +++ /issm/trunk/src/m/classes/materials.m (revision 10981) @@ -6,17 +6,17 @@ 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 @@ -37,11 +37,4 @@ 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) @@ -104,4 +97,19 @@ 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/trunk/src/m/classes/mesh.m =================================================================== --- /issm/trunk/src/m/classes/mesh.m (revision 10980) +++ /issm/trunk/src/m/classes/mesh.m (revision 10981) @@ -6,43 +6,43 @@ 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); - - 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); - - 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'); - - 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'); - - extractedvertices = modelfield('default',NaN,'marshall',false); - extractedelements = modelfield('default',NaN,'marshall',false); + lat = NaN + long = NaN + hemisphere = NaN + + elementonbed = NaN + elementonsurface = NaN + vertexonbed = NaN + vertexonsurface = NaN + lowerelements = NaN + lowervertex = NaN + upperelements = NaN + uppervertex = NaN + vertexonboundary = NaN + + edges = NaN + segments = NaN + segmentmarkers = NaN + vertexconnectivity = NaN + elementconnectivity = NaN + average_vertex_connectivity = 0; + + x2d = NaN + y2d = NaN + elements2d = NaN + numberofvertices2d = 0; + numberofelements2d = 0; + + extractedvertices = NaN + extractedelements = NaN end methods @@ -63,11 +63,4 @@ 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 @@ -183,4 +176,27 @@ 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: /issm/trunk/src/m/classes/miscellaneous.m =================================================================== --- /issm/trunk/src/m/classes/miscellaneous.m (revision 10980) +++ /issm/trunk/src/m/classes/miscellaneous.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -33,10 +33,4 @@ 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) % {{{ @@ -48,4 +42,7 @@ end % }}} + function marshall(obj,fid) % {{{ + WriteData(fid,'object',obj,'fieldname','name','format','String'); + end % }}} end end Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 10980) +++ /issm/trunk/src/m/classes/model/model.m (revision 10981) @@ -8,42 +8,42 @@ % {{{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); - - 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); - - 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); - - 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); - - autodiff = modelfield('default',0,'marshall',true); - flaim = modelfield('default',0,'marshall',false); - inversion = modelfield('default',0,'marshall',true); - qmu = modelfield('default',0,'marshall',true); - - results = modelfield('default',0,'marshall',false); - radaroverlay = modelfield('default',0,'marshall',false); - miscellaneous = modelfield('default',0,'marshall',true); - private = modelfield('default',0,'marshall',false); + mesh = 0; + mask = 0; + + geometry = 0; + constants = 0; + surfaceforcings = 0; + basalforcings = 0; + materials = 0; + friction = 0; + flowequation = 0; + timestepping = 0; + initialization = 0; + rifts = 0; + + debug = 0; + verbose = 0; + settings = 0; + solver = 0; + cluster = 0; + + balancethickness = 0; + diagnostic = 0; + groundingline = 0; + hydrology = 0; + prognostic = 0; + thermal = 0; + steadystate = 0; + transient = 0; + + autodiff = 0; + flaim = 0; + inversion = 0; + qmu = 0; + + results = 0; + radaroverlay = 0; + miscellaneous = 0; + private = 0; %}}} @@ -388,46 +388,39 @@ 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 %}}} Index: /issm/trunk/src/m/classes/private.m =================================================================== --- /issm/trunk/src/m/classes/private.m (revision 10980) +++ /issm/trunk/src/m/classes/private.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -28,11 +28,4 @@ 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: /issm/trunk/src/m/classes/prognostic.m =================================================================== --- /issm/trunk/src/m/classes/prognostic.m (revision 10980) +++ /issm/trunk/src/m/classes/prognostic.m (revision 10981) @@ -6,9 +6,9 @@ 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 @@ -29,11 +29,4 @@ 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 @@ -67,4 +60,11 @@ 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: /issm/trunk/src/m/classes/qmu.m =================================================================== --- /issm/trunk/src/m/classes/qmu.m (revision 10980) +++ /issm/trunk/src/m/classes/qmu.m (revision 10981) @@ -6,20 +6,20 @@ 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 @@ -40,11 +40,5 @@ 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) % {{{ @@ -165,4 +159,14 @@ 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: /issm/trunk/src/m/classes/rifts.m =================================================================== --- /issm/trunk/src/m/classes/rifts.m (revision 10980) +++ /issm/trunk/src/m/classes/rifts.m (revision 10981) @@ -6,7 +6,6 @@ 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 @@ -28,13 +27,12 @@ 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!']); @@ -50,5 +48,5 @@ 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 @@ -62,4 +60,34 @@ 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: /issm/trunk/src/m/classes/settings.m =================================================================== --- /issm/trunk/src/m/classes/settings.m (revision 10980) +++ /issm/trunk/src/m/classes/settings.m (revision 10981) @@ -6,9 +6,9 @@ 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_as_patches = 0; + output_frequency = 0; + waitonlock = 0; end methods @@ -30,11 +30,4 @@ 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; @@ -45,4 +38,7 @@ %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 @@ -56,5 +52,5 @@ 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); @@ -66,9 +62,16 @@ 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'); 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_as_patches','format','Boolean'); + WriteData(fid,'object',obj,'fieldname','output_frequency','format','Integer'); + WriteData(fid,'object',obj,'fieldname','waitonlock','format','Boolean'); + end % }}} end end Index: /issm/trunk/src/m/classes/steadystate.m =================================================================== --- /issm/trunk/src/m/classes/steadystate.m (revision 10980) +++ /issm/trunk/src/m/classes/steadystate.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -27,12 +27,4 @@ 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; @@ -62,4 +54,9 @@ 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: /issm/trunk/src/m/classes/surfaceforcings.m =================================================================== --- /issm/trunk/src/m/classes/surfaceforcings.m (revision 10980) +++ /issm/trunk/src/m/classes/surfaceforcings.m (revision 10981) @@ -6,7 +6,7 @@ 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 @@ -28,10 +28,4 @@ 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) % {{{ @@ -52,4 +46,9 @@ 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: /issm/trunk/src/m/classes/thermal.m =================================================================== --- /issm/trunk/src/m/classes/thermal.m (revision 10980) +++ /issm/trunk/src/m/classes/thermal.m (revision 10981) @@ -6,10 +6,10 @@ 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 @@ -30,11 +30,4 @@ 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 @@ -68,4 +61,12 @@ 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: /issm/trunk/src/m/classes/timestepping.m =================================================================== --- /issm/trunk/src/m/classes/timestepping.m (revision 10980) +++ /issm/trunk/src/m/classes/timestepping.m (revision 10981) @@ -6,8 +6,8 @@ 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 @@ -28,11 +28,4 @@ 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 @@ -60,4 +53,10 @@ 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: /issm/trunk/src/m/classes/transient.m =================================================================== --- /issm/trunk/src/m/classes/transient.m (revision 10980) +++ /issm/trunk/src/m/classes/transient.m (revision 10981) @@ -6,9 +6,9 @@ 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 @@ -29,11 +29,4 @@ 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 @@ -65,4 +58,11 @@ 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: /issm/trunk/src/m/classes/verbose.m =================================================================== --- /issm/trunk/src/m/classes/verbose.m (revision 10980) +++ /issm/trunk/src/m/classes/verbose.m (revision 10981) @@ -23,11 +23,11 @@ % {{{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 % }}} @@ -117,4 +117,7 @@ end %}}} + function marshall(obj,fid) % {{{ + WriteData(fid,'data',VerboseToBinary(obj),'enum',VerboseEnum,'format','Integer'); + end % }}} end end Index: /issm/trunk/src/m/enum/QmuBedEnum.m =================================================================== --- /issm/trunk/src/m/enum/QmuBedEnum.m (revision 10981) +++ /issm/trunk/src/m/enum/QmuBedEnum.m (revision 10981) @@ -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: /issm/trunk/src/m/enum/QmuMeltingEnum.m =================================================================== --- /issm/trunk/src/m/enum/QmuMeltingEnum.m (revision 10981) +++ /issm/trunk/src/m/enum/QmuMeltingEnum.m (revision 10981) @@ -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: /issm/trunk/src/m/enum/QmuSurfaceEnum.m =================================================================== --- /issm/trunk/src/m/enum/QmuSurfaceEnum.m (revision 10981) +++ /issm/trunk/src/m/enum/QmuSurfaceEnum.m (revision 10981) @@ -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: /issm/trunk/src/m/enum/QmuThicknessEnum.m =================================================================== --- /issm/trunk/src/m/enum/QmuThicknessEnum.m (revision 10981) +++ /issm/trunk/src/m/enum/QmuThicknessEnum.m (revision 10981) @@ -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: /issm/trunk/src/m/enum/SettingsResultsAsPatchesEnum.m =================================================================== --- /issm/trunk/src/m/enum/SettingsResultsAsPatchesEnum.m (revision 10981) +++ /issm/trunk/src/m/enum/SettingsResultsAsPatchesEnum.m (revision 10981) @@ -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: sm/trunk/src/m/enum/SettingsResultsOnVerticesEnum.m =================================================================== --- /issm/trunk/src/m/enum/SettingsResultsOnVerticesEnum.m (revision 10980) +++ (revision ) @@ -1,11 +1,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: /issm/trunk/src/m/model/WriteData.m =================================================================== --- /issm/trunk/src/m/model/WriteData.m (revision 10981) +++ /issm/trunk/src/m/model/WriteData.m (revision 10981) @@ -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: /issm/trunk/src/m/model/marshall.m =================================================================== --- /issm/trunk/src/m/model/marshall.m (revision 10980) +++ /issm/trunk/src/m/model/marshall.m (revision 10981) @@ -1,6 +1,6 @@ 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 % @@ -16,7 +16,23 @@ end -%automatically marshall model md, using template information available from an empty model class. -template=model.template(); -MarshallObject(fid,template,md,''); +%Go through al model field check that it is a class and call checkconsistency +fields=properties(md); +for i=1:length(fields), + field=fields{i}; + + %Some properties do not need to be marshalled + if ismember(field,{'results' 'debug' 'radaroverlay' 'solver' 'cluster' 'flaim' 'private'}), + continue; + end + + %Check that current field is an object + if ~isobject(md.(field)) + checkmessage(['field ''' char(field) ''' is not an object']); + end + + %Marshall current object + %disp(['marshalling ' field '...']); + md.(field).marshall(fid); +end %close file @@ -25,346 +41,2 @@ error(['marshall error message: could not close file ' [md.miscellaneous.name '.bin']]); end - -function MarshallObject(fid,template,object,prefix) % {{{ -fields=fieldnames(template); -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 - - %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)); - 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; - 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) ')']); -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']); -% }}} -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: sm/trunk/src/m/model/presolve.m =================================================================== --- /issm/trunk/src/m/model/presolve.m (revision 10980) +++ (revision ) @@ -1,16 +1,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: /issm/trunk/src/m/model/solve.m =================================================================== --- /issm/trunk/src/m/model/solve.m (revision 10980) +++ /issm/trunk/src/m/model/solve.m (revision 10981) @@ -52,7 +52,4 @@ end -%preprocesses model before solving -md=presolve(md); - %Save model as is (in case of a crash) assignin('base',inputname(1),md); Index: sm/trunk/src/mex/.ignore.txt =================================================================== --- /issm/trunk/src/mex/.ignore.txt (revision 10980) +++ (revision ) @@ -1,6 +1,0 @@ -Makefile -.ignore.txt -Makefile.in -*.mexa64 -.deps -*.o Index: /issm/trunk/startup.m =================================================================== --- /issm/trunk/startup.m (revision 10980) +++ /issm/trunk/startup.m (revision 10981) @@ -11,7 +11,6 @@ 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!'); @@ -32,4 +31,5 @@ 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. @@ -55,14 +55,7 @@ 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: sm/trunk/test/NightlyRun/.ignore.txt =================================================================== --- /issm/trunk/test/NightlyRun/.ignore.txt (revision 10980) +++ (revision ) @@ -1,6 +1,0 @@ -*.tar.gz -*.bin -*.petsc -*.outlog -*.errlog -*.queue Index: /issm/trunk/test/NightlyRun/test101.m =================================================================== --- /issm/trunk/test/NightlyRun/test101.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test101.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test102.m =================================================================== --- /issm/trunk/test/NightlyRun/test102.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test102.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test103.m =================================================================== --- /issm/trunk/test/NightlyRun/test103.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test103.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test104.m =================================================================== --- /issm/trunk/test/NightlyRun/test104.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test104.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test105.m =================================================================== --- /issm/trunk/test/NightlyRun/test105.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test105.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test106.m =================================================================== --- /issm/trunk/test/NightlyRun/test106.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test106.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test107.m =================================================================== --- /issm/trunk/test/NightlyRun/test107.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test107.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test108.m =================================================================== --- /issm/trunk/test/NightlyRun/test108.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test108.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test109.m =================================================================== --- /issm/trunk/test/NightlyRun/test109.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test109.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test110.m =================================================================== --- /issm/trunk/test/NightlyRun/test110.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test110.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test1101.m =================================================================== --- /issm/trunk/test/NightlyRun/test1101.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1101.m (revision 10981) @@ -43,7 +43,7 @@ %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)); @@ -130,7 +130,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk/test/NightlyRun/test1102.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1102.m (revision 10981) @@ -52,8 +52,8 @@ %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)); @@ -140,7 +140,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1103.m =================================================================== --- /issm/trunk/test/NightlyRun/test1103.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1103.m (revision 10981) @@ -40,7 +40,7 @@ %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)); @@ -121,7 +121,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1104.m =================================================================== --- /issm/trunk/test/NightlyRun/test1104.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1104.m (revision 10981) @@ -40,7 +40,7 @@ %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; @@ -69,7 +69,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1105.m =================================================================== --- /issm/trunk/test/NightlyRun/test1105.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1105.m (revision 10981) @@ -66,7 +66,7 @@ %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)); @@ -153,7 +153,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1106.m =================================================================== --- /issm/trunk/test/NightlyRun/test1106.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1106.m (revision 10981) @@ -33,7 +33,7 @@ %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; @@ -62,7 +62,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1107.m =================================================================== --- /issm/trunk/test/NightlyRun/test1107.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1107.m (revision 10981) @@ -61,7 +61,7 @@ %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)); @@ -142,7 +142,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1108.m =================================================================== --- /issm/trunk/test/NightlyRun/test1108.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1108.m (revision 10981) @@ -41,7 +41,7 @@ %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; @@ -70,7 +70,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1109.m =================================================================== --- /issm/trunk/test/NightlyRun/test1109.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1109.m (revision 10981) @@ -51,7 +51,7 @@ 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; @@ -103,7 +103,7 @@ result=results{i}; field_values={field_values{:},... - PatchToVec(result.Vx),... - PatchToVec(result.Vy),... - PatchToVec(result.Vz),... + (result.Vx),... + (result.Vy),... + (result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test111.m =================================================================== --- /issm/trunk/test/NightlyRun/test111.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test111.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test1110.m =================================================================== --- /issm/trunk/test/NightlyRun/test1110.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1110.m (revision 10981) @@ -64,7 +64,7 @@ %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, @@ -85,5 +85,5 @@ 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') @@ -121,8 +121,8 @@ 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: /issm/trunk/test/NightlyRun/test112.m =================================================================== --- /issm/trunk/test/NightlyRun/test112.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test112.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test113.m =================================================================== --- /issm/trunk/test/NightlyRun/test113.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test113.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test114.m =================================================================== --- /issm/trunk/test/NightlyRun/test114.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test114.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test115.m =================================================================== --- /issm/trunk/test/NightlyRun/test115.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test115.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test116.m =================================================================== --- /issm/trunk/test/NightlyRun/test116.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test116.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test117.m =================================================================== --- /issm/trunk/test/NightlyRun/test117.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test117.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test118.m =================================================================== --- /issm/trunk/test/NightlyRun/test118.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test118.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test119.m =================================================================== --- /issm/trunk/test/NightlyRun/test119.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test119.m (revision 10981) @@ -16,24 +16,24 @@ 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: /issm/trunk/test/NightlyRun/test120.m =================================================================== --- /issm/trunk/test/NightlyRun/test120.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test120.m (revision 10981) @@ -13,24 +13,24 @@ 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: /issm/trunk/test/NightlyRun/test1201.m =================================================================== --- /issm/trunk/test/NightlyRun/test1201.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1201.m (revision 10981) @@ -41,5 +41,5 @@ md.verbose=verbose(); md=solve(md,TransientSolutionEnum); - results{stabilization}=PatchToVec(md.results.TransientSolution(end).Thickness); + results{stabilization}=(md.results.TransientSolution(end).Thickness); end Index: /issm/trunk/test/NightlyRun/test1202.m =================================================================== --- /issm/trunk/test/NightlyRun/test1202.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1202.m (revision 10981) @@ -14,6 +14,6 @@ %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}, ... Index: /issm/trunk/test/NightlyRun/test1203.m =================================================================== --- /issm/trunk/test/NightlyRun/test1203.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1203.m (revision 10981) @@ -17,6 +17,6 @@ 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 Index: /issm/trunk/test/NightlyRun/test1204.m =================================================================== --- /issm/trunk/test/NightlyRun/test1204.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1204.m (revision 10981) @@ -18,6 +18,6 @@ %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; @@ -26,5 +26,5 @@ 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') @@ -33,5 +33,5 @@ end -plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Vy)) +plotmodel(md,'data',(md.results.TransientSolution(end).Vy)) if printingflag, set(gcf,'Color','w') @@ -40,5 +40,5 @@ end -plotmodel(md,'data',PatchToVec(md.results.TransientSolution(end).Thickness)) +plotmodel(md,'data',(md.results.TransientSolution(end).Thickness)) if printingflag, set(gcf,'Color','w') @@ -51,6 +51,6 @@ 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: /issm/trunk/test/NightlyRun/test1205.m =================================================================== --- /issm/trunk/test/NightlyRun/test1205.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1205.m (revision 10981) @@ -32,6 +32,6 @@ %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); Index: /issm/trunk/test/NightlyRun/test1206.m =================================================================== --- /issm/trunk/test/NightlyRun/test1206.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1206.m (revision 10981) @@ -32,6 +32,6 @@ %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); Index: /issm/trunk/test/NightlyRun/test1207.m =================================================================== --- /issm/trunk/test/NightlyRun/test1207.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1207.m (revision 10981) @@ -32,6 +32,6 @@ %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); Index: /issm/trunk/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk/test/NightlyRun/test1208.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1208.m (revision 10981) @@ -33,13 +33,13 @@ 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: /issm/trunk/test/NightlyRun/test121.m =================================================================== --- /issm/trunk/test/NightlyRun/test121.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test121.m (revision 10981) @@ -13,33 +13,33 @@ 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: /issm/trunk/test/NightlyRun/test122.m =================================================================== --- /issm/trunk/test/NightlyRun/test122.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test122.m (revision 10981) @@ -13,33 +13,33 @@ 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: /issm/trunk/test/NightlyRun/test123.m =================================================================== --- /issm/trunk/test/NightlyRun/test123.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test123.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test124.m =================================================================== --- /issm/trunk/test/NightlyRun/test124.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test124.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test125.m =================================================================== --- /issm/trunk/test/NightlyRun/test125.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test125.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test126.m =================================================================== --- /issm/trunk/test/NightlyRun/test126.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test126.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test127.m =================================================================== --- /issm/trunk/test/NightlyRun/test127.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test127.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test128.m =================================================================== --- /issm/trunk/test/NightlyRun/test128.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test128.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test129.m =================================================================== --- /issm/trunk/test/NightlyRun/test129.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test129.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test130.m =================================================================== --- /issm/trunk/test/NightlyRun/test130.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test130.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test131.m =================================================================== --- /issm/trunk/test/NightlyRun/test131.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test131.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test132.m =================================================================== --- /issm/trunk/test/NightlyRun/test132.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test132.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test133.m =================================================================== --- /issm/trunk/test/NightlyRun/test133.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test133.m (revision 10981) @@ -14,4 +14,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test134.m =================================================================== --- /issm/trunk/test/NightlyRun/test134.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test134.m (revision 10981) @@ -14,4 +14,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test135.m =================================================================== --- /issm/trunk/test/NightlyRun/test135.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test135.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test136.m =================================================================== --- /issm/trunk/test/NightlyRun/test136.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test136.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test1501.m =================================================================== --- /issm/trunk/test/NightlyRun/test1501.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1501.m (revision 10981) @@ -21,5 +21,5 @@ 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 @@ -47,44 +47,44 @@ 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),... }; @@ -106,8 +106,8 @@ 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 Index: /issm/trunk/test/NightlyRun/test1502.m =================================================================== --- /issm/trunk/test/NightlyRun/test1502.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test1502.m (revision 10981) @@ -22,5 +22,5 @@ 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 @@ -48,49 +48,49 @@ 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),... }; @@ -112,8 +112,8 @@ 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 Index: /issm/trunk/test/NightlyRun/test201.m =================================================================== --- /issm/trunk/test/NightlyRun/test201.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test201.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test202.m =================================================================== --- /issm/trunk/test/NightlyRun/test202.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test202.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test203.m =================================================================== --- /issm/trunk/test/NightlyRun/test203.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test203.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test204.m =================================================================== --- /issm/trunk/test/NightlyRun/test204.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test204.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test205.m =================================================================== --- /issm/trunk/test/NightlyRun/test205.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test205.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test206.m =================================================================== --- /issm/trunk/test/NightlyRun/test206.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test206.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test207.m =================================================================== --- /issm/trunk/test/NightlyRun/test207.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test207.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test208.m =================================================================== --- /issm/trunk/test/NightlyRun/test208.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test208.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test209.m =================================================================== --- /issm/trunk/test/NightlyRun/test209.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test209.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test210.m =================================================================== --- /issm/trunk/test/NightlyRun/test210.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test210.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test211.m =================================================================== --- /issm/trunk/test/NightlyRun/test211.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test211.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test212.m =================================================================== --- /issm/trunk/test/NightlyRun/test212.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test212.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test213.m =================================================================== --- /issm/trunk/test/NightlyRun/test213.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test213.m (revision 10981) @@ -11,9 +11,9 @@ 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: /issm/trunk/test/NightlyRun/test214.m =================================================================== --- /issm/trunk/test/NightlyRun/test214.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test214.m (revision 10981) @@ -11,9 +11,9 @@ 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: /issm/trunk/test/NightlyRun/test215.m =================================================================== --- /issm/trunk/test/NightlyRun/test215.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test215.m (revision 10981) @@ -10,24 +10,24 @@ 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: /issm/trunk/test/NightlyRun/test216.m =================================================================== --- /issm/trunk/test/NightlyRun/test216.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test216.m (revision 10981) @@ -10,24 +10,24 @@ 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: /issm/trunk/test/NightlyRun/test217.m =================================================================== --- /issm/trunk/test/NightlyRun/test217.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test217.m (revision 10981) @@ -13,33 +13,33 @@ 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: /issm/trunk/test/NightlyRun/test218.m =================================================================== --- /issm/trunk/test/NightlyRun/test218.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test218.m (revision 10981) @@ -13,33 +13,33 @@ 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: /issm/trunk/test/NightlyRun/test219.m =================================================================== --- /issm/trunk/test/NightlyRun/test219.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test219.m (revision 10981) @@ -13,33 +13,33 @@ 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: /issm/trunk/test/NightlyRun/test220.m =================================================================== --- /issm/trunk/test/NightlyRun/test220.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test220.m (revision 10981) @@ -16,33 +16,33 @@ 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: /issm/trunk/test/NightlyRun/test221.m =================================================================== --- /issm/trunk/test/NightlyRun/test221.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test221.m (revision 10981) @@ -16,33 +16,33 @@ 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: /issm/trunk/test/NightlyRun/test222.m =================================================================== --- /issm/trunk/test/NightlyRun/test222.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test222.m (revision 10981) @@ -17,33 +17,33 @@ 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: /issm/trunk/test/NightlyRun/test223.m =================================================================== --- /issm/trunk/test/NightlyRun/test223.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test223.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test224.m =================================================================== --- /issm/trunk/test/NightlyRun/test224.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test224.m (revision 10981) @@ -24,10 +24,10 @@ 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: /issm/trunk/test/NightlyRun/test225.m =================================================================== --- /issm/trunk/test/NightlyRun/test225.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test225.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test226.m =================================================================== --- /issm/trunk/test/NightlyRun/test226.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test226.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test227.m =================================================================== --- /issm/trunk/test/NightlyRun/test227.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test227.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test228.m =================================================================== --- /issm/trunk/test/NightlyRun/test228.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test228.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test229.m =================================================================== --- /issm/trunk/test/NightlyRun/test229.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test229.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test230.m =================================================================== --- /issm/trunk/test/NightlyRun/test230.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test230.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test232.m =================================================================== --- /issm/trunk/test/NightlyRun/test232.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test232.m (revision 10981) @@ -18,7 +18,7 @@ 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: /issm/trunk/test/NightlyRun/test233.m =================================================================== --- /issm/trunk/test/NightlyRun/test233.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test233.m (revision 10981) @@ -67,3 +67,3 @@ field_names ={'Vy'}; field_tolerances={1e-13}; -field_values={PatchToVec(md.results.DiagnosticSolution.Vy)}; +field_values={(md.results.DiagnosticSolution.Vy)}; Index: /issm/trunk/test/NightlyRun/test234.m =================================================================== --- /issm/trunk/test/NightlyRun/test234.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test234.m (revision 10981) @@ -67,3 +67,3 @@ field_names ={'Vy'}; field_tolerances={1e-13}; -field_values={PatchToVec(md.results.DiagnosticSolution.Vy)}; +field_values={(md.results.DiagnosticSolution.Vy)}; Index: /issm/trunk/test/NightlyRun/test237.m =================================================================== --- /issm/trunk/test/NightlyRun/test237.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test237.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test238.m =================================================================== --- /issm/trunk/test/NightlyRun/test238.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test238.m (revision 10981) @@ -11,8 +11,8 @@ 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/trunk/test/NightlyRun/test239.m =================================================================== --- /issm/trunk/test/NightlyRun/test239.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test239.m (revision 10981) @@ -10,8 +10,8 @@ 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: /issm/trunk/test/NightlyRun/test240.m =================================================================== --- /issm/trunk/test/NightlyRun/test240.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test240.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test241.m =================================================================== --- /issm/trunk/test/NightlyRun/test241.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test241.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test242.m =================================================================== --- /issm/trunk/test/NightlyRun/test242.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test242.m (revision 10981) @@ -12,8 +12,8 @@ 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: /issm/trunk/test/NightlyRun/test243.m =================================================================== --- /issm/trunk/test/NightlyRun/test243.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test243.m (revision 10981) @@ -11,24 +11,24 @@ 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: /issm/trunk/test/NightlyRun/test244.m =================================================================== --- /issm/trunk/test/NightlyRun/test244.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test244.m (revision 10981) @@ -11,24 +11,24 @@ 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: /issm/trunk/test/NightlyRun/test245.m =================================================================== --- /issm/trunk/test/NightlyRun/test245.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test245.m (revision 10981) @@ -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-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: /issm/trunk/test/NightlyRun/test246.m =================================================================== --- /issm/trunk/test/NightlyRun/test246.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test246.m (revision 10981) @@ -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-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: /issm/trunk/test/NightlyRun/test247.m =================================================================== --- /issm/trunk/test/NightlyRun/test247.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test247.m (revision 10981) @@ -14,33 +14,33 @@ 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: /issm/trunk/test/NightlyRun/test248.m =================================================================== --- /issm/trunk/test/NightlyRun/test248.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test248.m (revision 10981) @@ -17,33 +17,33 @@ 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: /issm/trunk/test/NightlyRun/test249.m =================================================================== --- /issm/trunk/test/NightlyRun/test249.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test249.m (revision 10981) @@ -15,33 +15,33 @@ 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: /issm/trunk/test/NightlyRun/test250.m =================================================================== --- /issm/trunk/test/NightlyRun/test250.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test250.m (revision 10981) @@ -18,33 +18,33 @@ 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: /issm/trunk/test/NightlyRun/test251.m =================================================================== --- /issm/trunk/test/NightlyRun/test251.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test251.m (revision 10981) @@ -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-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: /issm/trunk/test/NightlyRun/test252.m =================================================================== --- /issm/trunk/test/NightlyRun/test252.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test252.m (revision 10981) @@ -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-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: /issm/trunk/test/NightlyRun/test253.m =================================================================== --- /issm/trunk/test/NightlyRun/test253.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test253.m (revision 10981) @@ -17,33 +17,33 @@ 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: /issm/trunk/test/NightlyRun/test254.m =================================================================== --- /issm/trunk/test/NightlyRun/test254.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test254.m (revision 10981) @@ -18,33 +18,33 @@ 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: /issm/trunk/test/NightlyRun/test255.m =================================================================== --- /issm/trunk/test/NightlyRun/test255.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test255.m (revision 10981) @@ -30,35 +30,35 @@ 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: /issm/trunk/test/NightlyRun/test256.m =================================================================== --- /issm/trunk/test/NightlyRun/test256.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test256.m (revision 10981) @@ -30,35 +30,35 @@ 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: /issm/trunk/test/NightlyRun/test257.m =================================================================== --- /issm/trunk/test/NightlyRun/test257.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test257.m (revision 10981) @@ -30,35 +30,35 @@ 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: /issm/trunk/test/NightlyRun/test258.m =================================================================== --- /issm/trunk/test/NightlyRun/test258.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test258.m (revision 10981) @@ -30,35 +30,35 @@ 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: /issm/trunk/test/NightlyRun/test259.m =================================================================== --- /issm/trunk/test/NightlyRun/test259.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test259.m (revision 10981) @@ -31,39 +31,39 @@ 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: /issm/trunk/test/NightlyRun/test260.m =================================================================== --- /issm/trunk/test/NightlyRun/test260.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test260.m (revision 10981) @@ -31,39 +31,39 @@ 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: /issm/trunk/test/NightlyRun/test261.m =================================================================== --- /issm/trunk/test/NightlyRun/test261.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test261.m (revision 10981) @@ -31,39 +31,39 @@ 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: /issm/trunk/test/NightlyRun/test262.m =================================================================== --- /issm/trunk/test/NightlyRun/test262.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test262.m (revision 10981) @@ -31,39 +31,39 @@ 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: /issm/trunk/test/NightlyRun/test263.m =================================================================== --- /issm/trunk/test/NightlyRun/test263.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test263.m (revision 10981) @@ -14,11 +14,11 @@ 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: /issm/trunk/test/NightlyRun/test264.m =================================================================== --- /issm/trunk/test/NightlyRun/test264.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test264.m (revision 10981) @@ -14,11 +14,11 @@ 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: /issm/trunk/test/NightlyRun/test265.m =================================================================== --- /issm/trunk/test/NightlyRun/test265.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test265.m (revision 10981) @@ -20,43 +20,43 @@ 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: /issm/trunk/test/NightlyRun/test266.m =================================================================== --- /issm/trunk/test/NightlyRun/test266.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test266.m (revision 10981) @@ -20,43 +20,43 @@ 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: /issm/trunk/test/NightlyRun/test301.m =================================================================== --- /issm/trunk/test/NightlyRun/test301.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test301.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test302.m =================================================================== --- /issm/trunk/test/NightlyRun/test302.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test302.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test303.m =================================================================== --- /issm/trunk/test/NightlyRun/test303.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test303.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test304.m =================================================================== --- /issm/trunk/test/NightlyRun/test304.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test304.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test305.m =================================================================== --- /issm/trunk/test/NightlyRun/test305.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test305.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test306.m =================================================================== --- /issm/trunk/test/NightlyRun/test306.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test306.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test307.m =================================================================== --- /issm/trunk/test/NightlyRun/test307.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test307.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test308.m =================================================================== --- /issm/trunk/test/NightlyRun/test308.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test308.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test309.m =================================================================== --- /issm/trunk/test/NightlyRun/test309.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test309.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test310.m =================================================================== --- /issm/trunk/test/NightlyRun/test310.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test310.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test311.m =================================================================== --- /issm/trunk/test/NightlyRun/test311.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test311.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test312.m =================================================================== --- /issm/trunk/test/NightlyRun/test312.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test312.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test313.m =================================================================== --- /issm/trunk/test/NightlyRun/test313.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test313.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test314.m =================================================================== --- /issm/trunk/test/NightlyRun/test314.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test314.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test315.m =================================================================== --- /issm/trunk/test/NightlyRun/test315.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test315.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test316.m =================================================================== --- /issm/trunk/test/NightlyRun/test316.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test316.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test317.m =================================================================== --- /issm/trunk/test/NightlyRun/test317.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test317.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test318.m =================================================================== --- /issm/trunk/test/NightlyRun/test318.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test318.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test319.m =================================================================== --- /issm/trunk/test/NightlyRun/test319.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test319.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test320.m =================================================================== --- /issm/trunk/test/NightlyRun/test320.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test320.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test321.m =================================================================== --- /issm/trunk/test/NightlyRun/test321.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test321.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test322.m =================================================================== --- /issm/trunk/test/NightlyRun/test322.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test322.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test323.m =================================================================== --- /issm/trunk/test/NightlyRun/test323.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test323.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test324.m =================================================================== --- /issm/trunk/test/NightlyRun/test324.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test324.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test325.m =================================================================== --- /issm/trunk/test/NightlyRun/test325.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test325.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test326.m =================================================================== --- /issm/trunk/test/NightlyRun/test326.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test326.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test327.m =================================================================== --- /issm/trunk/test/NightlyRun/test327.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test327.m (revision 10981) @@ -14,24 +14,24 @@ 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: /issm/trunk/test/NightlyRun/test328.m =================================================================== --- /issm/trunk/test/NightlyRun/test328.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test328.m (revision 10981) @@ -10,24 +10,24 @@ 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: /issm/trunk/test/NightlyRun/test329.m =================================================================== --- /issm/trunk/test/NightlyRun/test329.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test329.m (revision 10981) @@ -15,33 +15,33 @@ 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: /issm/trunk/test/NightlyRun/test330.m =================================================================== --- /issm/trunk/test/NightlyRun/test330.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test330.m (revision 10981) @@ -15,33 +15,33 @@ 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: /issm/trunk/test/NightlyRun/test331.m =================================================================== --- /issm/trunk/test/NightlyRun/test331.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test331.m (revision 10981) @@ -10,24 +10,24 @@ 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: /issm/trunk/test/NightlyRun/test332.m =================================================================== --- /issm/trunk/test/NightlyRun/test332.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test332.m (revision 10981) @@ -10,24 +10,24 @@ 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: /issm/trunk/test/NightlyRun/test333.m =================================================================== --- /issm/trunk/test/NightlyRun/test333.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test333.m (revision 10981) @@ -15,33 +15,33 @@ 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: /issm/trunk/test/NightlyRun/test334.m =================================================================== --- /issm/trunk/test/NightlyRun/test334.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test334.m (revision 10981) @@ -15,33 +15,33 @@ 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: /issm/trunk/test/NightlyRun/test335.m =================================================================== --- /issm/trunk/test/NightlyRun/test335.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test335.m (revision 10981) @@ -14,10 +14,10 @@ }; 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: /issm/trunk/test/NightlyRun/test336.m =================================================================== --- /issm/trunk/test/NightlyRun/test336.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test336.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test337.m =================================================================== --- /issm/trunk/test/NightlyRun/test337.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test337.m (revision 10981) @@ -24,10 +24,10 @@ 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: /issm/trunk/test/NightlyRun/test338.m =================================================================== --- /issm/trunk/test/NightlyRun/test338.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test338.m (revision 10981) @@ -24,10 +24,10 @@ 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: /issm/trunk/test/NightlyRun/test339.m =================================================================== --- /issm/trunk/test/NightlyRun/test339.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test339.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test340.m =================================================================== --- /issm/trunk/test/NightlyRun/test340.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test340.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test341.m =================================================================== --- /issm/trunk/test/NightlyRun/test341.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test341.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test342.m =================================================================== --- /issm/trunk/test/NightlyRun/test342.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test342.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test343.m =================================================================== --- /issm/trunk/test/NightlyRun/test343.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test343.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test344.m =================================================================== --- /issm/trunk/test/NightlyRun/test344.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test344.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test345.m =================================================================== --- /issm/trunk/test/NightlyRun/test345.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test345.m (revision 10981) @@ -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-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: /issm/trunk/test/NightlyRun/test346.m =================================================================== --- /issm/trunk/test/NightlyRun/test346.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test346.m (revision 10981) @@ -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-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: /issm/trunk/test/NightlyRun/test347.m =================================================================== --- /issm/trunk/test/NightlyRun/test347.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test347.m (revision 10981) @@ -17,33 +17,33 @@ 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: /issm/trunk/test/NightlyRun/test348.m =================================================================== --- /issm/trunk/test/NightlyRun/test348.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test348.m (revision 10981) @@ -17,33 +17,33 @@ 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: /issm/trunk/test/NightlyRun/test401.m =================================================================== --- /issm/trunk/test/NightlyRun/test401.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test401.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test402.m =================================================================== --- /issm/trunk/test/NightlyRun/test402.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test402.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test403.m =================================================================== --- /issm/trunk/test/NightlyRun/test403.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test403.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test404.m =================================================================== --- /issm/trunk/test/NightlyRun/test404.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test404.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test405.m =================================================================== --- /issm/trunk/test/NightlyRun/test405.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test405.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test406.m =================================================================== --- /issm/trunk/test/NightlyRun/test406.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test406.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test407.m =================================================================== --- /issm/trunk/test/NightlyRun/test407.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test407.m (revision 10981) @@ -10,8 +10,8 @@ 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: /issm/trunk/test/NightlyRun/test408.m =================================================================== --- /issm/trunk/test/NightlyRun/test408.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test408.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test409.m =================================================================== --- /issm/trunk/test/NightlyRun/test409.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test409.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test410.m =================================================================== --- /issm/trunk/test/NightlyRun/test410.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test410.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test411.m =================================================================== --- /issm/trunk/test/NightlyRun/test411.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test411.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test412.m =================================================================== --- /issm/trunk/test/NightlyRun/test412.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test412.m (revision 10981) @@ -12,5 +12,5 @@ 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: /issm/trunk/test/NightlyRun/test413.m =================================================================== --- /issm/trunk/test/NightlyRun/test413.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test413.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test414.m =================================================================== --- /issm/trunk/test/NightlyRun/test414.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test414.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test415.m =================================================================== --- /issm/trunk/test/NightlyRun/test415.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test415.m (revision 10981) @@ -10,24 +10,24 @@ 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: /issm/trunk/test/NightlyRun/test416.m =================================================================== --- /issm/trunk/test/NightlyRun/test416.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test416.m (revision 10981) @@ -10,24 +10,24 @@ 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: /issm/trunk/test/NightlyRun/test417.m =================================================================== --- /issm/trunk/test/NightlyRun/test417.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test417.m (revision 10981) @@ -13,33 +13,33 @@ 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: /issm/trunk/test/NightlyRun/test418.m =================================================================== --- /issm/trunk/test/NightlyRun/test418.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test418.m (revision 10981) @@ -16,33 +16,33 @@ 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: /issm/trunk/test/NightlyRun/test419.m =================================================================== --- /issm/trunk/test/NightlyRun/test419.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test419.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test420.m =================================================================== --- /issm/trunk/test/NightlyRun/test420.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test420.m (revision 10981) @@ -12,10 +12,10 @@ 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: /issm/trunk/test/NightlyRun/test421.m =================================================================== --- /issm/trunk/test/NightlyRun/test421.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test421.m (revision 10981) @@ -12,10 +12,10 @@ 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: /issm/trunk/test/NightlyRun/test422.m =================================================================== --- /issm/trunk/test/NightlyRun/test422.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test422.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test429.m =================================================================== --- /issm/trunk/test/NightlyRun/test429.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test429.m (revision 10981) @@ -26,13 +26,13 @@ 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: /issm/trunk/test/NightlyRun/test430.m =================================================================== --- /issm/trunk/test/NightlyRun/test430.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test430.m (revision 10981) @@ -27,13 +27,13 @@ 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: /issm/trunk/test/NightlyRun/test431.m =================================================================== --- /issm/trunk/test/NightlyRun/test431.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test431.m (revision 10981) @@ -26,13 +26,13 @@ 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: /issm/trunk/test/NightlyRun/test432.m =================================================================== --- /issm/trunk/test/NightlyRun/test432.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test432.m (revision 10981) @@ -26,13 +26,13 @@ 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: /issm/trunk/test/NightlyRun/test437.m =================================================================== --- /issm/trunk/test/NightlyRun/test437.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test437.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test438.m =================================================================== --- /issm/trunk/test/NightlyRun/test438.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test438.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test441.m =================================================================== --- /issm/trunk/test/NightlyRun/test441.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test441.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test442.m =================================================================== --- /issm/trunk/test/NightlyRun/test442.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test442.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test443.m =================================================================== --- /issm/trunk/test/NightlyRun/test443.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test443.m (revision 10981) @@ -12,8 +12,8 @@ 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: /issm/trunk/test/NightlyRun/test444.m =================================================================== --- /issm/trunk/test/NightlyRun/test444.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test444.m (revision 10981) @@ -12,8 +12,8 @@ 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: /issm/trunk/test/NightlyRun/test445.m =================================================================== --- /issm/trunk/test/NightlyRun/test445.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test445.m (revision 10981) @@ -26,9 +26,9 @@ 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 Index: /issm/trunk/test/NightlyRun/test446.m =================================================================== --- /issm/trunk/test/NightlyRun/test446.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test446.m (revision 10981) @@ -26,9 +26,9 @@ 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 Index: /issm/trunk/test/NightlyRun/test447.m =================================================================== --- /issm/trunk/test/NightlyRun/test447.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test447.m (revision 10981) @@ -25,15 +25,15 @@ 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: /issm/trunk/test/NightlyRun/test448.m =================================================================== --- /issm/trunk/test/NightlyRun/test448.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test448.m (revision 10981) @@ -27,15 +27,15 @@ 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: /issm/trunk/test/NightlyRun/test449.m =================================================================== --- /issm/trunk/test/NightlyRun/test449.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test449.m (revision 10981) @@ -25,15 +25,15 @@ 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: /issm/trunk/test/NightlyRun/test450.m =================================================================== --- /issm/trunk/test/NightlyRun/test450.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test450.m (revision 10981) @@ -27,15 +27,15 @@ 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: /issm/trunk/test/NightlyRun/test451.m =================================================================== --- /issm/trunk/test/NightlyRun/test451.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test451.m (revision 10981) @@ -28,15 +28,15 @@ 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: /issm/trunk/test/NightlyRun/test452.m =================================================================== --- /issm/trunk/test/NightlyRun/test452.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test452.m (revision 10981) @@ -29,15 +29,15 @@ 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: /issm/trunk/test/NightlyRun/test453.m =================================================================== --- /issm/trunk/test/NightlyRun/test453.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test453.m (revision 10981) @@ -27,15 +27,15 @@ 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: /issm/trunk/test/NightlyRun/test454.m =================================================================== --- /issm/trunk/test/NightlyRun/test454.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test454.m (revision 10981) @@ -27,15 +27,15 @@ 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: /issm/trunk/test/NightlyRun/test501.m =================================================================== --- /issm/trunk/test/NightlyRun/test501.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test501.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test502.m =================================================================== --- /issm/trunk/test/NightlyRun/test502.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test502.m (revision 10981) @@ -10,7 +10,7 @@ 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: /issm/trunk/test/NightlyRun/test503.m =================================================================== --- /issm/trunk/test/NightlyRun/test503.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test503.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test504.m =================================================================== --- /issm/trunk/test/NightlyRun/test504.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test504.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test505.m =================================================================== --- /issm/trunk/test/NightlyRun/test505.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test505.m (revision 10981) @@ -10,8 +10,8 @@ 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: /issm/trunk/test/NightlyRun/test506.m =================================================================== --- /issm/trunk/test/NightlyRun/test506.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test506.m (revision 10981) @@ -11,8 +11,8 @@ 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: /issm/trunk/test/NightlyRun/test507.m =================================================================== --- /issm/trunk/test/NightlyRun/test507.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test507.m (revision 10981) @@ -10,17 +10,17 @@ 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: /issm/trunk/test/NightlyRun/test508.m =================================================================== --- /issm/trunk/test/NightlyRun/test508.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test508.m (revision 10981) @@ -10,17 +10,17 @@ 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: /issm/trunk/test/NightlyRun/test509.m =================================================================== --- /issm/trunk/test/NightlyRun/test509.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test509.m (revision 10981) @@ -12,23 +12,23 @@ 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: /issm/trunk/test/NightlyRun/test510.m =================================================================== --- /issm/trunk/test/NightlyRun/test510.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test510.m (revision 10981) @@ -12,23 +12,23 @@ 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: /issm/trunk/test/NightlyRun/test511.m =================================================================== --- /issm/trunk/test/NightlyRun/test511.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test511.m (revision 10981) @@ -13,23 +13,23 @@ 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: /issm/trunk/test/NightlyRun/test512.m =================================================================== --- /issm/trunk/test/NightlyRun/test512.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test512.m (revision 10981) @@ -13,23 +13,23 @@ 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: /issm/trunk/test/NightlyRun/test513.m =================================================================== --- /issm/trunk/test/NightlyRun/test513.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test513.m (revision 10981) @@ -13,23 +13,23 @@ 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: /issm/trunk/test/NightlyRun/test514.m =================================================================== --- /issm/trunk/test/NightlyRun/test514.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test514.m (revision 10981) @@ -13,23 +13,23 @@ 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: /issm/trunk/test/NightlyRun/test515.m =================================================================== --- /issm/trunk/test/NightlyRun/test515.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test515.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test516.m =================================================================== --- /issm/trunk/test/NightlyRun/test516.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test516.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test517.m =================================================================== --- /issm/trunk/test/NightlyRun/test517.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test517.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test518.m =================================================================== --- /issm/trunk/test/NightlyRun/test518.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test518.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test519.m =================================================================== --- /issm/trunk/test/NightlyRun/test519.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test519.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test520.m =================================================================== --- /issm/trunk/test/NightlyRun/test520.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test520.m (revision 10981) @@ -13,10 +13,10 @@ }; 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: /issm/trunk/test/NightlyRun/test521.m =================================================================== --- /issm/trunk/test/NightlyRun/test521.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test521.m (revision 10981) @@ -30,10 +30,10 @@ 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: /issm/trunk/test/NightlyRun/test522.m =================================================================== --- /issm/trunk/test/NightlyRun/test522.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test522.m (revision 10981) @@ -30,10 +30,10 @@ 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: /issm/trunk/test/NightlyRun/test523.m =================================================================== --- /issm/trunk/test/NightlyRun/test523.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test523.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test524.m =================================================================== --- /issm/trunk/test/NightlyRun/test524.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test524.m (revision 10981) @@ -25,10 +25,10 @@ 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: /issm/trunk/test/NightlyRun/test525.m =================================================================== --- /issm/trunk/test/NightlyRun/test525.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test525.m (revision 10981) @@ -26,13 +26,13 @@ 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: /issm/trunk/test/NightlyRun/test526.m =================================================================== --- /issm/trunk/test/NightlyRun/test526.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test526.m (revision 10981) @@ -26,13 +26,13 @@ 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: /issm/trunk/test/NightlyRun/test529.m =================================================================== --- /issm/trunk/test/NightlyRun/test529.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test529.m (revision 10981) @@ -12,7 +12,7 @@ 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: /issm/trunk/test/NightlyRun/test530.m =================================================================== --- /issm/trunk/test/NightlyRun/test530.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test530.m (revision 10981) @@ -13,7 +13,7 @@ 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: /issm/trunk/test/NightlyRun/test531.m =================================================================== --- /issm/trunk/test/NightlyRun/test531.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test531.m (revision 10981) @@ -13,5 +13,5 @@ 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: /issm/trunk/test/NightlyRun/test532.m =================================================================== --- /issm/trunk/test/NightlyRun/test532.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test532.m (revision 10981) @@ -14,5 +14,5 @@ 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: /issm/trunk/test/NightlyRun/test601.m =================================================================== --- /issm/trunk/test/NightlyRun/test601.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test601.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test602.m =================================================================== --- /issm/trunk/test/NightlyRun/test602.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test602.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test603.m =================================================================== --- /issm/trunk/test/NightlyRun/test603.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test603.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test604.m =================================================================== --- /issm/trunk/test/NightlyRun/test604.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test604.m (revision 10981) @@ -13,4 +13,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test605.m =================================================================== --- /issm/trunk/test/NightlyRun/test605.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test605.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test606.m =================================================================== --- /issm/trunk/test/NightlyRun/test606.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test606.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.PrognosticSolution.Thickness),... + (md.results.PrognosticSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test607.m =================================================================== --- /issm/trunk/test/NightlyRun/test607.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test607.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test608.m =================================================================== --- /issm/trunk/test/NightlyRun/test608.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test608.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test609.m =================================================================== --- /issm/trunk/test/NightlyRun/test609.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test609.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test610.m =================================================================== --- /issm/trunk/test/NightlyRun/test610.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test610.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test611.m =================================================================== --- /issm/trunk/test/NightlyRun/test611.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test611.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test612.m =================================================================== --- /issm/trunk/test/NightlyRun/test612.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test612.m (revision 10981) @@ -10,5 +10,5 @@ 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: /issm/trunk/test/NightlyRun/test613.m =================================================================== --- /issm/trunk/test/NightlyRun/test613.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test613.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test614.m =================================================================== --- /issm/trunk/test/NightlyRun/test614.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test614.m (revision 10981) @@ -11,5 +11,5 @@ 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: /issm/trunk/test/NightlyRun/test615.m =================================================================== --- /issm/trunk/test/NightlyRun/test615.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test615.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test616.m =================================================================== --- /issm/trunk/test/NightlyRun/test616.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test616.m (revision 10981) @@ -10,4 +10,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test617.m =================================================================== --- /issm/trunk/test/NightlyRun/test617.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test617.m (revision 10981) @@ -12,4 +12,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test618.m =================================================================== --- /issm/trunk/test/NightlyRun/test618.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test618.m (revision 10981) @@ -12,4 +12,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test619.m =================================================================== --- /issm/trunk/test/NightlyRun/test619.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test619.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test620.m =================================================================== --- /issm/trunk/test/NightlyRun/test620.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test620.m (revision 10981) @@ -11,4 +11,4 @@ field_tolerances={1e-13}; field_values={... - PatchToVec(md.results.BalancethicknessSolution.Thickness),... + (md.results.BalancethicknessSolution.Thickness),... }; Index: /issm/trunk/test/NightlyRun/test621.m =================================================================== --- /issm/trunk/test/NightlyRun/test621.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test621.m (revision 10981) @@ -25,7 +25,7 @@ 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: /issm/trunk/test/NightlyRun/test622.m =================================================================== --- /issm/trunk/test/NightlyRun/test622.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test622.m (revision 10981) @@ -25,7 +25,7 @@ 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: /issm/trunk/test/NightlyRun/test623.m =================================================================== --- /issm/trunk/test/NightlyRun/test623.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test623.m (revision 10981) @@ -26,7 +26,7 @@ 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: /issm/trunk/test/NightlyRun/test624.m =================================================================== --- /issm/trunk/test/NightlyRun/test624.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test624.m (revision 10981) @@ -26,7 +26,7 @@ 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: /issm/trunk/test/NightlyRun/test625.m =================================================================== --- /issm/trunk/test/NightlyRun/test625.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test625.m (revision 10981) @@ -32,9 +32,9 @@ 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: /issm/trunk/test/NightlyRun/test626.m =================================================================== --- /issm/trunk/test/NightlyRun/test626.m (revision 10980) +++ /issm/trunk/test/NightlyRun/test626.m (revision 10981) @@ -32,9 +32,9 @@ 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) };