Index: /issm/oecreview/Archive/17802-17983/Date.tex
===================================================================
--- /issm/oecreview/Archive/17802-17983/Date.tex (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/Date.tex (revision 17986)
@@ -0,0 +1,1 @@
+May-13-2014
Index: /issm/oecreview/Archive/17802-17983/ISSM-17804-17805.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17804-17805.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17804-17805.diff (revision 17986)
@@ -0,0 +1,49 @@
+Index: ../trunk-jpl/src
+===================================================================
+--- ../trunk-jpl/src (revision 17804)
++++ ../trunk-jpl/src (revision 17805)
+
+Property changes on: ../trunk-jpl/src
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /issm/trunk/src:r16566-17804
+Index: ../trunk-jpl/configs/configure.sh
+===================================================================
+--- ../trunk-jpl/configs/configure.sh (revision 0)
++++ ../trunk-jpl/configs/configure.sh (revision 17805)
+@@ -0,0 +1,19 @@
++#!/bin/sh
++
++#Default configuration script
++#petsc 3.4
++#mpich 1.4
++
++./configure \
++ --prefix=$ISSM_DIR \
++ --with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
++ --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
++ --with-mpi-include="$ISSM_DIR/externalpackages/mpich/install/include" \
++ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
++ --with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
++ --with-petsc-arch="$ISSM_ARCH" \
++ --with-metis-dir="$ISSM_DIR/externalpackages/petsc/install" \
++ --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
++ --with-scalapack-dir="$ISSM_DIR/externalpackages/petsc/install/" \
++ --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install/" \
++ --with-numthreads=2
+
+Property changes on: ../trunk-jpl/configs/configure.sh
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl
+===================================================================
+--- ../trunk-jpl (revision 17804)
++++ ../trunk-jpl (revision 17805)
+
+Property changes on: ../trunk-jpl
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /issm/trunk:r16566-17804
Index: /issm/oecreview/Archive/17802-17983/ISSM-17807-17808.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17807-17808.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17807-17808.diff (revision 17986)
@@ -0,0 +1,13423 @@
+Index: ../trunk-jpl/src/java/build/gui_elements/PathPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/PathPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/PathPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/PathPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/PathPanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/IntegerPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/IntegerPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/IntegerPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/IntegerPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/IntegerPanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/DecimalPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/DecimalPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/DecimalPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/DecimalPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/DecimalPanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/GUIBuildException.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/GUIBuildException.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/GUIBuildException.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/GUIBuildException.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/GUIBuildException.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$1.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$1.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$1.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$1.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$1.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/ControlledPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/ControlledPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/ControlledPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/ControlledPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/ControlledPanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/DuplicatorPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/DuplicatorPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/DuplicatorPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/DuplicatorPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/DuplicatorPanel.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/OptionPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/OptionPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/OptionPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/OptionPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/OptionPanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/AlternativePanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/AlternativePanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/AlternativePanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/AlternativePanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/AlternativePanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/CombinedPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/CombinedPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/SelectorPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/SelectorPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/SelectorPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/SelectorPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/SelectorPanel.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/ColorCellRenderer.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/ColorCellRenderer.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/ColorCellRenderer.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/ColorCellRenderer.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/ColorCellRenderer.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/CheckBoxPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/CheckBoxPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/CheckBoxPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/CheckBoxPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/CheckBoxPanel.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$Type.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$Type.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$Type.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$Type.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/CombinedPanel$Type.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/TextfieldPanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/TextfieldPanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/TextfieldPanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/TextfieldPanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/TextfieldPanel.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/gui_elements/FramePanel.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/gui_elements/FramePanel.class
+===================================================================
+--- ../trunk-jpl/src/java/build/gui_elements/FramePanel.class (revision 17807)
++++ ../trunk-jpl/src/java/build/gui_elements/FramePanel.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/gui_elements/FramePanel.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/main/GUIBuilder.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/main/GUIBuilder.class
+===================================================================
+--- ../trunk-jpl/src/java/build/main/GUIBuilder.class (revision 17807)
++++ ../trunk-jpl/src/java/build/main/GUIBuilder.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/main/GUIBuilder.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/main/GUIBuilder$1.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/main/GUIBuilder$1.class
+===================================================================
+--- ../trunk-jpl/src/java/build/main/GUIBuilder$1.class (revision 17807)
++++ ../trunk-jpl/src/java/build/main/GUIBuilder$1.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/main/GUIBuilder$1.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/main/PanelControl.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/main/PanelControl.class
+===================================================================
+--- ../trunk-jpl/src/java/build/main/PanelControl.class (revision 17807)
++++ ../trunk-jpl/src/java/build/main/PanelControl.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/main/PanelControl.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/main/XMLHelper.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/main/XMLHelper.class
+===================================================================
+--- ../trunk-jpl/src/java/build/main/XMLHelper.class (revision 17807)
++++ ../trunk-jpl/src/java/build/main/XMLHelper.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/main/XMLHelper.class
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/main/GUI.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/main/GUI.class
+===================================================================
+--- ../trunk-jpl/src/java/build/main/GUI.class (revision 17807)
++++ ../trunk-jpl/src/java/build/main/GUI.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/main/GUI.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/main/PanelNode.class
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/main/PanelNode.class
+===================================================================
+--- ../trunk-jpl/src/java/build/main/PanelNode.class (revision 17807)
++++ ../trunk-jpl/src/java/build/main/PanelNode.class (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/main/PanelNode.class
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/document-open-2.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/document-open-2.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/document-open-2.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/document-open-2.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/document-open-2.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/document-preview.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/document-preview.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/document-preview.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/document-preview.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/document-preview.png
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/document-export-4.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/document-export-4.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/document-export-4.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/document-export-4.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/document-export-4.png
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/config_schema.xsd
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/config_schema.xsd (revision 0)
++++ ../trunk-jpl/src/java/build/resources/config_schema.xsd (revision 17808)
+@@ -0,0 +1,141 @@
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+Property changes on: ../trunk-jpl/src/java/build/resources/config_schema.xsd
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/default_config.xml
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/default_config.xml (revision 0)
++++ ../trunk-jpl/src/java/build/resources/default_config.xml (revision 17808)
+@@ -0,0 +1,1284 @@
++
++
++
++
++
++
++
++ select a mesh dimension 0(default) or 3
++
++
++
++
++
++ number of elements
++
++
++
++ number of verticies
++
++
++
++ vertex indices of the mesh elements
++
++
++
++ vertices x coordinate [m]
++
++
++
++ vertices y coordinate [m]
++
++
++
++ vertices z coordinate [m]
++
++
++
++ edges of the 2d mesh (vertex1 vertex2 element1 element2)
++
++
++
++ number of edges of the 2d mesh
++
++
++
++
++
++
++ mesh dimension
++
++
++
++ number of extrusion layers
++
++
++
++ lower vertices flags list
++
++
++
++ lower elements flags list
++
++
++
++ upper vertices flags list
++
++
++
++ upper element flag list
++
++
++
++ upper vertex list (NaN for vertex on the upper surface)
++
++
++
++ upper element list (NaN for element on the upper layer)
++
++
++
++ lower vertex list (NaN for vertex on the lower surface)
++
++
++
++ lower element list (NaN for element on the lower layer
++
++
++
++ vertices on the boundary of the domain flag list
++
++
++
++ edges on domain boundary (vertex1 vertex2 element)
++
++
++
++ number associated to each segment
++
++
++
++ list of vertices connected to vertex_i
++
++
++
++ list of vertices connected to element_i
++
++
++
++ average number of vertices connected to one vertex
++
++
++
++
++
++
++ vertices extracted from the model
++
++
++
++ elements extracted from the model
++
++
++
++
++
++
++ vertices latitude [degrees]
++
++
++
++ verticies longitude [degrees]
++
++
++
++ Indicate hemisphere 'n' or 's'
++
++
++
++
++
++
++ is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0
++
++
++
++ presence of ice if > 0, icefront position if = 0, no ice if < 0
++
++
++
++
++
++
++
++ surface elevation [m]
++
++
++
++ ice thickness [m]
++
++
++
++ bed elevation [m]
++
++
++
++ bathymetry elevation [m]
++
++
++
++ coefficient for ice shelves; thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro
++
++
++
++
++
++
++ gravitational acceleration [m/s^2]
++
++
++
++ number of seconds in a year [s/yr]
++
++
++
++ reference temperature used in the enthalpy model [K]
++
++
++
++
++
++ surface mass balance [m/yr ice eq]
++
++
++
++
++
++ basal melting rate (positive if melting) [m/yr]
++
++
++
++ additional melting applied to compensate for dh/dt [m/yr]
++
++
++
++ geothermal heat flux [W/m^2]
++
++
++
++
++
++ ice density [kg/m^3]
++
++
++
++ ocean water density [kg/m^3]
++
++
++
++ fresh water density [kg/m^3]
++
++
++
++ water viscosity [N s/m^2]
++
++
++
++ heat capacity [J/kg/K]
++
++
++
++ latent heat of fusion [J/kg]
++
++
++
++ ice thermal conductivity [W/m/K]
++
++
++
++ temperate ice thermal conductivity [W/m/K]
++
++
++
++ melting point of ice at 1atm in K
++
++
++
++ rate of change of melting point with pressure [K/Pa]
++
++
++
++ mixed layer capacity [W/kg/K]
++
++
++
++ thermal exchange velocity [m/s]
++
++
++
++ flow law parameter [Pa/s^(1/n)]
++
++
++
++ Glens flow law exponent
++
++
++
++ law for the temperature dependance of the rheology: "None", "Paterson", "Arrhenius" or "LliboutryDuval"
++
++
++
++ Lithosphere shear modulus [Pa]
++
++
++
++ Lithosphere density [g/cm^-3]
++
++
++
++ Mantle shear modulus [Pa]
++
++
++
++ Mantle density [g/cm^-3]
++
++
++
++
++
++
++
++
++
++ damage law (string) from {"undamaged","pralong"}
++
++
++
++ damage tensor (scalar)
++
++
++
++ damage law (string) from {"undamaged","pralong"}
++
++
++
++ damage constraints (NaN means no constraint)
++
++
++
++ maximum possible damage (0<=max_damage<1)
++
++
++
++ 0: no, 1: artificial_diffusivity, 2: SUPG
++
++
++
++ maximum number of non linear iterations
++
++
++
++ stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)
++
++
++
++ threshold to declare convergence of damage evolution solution (default is 0)
++
++
++
++ scaling exponent (default is 3)
++
++
++
++
++
++
++
++
++ friction coefficient [SI]
++
++
++
++ p exponent
++
++
++
++ q exponent
++
++
++
++
++
++
++
++
++ is the Shallow Ice Approximation (SIA) used ?
++
++
++
++ is the Shelfy-Stream Approximation (SSA) used ?
++
++
++
++ is the L1L2 approximation used ?
++
++
++
++ is the Higher-Order (HO) approximation used ?
++
++
++
++ are the Full-FS (FS) equations used ?
++
++
++
++ Finite Element for SSA "P1", "P1bubble" "P1bubblecondensed" "P2"
++
++
++
++ Finite Element for HO "P1" "P1bubble" "P1bubblecondensed" "P1xP2" "P2xP1" "P2"
++
++
++
++ Finite Element for FS "P1P1" (debugging only) "P1P1GLS" "MINIcondensed" "MINI" "TaylorHood"
++
++
++
++ flow equation for each vertex
++
++
++
++ flow equation for each element
++
++
++
++ vertices on SSAs border (for tiling)
++
++
++
++ vertices on HOs border (for tiling)
++
++
++
++ vertices on FS border (for tiling)
++
++
++
++
++
++
++ simulation starting time [yr]
++
++
++
++ final time to stop the simulation [yr]
++
++
++
++ length of time steps [yr]
++
++
++
++ use cfl condition to define time step ? (0 or 1)
++
++
++
++ coefficient applied to cfl condition
++
++
++
++
++
++
++
++
++ x component of velocity [m/yr]
++
++
++
++ y component of velocity [m/yr]
++
++
++
++ z component of velocity [m/yr]
++
++
++
++ velocity norm [m/yr]
++
++
++
++ pressure field [Pa]
++
++
++
++ fraction of water in the ice
++
++
++
++ ice thickness [m]
++
++
++
++ sediment water head of subglacial system [m]
++
++
++
++ epl water head of subglacial system [m]
++
++
++
++ thickness of subglacial water [m]
++
++
++
++
++
++
++ structure containing all rift information (vertices coordinates, segments, type of melange, ...)
++
++
++
++ N/A
++
++
++
++
++
++
++
++ use Valgrind to debug (0 or 1)
++
++
++
++
++ use gnu-profiler to find out where the time is spent
++
++
++
++
++ enables profiling (memory, flops, time)
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ results are output for all the nodes of each element
++
++
++
++ I/O gathering strategy for result outputs (default 1)
++
++
++
++ is the memory limited ? (0 or 1)
++
++
++
++ frequency at which results are saved in all solutions with multiple time_steps
++
++
++
++ maximum number of minutes to wait for batch results (NaN to deactivate)
++
++
++
++ server hostname where model should be uploaded
++
++
++
++ path on server where model should be uploaded
++
++
++
++ server login
++
++
++
++ port login (default is 0)
++
++
++
++ unique id generated when uploading the file to server
++
++
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++
++
++ thickness constraints (NaN means no constraint) [m]
++
++
++
++ ice thickening rate used in the mass conservation (dh/dt) [m/yr]
++
++
++
++ 0: None, 1: SU, 2: SSAs artificial diffusivity, 3:DG
++
++
++
++
++
++
++
++ mechanical equilibrium residual convergence criterion
++
++
++
++ velocity relative convergence criterion, NaN: not applied
++
++
++
++ velocity absolute convergence criterion, NaN: not applied
++
++
++
++ 0: Picards fixed point, 1: Newtons method, 2: hybrid
++
++
++
++ maximum number of nonlinear iterations
++
++
++
++ over-shooting constant new=new+C*(new-old)
++
++
++
++
++
++
++ x-axis velocity constraint (NaN means no constraint) [m/yr]
++
++
++
++ y-axis velocity constraint (NaN means no constraint) [m/yr]
++
++
++
++ z-axis velocity constraint (NaN means no constraint) [m/yr]
++
++
++
++
++
++
++ threshold for instability of mechanical constraints
++
++
++
++ number of iterations before rift penalties are locked
++
++
++
++
++
++
++ use dampening for floating ice ? Only for FS model
++
++
++
++ multiplier for incompressibility equation. Only for FS model
++
++
++
++ local referential
++
++
++
++ loading force applied on each point [N/m^3]
++
++
++
++ additional outputs requested
++
++
++
++
++
++
++
++
++
++ type of grounding line migration: "SoftMigration","AgressiveMigration" or "None"
++
++
++
++ melting rate applied when previously grounded parts start floating [m/yr]
++
++
++
++
++
++
++
++
++ water thickness constraints (NaN means no constraint) [m]
++
++
++
++ Manning roughness coefficient
++
++
++
++ tortuosity parameter
++
++
++
++ dimensionless exponent in Manning velocity formula
++
++
++
++ dimensionless exponent in Manning velocity formula
++
++
++
++ parameter in effective pressure formula
++
++
++
++ artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.
++
++
++
++
++
++
++
++ thickness constraints (NaN means no constraint) [m]
++
++
++
++ calving rate at given location [m/a]
++
++
++
++ do we use free surfaces (FS only) are mass conservation
++
++
++
++ minimum ice thickness allowed [m]
++
++
++
++ adjustment of ice shelves surface and bed elevations: 'Incremental' or 'Absolute'
++
++
++
++ 0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin
++
++
++
++
++
++
++ offset used by penalties: penalty = Kmax*10^offset
++
++
++
++ pairs of vertices that are penalized
++
++
++
++ additional outputs requested
++
++
++
++
++
++
++
++ temperature constraints (NaN means no constraint) [K]
++
++
++
++ 0: no, 1: artificial_diffusivity, 2: SUPG
++
++
++
++ maximum number of non linear iterations
++
++
++
++ stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)
++
++
++
++ threshold to declare convergence of thermal solution (default is 0)
++
++
++
++ scaling exponent (default is 3)
++
++
++
++ use an enthalpy formulation to include temperate ice (default is 0)
++
++
++
++ enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)
++
++
++
++ additional outputs requested
++
++
++
++
++
++
++
++ relative tolerance criterion [K]
++
++
++
++ maximum number of iterations
++
++
++
++ additional requested outputs
++
++
++
++
++
++
++
++ indicates whether a masstransport solution is used in the transient
++
++
++
++ indicates whether a stressbalance solution is used in the transient
++
++
++
++ indicates whether a thermal solution is used in the transient
++
++
++
++ indicates whether a groundingline migration is used in the transient
++
++
++
++ indicates whether a postglacial rebound model is used in the transient
++
++
++
++ indicates whether damage evolution is used in the transient
++
++
++
++ LEVEL SET DESCRIPTION...
++
++
++
++ list of additional outputs requested
++
++
++
++
++
++
++
++ mantle viscosity[Pa s]
++
++
++
++ lithosphere thickness (km)
++
++
++
++ 1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore
++
++
++
++
++
++
++
++
++ indicates if the automatic differentiation is activated
++
++
++
++ list of dependent variables
++
++
++
++ list of independent variables
++
++
++
++ ADOLC driver ('fos_forward' or 'fov_forward')
++
++
++
++ Number of operations per buffer (==OBUFSIZE in usrparms.h)
++
++
++
++ Number of locations per buffer (==LBUFSIZE in usrparms.h)
++
++
++
++ Number of values per buffer (==CBUFSIZE in usrparms.h)
++
++
++
++ Number of taylors per buffer (<=TBUFSIZE in usrparms.h)
++
++
++
++ free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio
++
++
++
++ free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize
++
++
++
++
++
++
++
++ name of kml output targets file
++
++
++
++ name of kml input tracks file
++
++
++
++ structure of kml flight requirements (not used yet)
++
++
++
++ element or nodal criterion for flight path evaluation (metric)
++
++
++
++
++
++
++ number of grids at equator (determines resolution)
++
++
++
++
++ flag to consider target values for flight path evaluation
++
++
++
++
++ flag to split polygons on the antimeridian
++
++
++
++
++
++
++
++ optimize? (default false)
++
++
++
++ number of directions to test when moving a point. If this value = 1, a random direction is tested. A value > 1 results in directions equally spaced from [0, 2*PI] being tested. For example, 4 would result in directions [0, PI/2, PI, 3PI/2]
++
++
++
++ specifies the distance in km (default 25) to move a randomly selected path point on each iteration
++
++
++
++ number of iterations (default 30,000) to run for flightplan optimization, i.e. the number of times to randomly select a point and move it.
++
++
++
++
++
++
++ name of kml solution file
++
++
++
++ quality of kml solution
++
++
++
++
++
++
++
++ is inversion activated?
++
++
++
++ 1: linear viscosity, 0: non-linear viscosity
++
++
++
++ ex: {'FrictionCoefficient'}, or {'MaterialsRheologyBbar'}
++
++
++
++ number of optimization searches
++
++
++
++ indicate the type of response for each optimization step
++
++
++
++ cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter
++
++
++
++ misfit convergence criterion. Default is 1%, NaN if not applied
++
++
++
++ maximum iterations during each optimization step
++
++
++
++ scaling factor on gradient direction during optimization, for each optimization step
++
++
++
++ decrease threshold for misfit, default is 30%
++
++
++
++ absolute minimum acceptable value of the inversed parameter on each vertex
++
++
++
++ absolute maximum acceptable value of the inversed parameter on each vertex
++
++
++
++ observed velocity x component [m/yr]
++
++
++
++ observed velocity y component [m/yr]
++
++
++
++ observed velocity magnitude [m/yr]
++
++
++
++ observed thickness [m])
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ is qmu analysis activated?
++
++
++
++ (arrays of each variable class)
++
++
++
++ (arrays of each response class)
++
++
++
++ number of responses
++
++
++
++ (array of method-independent parameters)
++
++
++
++ (information from dakota files)
++
++
++
++ user provided mesh partitioning, defaults to metis if not specified
++
++
++
++ number of partitions for semi-discrete qmu
++
++
++
++
++
++
++
++ use an enthalpy formulation to include temperate ice (default is 0)
++
++
++
++ array of dakota_method class
++
++
++
++ directory for mass flux profiles
++
++
++
++
++
++
++
++
++
++
++
++ additional outputs requested
++
++
++
++ weight applied to each mesh vertex
++
++
++
++
++
++
++
++ list of potential outputs that can be requested, but which need additional data to be defined
++
++
++
++
++
++
++
++ notes in a cell of strings
++
++
++
++ model name
++
++
++
++ empty field to store some data
++
++
++
++
++
+\ No newline at end of file
+
+Property changes on: ../trunk-jpl/src/java/build/resources/default_config.xml
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/file_ops.xcf
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/file_ops.xcf
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/file_ops.xcf (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/file_ops.xcf (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/file_ops.xcf
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/filesave.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/filesave.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/filesave.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/filesave.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/filesave.png
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/viewmag.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/viewmag.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/viewmag.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/viewmag.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/viewmag.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/ini_open.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/ini_open.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/ini_open.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/ini_open.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/ini_open.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/fileopen.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/fileopen.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/fileopen.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/fileopen.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/fileopen.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/xml_open.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/xml_open.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/xml_open.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/xml_open.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/xml_open.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/filesaveas.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/filesaveas.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/filesaveas.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/filesaveas.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/filesaveas.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/opensettings.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/opensettings.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/opensettings.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/opensettings.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/opensettings.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/reset.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/reset.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/reset.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/reset.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/reset.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/advancedsettings.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/advancedsettings.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/advancedsettings.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/advancedsettings.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/advancedsettings.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/mydocuments.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/mydocuments.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/mydocuments.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/mydocuments.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/mydocuments.png
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/readme.txt
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/readme.txt (revision 0)
++++ ../trunk-jpl/src/java/build/resources/icons/readme.txt (revision 17808)
+@@ -0,0 +1,10 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++This copyright and license notice covers the images in this directory.
++************************************************************************
++
++TITLE: Crystal Project Icons
++AUTHOR: Everaldo Coelho
++SITE: http://www.everaldo.com
++CONTACT: everaldo@everaldo.com
++
++Copyright (c) 2006-2007 Everaldo Coelho.
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/readme.txt
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/icons/kghostview.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/build/resources/icons/kghostview.png
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/icons/kghostview.png (revision 17807)
++++ ../trunk-jpl/src/java/build/resources/icons/kghostview.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/build/resources/icons/kghostview.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build/resources/config_schema-0.1.1.xsd
+===================================================================
+--- ../trunk-jpl/src/java/build/resources/config_schema-0.1.1.xsd (revision 0)
++++ ../trunk-jpl/src/java/build/resources/config_schema-0.1.1.xsd (revision 17808)
+@@ -0,0 +1,154 @@
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+Property changes on: ../trunk-jpl/src/java/build/resources/config_schema-0.1.1.xsd
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/License.txt
+===================================================================
+--- ../trunk-jpl/src/java/License.txt (revision 0)
++++ ../trunk-jpl/src/java/License.txt (revision 17808)
+@@ -0,0 +1,674 @@
++ GNU GENERAL PUBLIC LICENSE
++ Version 3, 29 June 2007
++
++ Copyright (C) 2007 Free Software Foundation, Inc.
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++ Preamble
++
++ The GNU General Public License is a free, copyleft license for
++software and other kinds of works.
++
++ The licenses for most software and other practical works are designed
++to take away your freedom to share and change the works. By contrast,
++the GNU General Public License is intended to guarantee your freedom to
++share and change all versions of a program--to make sure it remains free
++software for all its users. We, the Free Software Foundation, use the
++GNU General Public License for most of our software; it applies also to
++any other work released this way by its authors. You can apply it to
++your programs, too.
++
++ When we speak of free software, we are referring to freedom, not
++price. Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++them if you wish), that you receive source code or can get it if you
++want it, that you can change the software or use pieces of it in new
++free programs, and that you know you can do these things.
++
++ To protect your rights, we need to prevent others from denying you
++these rights or asking you to surrender the rights. Therefore, you have
++certain responsibilities if you distribute copies of the software, or if
++you modify it: responsibilities to respect the freedom of others.
++
++ For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must pass on to the recipients the same
++freedoms that you received. You must make sure that they, too, receive
++or can get the source code. And you must show them these terms so they
++know their rights.
++
++ Developers that use the GNU GPL protect your rights with two steps:
++(1) assert copyright on the software, and (2) offer you this License
++giving you legal permission to copy, distribute and/or modify it.
++
++ For the developers' and authors' protection, the GPL clearly explains
++that there is no warranty for this free software. For both users' and
++authors' sake, the GPL requires that modified versions be marked as
++changed, so that their problems will not be attributed erroneously to
++authors of previous versions.
++
++ Some devices are designed to deny users access to install or run
++modified versions of the software inside them, although the manufacturer
++can do so. This is fundamentally incompatible with the aim of
++protecting users' freedom to change the software. The systematic
++pattern of such abuse occurs in the area of products for individuals to
++use, which is precisely where it is most unacceptable. Therefore, we
++have designed this version of the GPL to prohibit the practice for those
++products. If such problems arise substantially in other domains, we
++stand ready to extend this provision to those domains in future versions
++of the GPL, as needed to protect the freedom of users.
++
++ Finally, every program is threatened constantly by software patents.
++States should not allow patents to restrict development and use of
++software on general-purpose computers, but in those that do, we wish to
++avoid the special danger that patents applied to a free program could
++make it effectively proprietary. To prevent this, the GPL assures that
++patents cannot be used to render the program non-free.
++
++ The precise terms and conditions for copying, distribution and
++modification follow.
++
++ TERMS AND CONDITIONS
++
++ 0. Definitions.
++
++ "This License" refers to version 3 of the GNU General Public License.
++
++ "Copyright" also means copyright-like laws that apply to other kinds of
++works, such as semiconductor masks.
++
++ "The Program" refers to any copyrightable work licensed under this
++License. Each licensee is addressed as "you". "Licensees" and
++"recipients" may be individuals or organizations.
++
++ To "modify" a work means to copy from or adapt all or part of the work
++in a fashion requiring copyright permission, other than the making of an
++exact copy. The resulting work is called a "modified version" of the
++earlier work or a work "based on" the earlier work.
++
++ A "covered work" means either the unmodified Program or a work based
++on the Program.
++
++ To "propagate" a work means to do anything with it that, without
++permission, would make you directly or secondarily liable for
++infringement under applicable copyright law, except executing it on a
++computer or modifying a private copy. Propagation includes copying,
++distribution (with or without modification), making available to the
++public, and in some countries other activities as well.
++
++ To "convey" a work means any kind of propagation that enables other
++parties to make or receive copies. Mere interaction with a user through
++a computer network, with no transfer of a copy, is not conveying.
++
++ An interactive user interface displays "Appropriate Legal Notices"
++to the extent that it includes a convenient and prominently visible
++feature that (1) displays an appropriate copyright notice, and (2)
++tells the user that there is no warranty for the work (except to the
++extent that warranties are provided), that licensees may convey the
++work under this License, and how to view a copy of this License. If
++the interface presents a list of user commands or options, such as a
++menu, a prominent item in the list meets this criterion.
++
++ 1. Source Code.
++
++ The "source code" for a work means the preferred form of the work
++for making modifications to it. "Object code" means any non-source
++form of a work.
++
++ A "Standard Interface" means an interface that either is an official
++standard defined by a recognized standards body, or, in the case of
++interfaces specified for a particular programming language, one that
++is widely used among developers working in that language.
++
++ The "System Libraries" of an executable work include anything, other
++than the work as a whole, that (a) is included in the normal form of
++packaging a Major Component, but which is not part of that Major
++Component, and (b) serves only to enable use of the work with that
++Major Component, or to implement a Standard Interface for which an
++implementation is available to the public in source code form. A
++"Major Component", in this context, means a major essential component
++(kernel, window system, and so on) of the specific operating system
++(if any) on which the executable work runs, or a compiler used to
++produce the work, or an object code interpreter used to run it.
++
++ The "Corresponding Source" for a work in object code form means all
++the source code needed to generate, install, and (for an executable
++work) run the object code and to modify the work, including scripts to
++control those activities. However, it does not include the work's
++System Libraries, or general-purpose tools or generally available free
++programs which are used unmodified in performing those activities but
++which are not part of the work. For example, Corresponding Source
++includes interface definition files associated with source files for
++the work, and the source code for shared libraries and dynamically
++linked subprograms that the work is specifically designed to require,
++such as by intimate data communication or control flow between those
++subprograms and other parts of the work.
++
++ The Corresponding Source need not include anything that users
++can regenerate automatically from other parts of the Corresponding
++Source.
++
++ The Corresponding Source for a work in source code form is that
++same work.
++
++ 2. Basic Permissions.
++
++ All rights granted under this License are granted for the term of
++copyright on the Program, and are irrevocable provided the stated
++conditions are met. This License explicitly affirms your unlimited
++permission to run the unmodified Program. The output from running a
++covered work is covered by this License only if the output, given its
++content, constitutes a covered work. This License acknowledges your
++rights of fair use or other equivalent, as provided by copyright law.
++
++ You may make, run and propagate covered works that you do not
++convey, without conditions so long as your license otherwise remains
++in force. You may convey covered works to others for the sole purpose
++of having them make modifications exclusively for you, or provide you
++with facilities for running those works, provided that you comply with
++the terms of this License in conveying all material for which you do
++not control copyright. Those thus making or running the covered works
++for you must do so exclusively on your behalf, under your direction
++and control, on terms that prohibit them from making any copies of
++your copyrighted material outside their relationship with you.
++
++ Conveying under any other circumstances is permitted solely under
++the conditions stated below. Sublicensing is not allowed; section 10
++makes it unnecessary.
++
++ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
++
++ No covered work shall be deemed part of an effective technological
++measure under any applicable law fulfilling obligations under article
++11 of the WIPO copyright treaty adopted on 20 December 1996, or
++similar laws prohibiting or restricting circumvention of such
++measures.
++
++ When you convey a covered work, you waive any legal power to forbid
++circumvention of technological measures to the extent such circumvention
++is effected by exercising rights under this License with respect to
++the covered work, and you disclaim any intention to limit operation or
++modification of the work as a means of enforcing, against the work's
++users, your or third parties' legal rights to forbid circumvention of
++technological measures.
++
++ 4. Conveying Verbatim Copies.
++
++ You may convey verbatim copies of the Program's source code as you
++receive it, in any medium, provided that you conspicuously and
++appropriately publish on each copy an appropriate copyright notice;
++keep intact all notices stating that this License and any
++non-permissive terms added in accord with section 7 apply to the code;
++keep intact all notices of the absence of any warranty; and give all
++recipients a copy of this License along with the Program.
++
++ You may charge any price or no price for each copy that you convey,
++and you may offer support or warranty protection for a fee.
++
++ 5. Conveying Modified Source Versions.
++
++ You may convey a work based on the Program, or the modifications to
++produce it from the Program, in the form of source code under the
++terms of section 4, provided that you also meet all of these conditions:
++
++ a) The work must carry prominent notices stating that you modified
++ it, and giving a relevant date.
++
++ b) The work must carry prominent notices stating that it is
++ released under this License and any conditions added under section
++ 7. This requirement modifies the requirement in section 4 to
++ "keep intact all notices".
++
++ c) You must license the entire work, as a whole, under this
++ License to anyone who comes into possession of a copy. This
++ License will therefore apply, along with any applicable section 7
++ additional terms, to the whole of the work, and all its parts,
++ regardless of how they are packaged. This License gives no
++ permission to license the work in any other way, but it does not
++ invalidate such permission if you have separately received it.
++
++ d) If the work has interactive user interfaces, each must display
++ Appropriate Legal Notices; however, if the Program has interactive
++ interfaces that do not display Appropriate Legal Notices, your
++ work need not make them do so.
++
++ A compilation of a covered work with other separate and independent
++works, which are not by their nature extensions of the covered work,
++and which are not combined with it such as to form a larger program,
++in or on a volume of a storage or distribution medium, is called an
++"aggregate" if the compilation and its resulting copyright are not
++used to limit the access or legal rights of the compilation's users
++beyond what the individual works permit. Inclusion of a covered work
++in an aggregate does not cause this License to apply to the other
++parts of the aggregate.
++
++ 6. Conveying Non-Source Forms.
++
++ You may convey a covered work in object code form under the terms
++of sections 4 and 5, provided that you also convey the
++machine-readable Corresponding Source under the terms of this License,
++in one of these ways:
++
++ a) Convey the object code in, or embodied in, a physical product
++ (including a physical distribution medium), accompanied by the
++ Corresponding Source fixed on a durable physical medium
++ customarily used for software interchange.
++
++ b) Convey the object code in, or embodied in, a physical product
++ (including a physical distribution medium), accompanied by a
++ written offer, valid for at least three years and valid for as
++ long as you offer spare parts or customer support for that product
++ model, to give anyone who possesses the object code either (1) a
++ copy of the Corresponding Source for all the software in the
++ product that is covered by this License, on a durable physical
++ medium customarily used for software interchange, for a price no
++ more than your reasonable cost of physically performing this
++ conveying of source, or (2) access to copy the
++ Corresponding Source from a network server at no charge.
++
++ c) Convey individual copies of the object code with a copy of the
++ written offer to provide the Corresponding Source. This
++ alternative is allowed only occasionally and noncommercially, and
++ only if you received the object code with such an offer, in accord
++ with subsection 6b.
++
++ d) Convey the object code by offering access from a designated
++ place (gratis or for a charge), and offer equivalent access to the
++ Corresponding Source in the same way through the same place at no
++ further charge. You need not require recipients to copy the
++ Corresponding Source along with the object code. If the place to
++ copy the object code is a network server, the Corresponding Source
++ may be on a different server (operated by you or a third party)
++ that supports equivalent copying facilities, provided you maintain
++ clear directions next to the object code saying where to find the
++ Corresponding Source. Regardless of what server hosts the
++ Corresponding Source, you remain obligated to ensure that it is
++ available for as long as needed to satisfy these requirements.
++
++ e) Convey the object code using peer-to-peer transmission, provided
++ you inform other peers where the object code and Corresponding
++ Source of the work are being offered to the general public at no
++ charge under subsection 6d.
++
++ A separable portion of the object code, whose source code is excluded
++from the Corresponding Source as a System Library, need not be
++included in conveying the object code work.
++
++ A "User Product" is either (1) a "consumer product", which means any
++tangible personal property which is normally used for personal, family,
++or household purposes, or (2) anything designed or sold for incorporation
++into a dwelling. In determining whether a product is a consumer product,
++doubtful cases shall be resolved in favor of coverage. For a particular
++product received by a particular user, "normally used" refers to a
++typical or common use of that class of product, regardless of the status
++of the particular user or of the way in which the particular user
++actually uses, or expects or is expected to use, the product. A product
++is a consumer product regardless of whether the product has substantial
++commercial, industrial or non-consumer uses, unless such uses represent
++the only significant mode of use of the product.
++
++ "Installation Information" for a User Product means any methods,
++procedures, authorization keys, or other information required to install
++and execute modified versions of a covered work in that User Product from
++a modified version of its Corresponding Source. The information must
++suffice to ensure that the continued functioning of the modified object
++code is in no case prevented or interfered with solely because
++modification has been made.
++
++ If you convey an object code work under this section in, or with, or
++specifically for use in, a User Product, and the conveying occurs as
++part of a transaction in which the right of possession and use of the
++User Product is transferred to the recipient in perpetuity or for a
++fixed term (regardless of how the transaction is characterized), the
++Corresponding Source conveyed under this section must be accompanied
++by the Installation Information. But this requirement does not apply
++if neither you nor any third party retains the ability to install
++modified object code on the User Product (for example, the work has
++been installed in ROM).
++
++ The requirement to provide Installation Information does not include a
++requirement to continue to provide support service, warranty, or updates
++for a work that has been modified or installed by the recipient, or for
++the User Product in which it has been modified or installed. Access to a
++network may be denied when the modification itself materially and
++adversely affects the operation of the network or violates the rules and
++protocols for communication across the network.
++
++ Corresponding Source conveyed, and Installation Information provided,
++in accord with this section must be in a format that is publicly
++documented (and with an implementation available to the public in
++source code form), and must require no special password or key for
++unpacking, reading or copying.
++
++ 7. Additional Terms.
++
++ "Additional permissions" are terms that supplement the terms of this
++License by making exceptions from one or more of its conditions.
++Additional permissions that are applicable to the entire Program shall
++be treated as though they were included in this License, to the extent
++that they are valid under applicable law. If additional permissions
++apply only to part of the Program, that part may be used separately
++under those permissions, but the entire Program remains governed by
++this License without regard to the additional permissions.
++
++ When you convey a copy of a covered work, you may at your option
++remove any additional permissions from that copy, or from any part of
++it. (Additional permissions may be written to require their own
++removal in certain cases when you modify the work.) You may place
++additional permissions on material, added by you to a covered work,
++for which you have or can give appropriate copyright permission.
++
++ Notwithstanding any other provision of this License, for material you
++add to a covered work, you may (if authorized by the copyright holders of
++that material) supplement the terms of this License with terms:
++
++ a) Disclaiming warranty or limiting liability differently from the
++ terms of sections 15 and 16 of this License; or
++
++ b) Requiring preservation of specified reasonable legal notices or
++ author attributions in that material or in the Appropriate Legal
++ Notices displayed by works containing it; or
++
++ c) Prohibiting misrepresentation of the origin of that material, or
++ requiring that modified versions of such material be marked in
++ reasonable ways as different from the original version; or
++
++ d) Limiting the use for publicity purposes of names of licensors or
++ authors of the material; or
++
++ e) Declining to grant rights under trademark law for use of some
++ trade names, trademarks, or service marks; or
++
++ f) Requiring indemnification of licensors and authors of that
++ material by anyone who conveys the material (or modified versions of
++ it) with contractual assumptions of liability to the recipient, for
++ any liability that these contractual assumptions directly impose on
++ those licensors and authors.
++
++ All other non-permissive additional terms are considered "further
++restrictions" within the meaning of section 10. If the Program as you
++received it, or any part of it, contains a notice stating that it is
++governed by this License along with a term that is a further
++restriction, you may remove that term. If a license document contains
++a further restriction but permits relicensing or conveying under this
++License, you may add to a covered work material governed by the terms
++of that license document, provided that the further restriction does
++not survive such relicensing or conveying.
++
++ If you add terms to a covered work in accord with this section, you
++must place, in the relevant source files, a statement of the
++additional terms that apply to those files, or a notice indicating
++where to find the applicable terms.
++
++ Additional terms, permissive or non-permissive, may be stated in the
++form of a separately written license, or stated as exceptions;
++the above requirements apply either way.
++
++ 8. Termination.
++
++ You may not propagate or modify a covered work except as expressly
++provided under this License. Any attempt otherwise to propagate or
++modify it is void, and will automatically terminate your rights under
++this License (including any patent licenses granted under the third
++paragraph of section 11).
++
++ However, if you cease all violation of this License, then your
++license from a particular copyright holder is reinstated (a)
++provisionally, unless and until the copyright holder explicitly and
++finally terminates your license, and (b) permanently, if the copyright
++holder fails to notify you of the violation by some reasonable means
++prior to 60 days after the cessation.
++
++ Moreover, your license from a particular copyright holder is
++reinstated permanently if the copyright holder notifies you of the
++violation by some reasonable means, this is the first time you have
++received notice of violation of this License (for any work) from that
++copyright holder, and you cure the violation prior to 30 days after
++your receipt of the notice.
++
++ Termination of your rights under this section does not terminate the
++licenses of parties who have received copies or rights from you under
++this License. If your rights have been terminated and not permanently
++reinstated, you do not qualify to receive new licenses for the same
++material under section 10.
++
++ 9. Acceptance Not Required for Having Copies.
++
++ You are not required to accept this License in order to receive or
++run a copy of the Program. Ancillary propagation of a covered work
++occurring solely as a consequence of using peer-to-peer transmission
++to receive a copy likewise does not require acceptance. However,
++nothing other than this License grants you permission to propagate or
++modify any covered work. These actions infringe copyright if you do
++not accept this License. Therefore, by modifying or propagating a
++covered work, you indicate your acceptance of this License to do so.
++
++ 10. Automatic Licensing of Downstream Recipients.
++
++ Each time you convey a covered work, the recipient automatically
++receives a license from the original licensors, to run, modify and
++propagate that work, subject to this License. You are not responsible
++for enforcing compliance by third parties with this License.
++
++ An "entity transaction" is a transaction transferring control of an
++organization, or substantially all assets of one, or subdividing an
++organization, or merging organizations. If propagation of a covered
++work results from an entity transaction, each party to that
++transaction who receives a copy of the work also receives whatever
++licenses to the work the party's predecessor in interest had or could
++give under the previous paragraph, plus a right to possession of the
++Corresponding Source of the work from the predecessor in interest, if
++the predecessor has it or can get it with reasonable efforts.
++
++ You may not impose any further restrictions on the exercise of the
++rights granted or affirmed under this License. For example, you may
++not impose a license fee, royalty, or other charge for exercise of
++rights granted under this License, and you may not initiate litigation
++(including a cross-claim or counterclaim in a lawsuit) alleging that
++any patent claim is infringed by making, using, selling, offering for
++sale, or importing the Program or any portion of it.
++
++ 11. Patents.
++
++ A "contributor" is a copyright holder who authorizes use under this
++License of the Program or a work on which the Program is based. The
++work thus licensed is called the contributor's "contributor version".
++
++ A contributor's "essential patent claims" are all patent claims
++owned or controlled by the contributor, whether already acquired or
++hereafter acquired, that would be infringed by some manner, permitted
++by this License, of making, using, or selling its contributor version,
++but do not include claims that would be infringed only as a
++consequence of further modification of the contributor version. For
++purposes of this definition, "control" includes the right to grant
++patent sublicenses in a manner consistent with the requirements of
++this License.
++
++ Each contributor grants you a non-exclusive, worldwide, royalty-free
++patent license under the contributor's essential patent claims, to
++make, use, sell, offer for sale, import and otherwise run, modify and
++propagate the contents of its contributor version.
++
++ In the following three paragraphs, a "patent license" is any express
++agreement or commitment, however denominated, not to enforce a patent
++(such as an express permission to practice a patent or covenant not to
++sue for patent infringement). To "grant" such a patent license to a
++party means to make such an agreement or commitment not to enforce a
++patent against the party.
++
++ If you convey a covered work, knowingly relying on a patent license,
++and the Corresponding Source of the work is not available for anyone
++to copy, free of charge and under the terms of this License, through a
++publicly available network server or other readily accessible means,
++then you must either (1) cause the Corresponding Source to be so
++available, or (2) arrange to deprive yourself of the benefit of the
++patent license for this particular work, or (3) arrange, in a manner
++consistent with the requirements of this License, to extend the patent
++license to downstream recipients. "Knowingly relying" means you have
++actual knowledge that, but for the patent license, your conveying the
++covered work in a country, or your recipient's use of the covered work
++in a country, would infringe one or more identifiable patents in that
++country that you have reason to believe are valid.
++
++ If, pursuant to or in connection with a single transaction or
++arrangement, you convey, or propagate by procuring conveyance of, a
++covered work, and grant a patent license to some of the parties
++receiving the covered work authorizing them to use, propagate, modify
++or convey a specific copy of the covered work, then the patent license
++you grant is automatically extended to all recipients of the covered
++work and works based on it.
++
++ A patent license is "discriminatory" if it does not include within
++the scope of its coverage, prohibits the exercise of, or is
++conditioned on the non-exercise of one or more of the rights that are
++specifically granted under this License. You may not convey a covered
++work if you are a party to an arrangement with a third party that is
++in the business of distributing software, under which you make payment
++to the third party based on the extent of your activity of conveying
++the work, and under which the third party grants, to any of the
++parties who would receive the covered work from you, a discriminatory
++patent license (a) in connection with copies of the covered work
++conveyed by you (or copies made from those copies), or (b) primarily
++for and in connection with specific products or compilations that
++contain the covered work, unless you entered into that arrangement,
++or that patent license was granted, prior to 28 March 2007.
++
++ Nothing in this License shall be construed as excluding or limiting
++any implied license or other defenses to infringement that may
++otherwise be available to you under applicable patent law.
++
++ 12. No Surrender of Others' Freedom.
++
++ If conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License. If you cannot convey a
++covered work so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you may
++not convey it at all. For example, if you agree to terms that obligate you
++to collect a royalty for further conveying from those to whom you convey
++the Program, the only way you could satisfy both those terms and this
++License would be to refrain entirely from conveying the Program.
++
++ 13. Use with the GNU Affero General Public License.
++
++ Notwithstanding any other provision of this License, you have
++permission to link or combine any covered work with a work licensed
++under version 3 of the GNU Affero General Public License into a single
++combined work, and to convey the resulting work. The terms of this
++License will continue to apply to the part which is the covered work,
++but the special requirements of the GNU Affero General Public License,
++section 13, concerning interaction through a network will apply to the
++combination as such.
++
++ 14. Revised Versions of this License.
++
++ The Free Software Foundation may publish revised and/or new versions of
++the GNU General Public License from time to time. Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++ Each version is given a distinguishing version number. If the
++Program specifies that a certain numbered version of the GNU General
++Public License "or any later version" applies to it, you have the
++option of following the terms and conditions either of that numbered
++version or of any later version published by the Free Software
++Foundation. If the Program does not specify a version number of the
++GNU General Public License, you may choose any version ever published
++by the Free Software Foundation.
++
++ If the Program specifies that a proxy can decide which future
++versions of the GNU General Public License can be used, that proxy's
++public statement of acceptance of a version permanently authorizes you
++to choose that version for the Program.
++
++ Later license versions may give you additional or different
++permissions. However, no additional obligations are imposed on any
++author or copyright holder as a result of your choosing to follow a
++later version.
++
++ 15. Disclaimer of Warranty.
++
++ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
++APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
++HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
++OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
++THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
++IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
++ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++ 16. Limitation of Liability.
++
++ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
++THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
++GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
++USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
++DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
++PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
++EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
++SUCH DAMAGES.
++
++ 17. Interpretation of Sections 15 and 16.
++
++ If the disclaimer of warranty and limitation of liability provided
++above cannot be given local legal effect according to their terms,
++reviewing courts shall apply local law that most closely approximates
++an absolute waiver of all civil liability in connection with the
++Program, unless a warranty or assumption of liability accompanies a
++copy of the Program in return for a fee.
++
++ END OF TERMS AND CONDITIONS
++
++ How to Apply These Terms to Your New Programs
++
++ If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++ To do so, attach the following notices to the program. It is safest
++to attach them to the start of each source file to most effectively
++state the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++
++ Copyright (C)
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see .
++
++Also add information on how to contact you by electronic and paper mail.
++
++ If the program does terminal interaction, make it output a short
++notice like this when it starts in an interactive mode:
++
++ Copyright (C)
++ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++ This is free software, and you are welcome to redistribute it
++ under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License. Of course, your program's commands
++might be different; for a GUI interface, you would use an "about box".
++
++ You should also get your employer (if you work as a programmer) or school,
++if any, to sign a "copyright disclaimer" for the program, if necessary.
++For more information on this, and how to apply and follow the GNU GPL, see
++.
++
++ The GNU General Public License does not permit incorporating your program
++into proprietary programs. If your program is a subroutine library, you
++may consider it more useful to permit linking proprietary applications with
++the library. If this is what you want to do, use the GNU Lesser General
++Public License instead of this License. But first, please read
++.
+
+Property changes on: ../trunk-jpl/src/java/License.txt
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/inishell.sh
+===================================================================
+--- ../trunk-jpl/src/java/inishell.sh (revision 0)
++++ ../trunk-jpl/src/java/inishell.sh (revision 17808)
+@@ -0,0 +1,8 @@
++#/bin/bash
++#This is just the necessary command line to run a jar file
++
++#recover file name:
++xmlfilename=$1
++
++#call inishell
++java -jar dist/inishell.jar $xmlfilename
+
+Property changes on: ../trunk-jpl/src/java/inishell.sh
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/Changelog_1.0.0.txt
+===================================================================
+--- ../trunk-jpl/src/java/Changelog_1.0.0.txt (revision 0)
++++ ../trunk-jpl/src/java/Changelog_1.0.0.txt (revision 17808)
+@@ -0,0 +1,29 @@
++This is the changelog for Inishell release 1.0.0
++ *editing existing ini file:
++ +populate the GUI according to the values in an existing ini file
++ +show progress bar while loading
++ +Comments are preserved, nested template parameters properly handled, unknown keys are preserved
++
++ *usability improvements:
++ +the file dialogs remember the last path they pointed to
++ +add ".ini" extension when saving to a config file if necessary
++ +new icons, hoping to make their meaning clearer
++ +reset button on the GUI to revert to defaults
++
++ *layout improvements:
++ +fixed help text horizontal alignements issues
++ +the help text is now verticaly aligned with the top of the widget
++ +Notion of hierarchy for an easier handling of layout issues
++ +layout now consistent between Linux and Windows, still some small spacing differences with osX
++ +possibility to group parameters in a frame with a frame title
++
++ *bug fixes:
++ +default value in comboBox is honored
++ +mandatory comboBox properly handled on osX
++ +better help text handling
++
++ *others:
++ +keys are printed in the order they appear on the GUI
++ +code cleanup and optimizations
++ +add version information in MANIFEST and title bar
++ +clean up and reorganization in build.xml, add help and pack targets
+
+Property changes on: ../trunk-jpl/src/java/Changelog_1.0.0.txt
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/dist/inishell.jar
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/dist/inishell.jar
+===================================================================
+--- ../trunk-jpl/src/java/dist/inishell.jar (revision 17807)
++++ ../trunk-jpl/src/java/dist/inishell.jar (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/dist/inishell.jar
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/doc/examples/io.ini
+===================================================================
+--- ../trunk-jpl/src/java/doc/examples/io.ini (revision 0)
++++ ../trunk-jpl/src/java/doc/examples/io.ini (revision 17808)
+@@ -0,0 +1,180 @@
++[General]
++PLUGINPATH = ../../lib/plugins ;super
++BUFF_CHUNK_SIZE = 30
++BUFF_BEFORE = 1.5
++
++[Input]
++COORDSYS = CH1903
++TIME_ZONE = 1
++; COORDSYS = PROJ4
++; COORDPARAM = 21781
++
++#reading ARC dem
++DEM = ARC
++DEMFILE = ./input/surface-grids/Switzerland_1000m.asc
++
++#reading ARPS dem
++; DEM = ARPS
++; DEMFILE = ./wgrt10r2_vw4.asc
++; ARPS_X = 653400
++; ARPS_Y = 112204
++
++#reading PGM image as dem
++; DEM = PGM
++; DEMFILE = ./Switzerland.pgm
++; PGM_XCOORD = 479500.
++; PGM_YCOORD = 73500.
++; PGM_CELLSIZE = 1000.
++; PGM_MIN = 193.
++; PGM_MAX = 4204.
++
++; LANDUSE = ARC
++; LANDUSEFILE = ch_as97.asc
++
++#Alpine3D traditional inputs -> A3D plugin
++; METEO = A3D
++; METEOPATH = ./input/meteo
++
++#Borma
++; METEO = BORMA
++; METEOPATH = ./input/xml
++; NROFSTATIONS = 1
++; STATION1 = 00.00.00.2
++
++#Snowpack input
++; METEO = SNOWPACK
++; METEOPATH = input
++; METAFILE = IMIS_Extracted_Info.txt ;metadata for all stations
++; STATION1 = MST96_RR.inp
++
++#SMET meteorological file format
++METEO = SMET
++METEOPATH = ./input/meteo
++STATION1 = FLU2.smet
++STATION2 = FIR2.smet
++STATION3 = FRA2.smet
++STATION4 = GLA2.smet
++STATION5 = ILI2.smet
++STATION6 = OTT2.smet
++STATION7 = TUJ3.smet
++
++#IMIS network database input -> IMIS plugin
++; METEO = IMIS
++; DBNAME = sdbo
++; DBUSER = XXX
++; DBPASS = XXX
++; NROFSTATIONS = 4
++; STATION1 = MORN2
++; STATION2 = DAV3
++; STATION3 = KLO2
++; STATION4 = *SAM0
++
++#GEOtop traditional inputs -> GEOTOP plugin
++; METEO = GEOTOP
++; METEOPATH = meteo/
++; METEOPREFIX = _meteo
++
++#GSN direct input -> GSN plugin
++; METEO = GSN
++; ENDPOINT = http://montblanc.slf.ch:22001/services/A3DWebService
++; STATION1 = wan_sen14_2008
++; STATION2 = wan2
++
++[Output]
++COORDSYS = CH1903
++TIME_ZONE = 1
++
++GRID2D = ARC
++GRID2DPATH = ./
++
++; GRID2D = PNG
++; GRID2DPATH = ./
++; PNG_MIN_SIZE = 800x600
++; PNG_WORLD_FILE = true
++; PNG_AUTOSCALE = false
++; PNG_SCALING = nearest
++
++METEO = SMET
++METEOPATH = ./
++
++[Filters]
++TA::filter1 = min_max
++TA::arg1 = 240 320
++
++RH::filter1 = min_max
++RH::arg1 = 0.01 1.2
++RH::filter2 = min_max
++RH::arg2 = soft 0.05 1.0
++
++HNW::filter1 = min
++HNW::arg1 = -0.1
++HNW::filter2 = min
++HNW::arg2 = soft 0.
++
++ISWR::filter1 = min_max
++ISWR::arg1 = -10. 1500.
++ISWR::filter2 = min
++ISWR::arg2 = soft 0.
++
++RSWR::filter1 = min_max
++RSWR::arg1 = -10 1500
++RSWR::filter2 = min
++RSWR::arg2 = soft 0
++
++#for TA between 240 and 320 K
++ILWR::filter1 = min_max
++ILWR::arg1 = 188 600
++ILWR::filter2 = min_max
++ILWR::arg2 = soft 200 400
++
++#we need to consider time with no snow -> TSS>0
++#min(TSS) in db since 1998: -50C
++TSS::filter1 = min_max
++TSS::arg1 = 200 320
++
++#idem
++TSG::filter1 = min_max
++TSG::arg1 = 200 320
++
++HS::filter1 = min
++HS::arg1 = soft 0.0
++HS::filter2 = rate
++HS::arg2 = 5.55e-5 ;0.20 m/h
++
++VW::filter1 = min_max
++VW::arg1 = -2 70
++VW::filter2 = min_max
++VW::arg2 = soft 0.2 50.0
++
++[Interpolations1D]
++WINDOW_SIZE = 86400
++
++TA::resample = linear
++
++RH::resample = linear
++
++HS::resample = linear
++
++VW::resample = nearest_neighbour
++VW::args = extrapolate
++
++HNW::resample = linear
++
++[Interpolations2D]
++TA::algorithms = IDW_LAPSE CST_LAPSE
++TA::cst_lapse = -0.008
++TA::idw_lapse = -0.008 soft
++
++RH::algorithms = RH IDW_LAPSE CST
++
++HNW::algorithms = IDW_LAPSE CST_LAPSE CST
++HNW::cst_lapse = 0.0005 frac
++
++VW::algorithms = IDW_LAPSE CST
++
++P::algorithms = STD_PRESS
++
++ILWR::algorithms = CST_LAPSE
++ILWR::cst_lapse = -0.03125
++
++RSWR::algorithms = IDW CST
+
+Property changes on: ../trunk-jpl/src/java/doc/examples/io.ini
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/doc/examples/meteoio_config.xml
+===================================================================
+--- ../trunk-jpl/src/java/doc/examples/meteoio_config.xml (revision 0)
++++ ../trunk-jpl/src/java/doc/examples/meteoio_config.xml (revision 17808)
+@@ -0,0 +1,919 @@
++
++
++
++
++
++ Size in days of a chunk of data to read at once.
++
++
++
++
++ Alternate way of buffer centering: When rebuffering, the new date will be located BUFF_BEFORE days from the
++ beginning of the buffer (therefore, it takes a value in days).
++
++
++
++
++
++
++
++
++
++
++
++ coordinate system
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ plugin for METEO data
++
++
++
++
++
++ The name of the parameter to copy (e.g. TA, RH, VW, ISWR, etc)
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ plugin for Digital Elevation Model data
++
++
++
++
++
++
++
++
++ plugin for land cover data
++
++
++
++
++
++
++
++
++
++
++
++
++
++ plugin for 2D gridded data
++
++
++
++
++
++ filename for station number #
++
++
++
++
++ station id for the given station number #
++
++
++
++
++ Coordinates are given as "lat lon" or "xcoord ycoord epsg_code"
++
++
++
++
++
++
++ string containing the path to the xml files
++
++
++
++
++
++
++ database name, as provided by your database administrator
++
++
++ database user name
++
++
++ database password associated with the user name
++
++
++
++
++ OPTIONAL: use ANETZ stations to provide precipitations for normal IMIS stations.
++ Each IMIS station is associated with one or two ANETZ stations and does a weighted
++ average to get what should be its local precipitations
++
++
++
++
++ OPTIONAL: if set to false (default), all IMIS precipitation will be deleted (since IMIS stations don't have heated rain gauges, their precipitation measurements are not good in winter conditions). If set to true, it is strongly advised to use a FilterHNWMelt filter to detect snow melting in the rain gauge and perform winter conditions detection in the application.
++
++
++
++
++ if set to true, the SNOWPACK simulated Snow Water Equivalent from the database will be used to compute HNW. Data gaps greater than 3 hours on SWE will lead to unchanged hnw while all data that can properly be computed will overwrite hnw. (default=false)
++
++
++
++
++
++
++
++ string containing the path to the grib files
++
++
++ grib file extension, or none for no file extension (default: .grb)
++
++
++
++
++
++
++
++ string containing the path to the data files
++
++
++ absolute filename of the geotop.inpts file
++
++
++ prefix to append when generating a file name for reading
++
++
++
++
++
++ string containing the path to the data files
++
++
++ specifiy in which order the columns should be printed out
++
++
++
++
++
++ webserver running GSN with its port number and full path. For example:
++ http://montblanc.slf.ch:22001/services/A3DWebService
++
++
++ Should the connection go through a proxy? This is useful for servers
++ filtering on domains but usually not necessary.
++
++
++
++
++
++
++
++
++
++
++ string containing the path to the smet files
++
++
++
++
++
++
++ string representing path where SMET files should be saved
++
++
++
++
++
++
++
++
++
++ string containing the path to the SNOWPACK files
++
++
++ filename of the meta data file (in METEOPATH)
++
++
++
++ the number of measured snow temperatures provided
++
++
++
++ the number of solutes for which input data are provided
++
++
++
++
++
++
++
++
++
++
++
++
++
++ OPTIONAL: wind velocity to use for blowing and drifting snow is provided
++
++
++
++
++ OPTIONAL: measured new snow density is provided
++
++
++
++
++
++
++
++
++
++
++ generate names compatible with Alpine3D's grid viewer?
++
++
++ grid file extension, or none for no file extension (default: .asc)
++
++
++
++
++
++ x coordinate of the lower left corner of the grids
++
++
++ y coordinate of the lower left corner of the grids
++
++
++ grid file extension, or none for no file extension (default: .asc)
++
++
++
++
++
++ prefix to append when generating a file name for reading (ie: something like "laf" for Cosmo-Analysis-full domain)
++
++
++ grib file extension, or none for no file extension (default: .grb)
++
++
++
++
++
++
++
++ generate a world file for each output file? This file contains the geolocalization information
++
++
++
++
++ generate a legend?
++
++
++
++
++ autoscale color scale?
++
++
++
++
++ scaling algorithm (default=bilinear)
++
++
++ minimum dimensions of the PNG, like 640x480
++
++
++ maximum dimensions of the PNG, like 1024x768
++
++
++
++
++ generate a color indexed file (default=true)
++
++
++
++
++ optimize for speed (default=false)
++
++
++ number of colors in the palette (default=30)
++
++
++
++
++
++ lower left x coordinate
++
++
++ lower left y coordinate
++
++
++ cellsize in meters
++
++
++ minimum value in real world coordinates to match with the minimum value read out of the PGM file (such minimum being greater than 0 because 0 is NODATA)
++
++
++ maximum value in real world coordinates to match with the maximum value read out of the PGM file
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Mean average processing. The mean average filter returns the mean value of all values within a user given time window.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Median average processing. The median average filter returns the median value of all values within a user given time window.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Standard deviation filter. Values outside of mean ± 2 std_dev are rejected.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Median Absolute Deviation. Values outside of median ± 3 σ_MAD are rejected. <br>
++ See http://en.wikipedia.org/wiki/Median_absolute_deviation for more information.
++
++
++
++
++
++
++ The keyword "soft" maybe added, if the window position is allowed to be adjusted to the data present.
++ The two arguments may be preceded by the keywords "left", "center" or "right", indicating the window position.
++
++
++ Tukey 53H method A smooth time sequence is generated from the median, substracted from the original signal and
++ compared with the standard deviation. see "Despiking Acoustic Doppler Velocimeter Data", Derek G. Goring and Vladimir
++ L. Nikora, Journal of Hydraulic Engineering, 128, 1, 2002 The deviation factor coeffecient is currently hard-coded as k=1.5.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Wind vector averaging. This calculates the vector average over a user given time period. Each wind vector
++ within this period is added and the final sum is normalized by the number of vectors that have been added.
++
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++ Alpha needs to be provided as last argument. Please note that the standard filter works with a left window!
++
++
++ Exponential smooting processing, exponential moving average s_0 = x_0 s_n = alpha*x_(t-1) + (1-alpha)*s_t-1
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++ Please note that the standard filter works with a left window!
++
++
++ Weighted moving average smoothing such as: WMA = (1*X1 + 2*X2 + ... + n*Xn) / sum_of_weights
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ This implements the standard methods for precipitation correction as described in "WMO Solid Precipitation Measurement Intercomparison", B. Goodison, P. Louie and D. Yang, 872, 1998 as well as the overview given by "Literature Study on the Correction of Precipitation Measurements", Annette Wagner, 2009. The correction parameters for the shielded Hellmann gauge (German version) are from "Wind-induced Precipitation Undercatch of the Hellmann Gauges", Daqing Yang et al, Nordic Hydrology, 30, 1999, pp 57-80.
++
++
++
++
++
++
++ This applies a constant correction factor to the precipitation, one for pure snow and one for mixed precipitation. The following thresholds are used: pure snow below -2 C; mixed precipitation between -2 and +2 C; pure rain above 2 C. These threshold can be changed (see online documentation).
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Affects resampling: expresses (in seconds) how far a valid point can be
++ searched for when re-interpolating a missing value
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Detrend the measured data, fill the grid with the average over all the stations, reapply the elevation trend
++
++
++
++
++ Detrend the measured data, apply Inverse Distance Weighted average, reapply elevation trend
++
++
++
++ Same as IDW_LAPSE, but only considering a given number of neighboring stations
++
++
++
++
++
++ Base algorithm (do not forget to add the options for the base algorithm)
++
++ Distribute precipitation with a base algorithm (IDW_LAPSE by default), then reduce/remove precipitation on
++ steep slopes and correct with the local curvature. This is to simulate snow redistribution processes.
++
++
++
++ Variogram model
++
++ Ordinary kriging (EXPERIMENTAL)
++
++
++
++
++
++
+\ No newline at end of file
+
+Property changes on: ../trunk-jpl/src/java/doc/examples/meteoio_config.xml
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/doc/examples/snowpack_config.xml
+===================================================================
+--- ../trunk-jpl/src/java/doc/examples/snowpack_config.xml (revision 0)
++++ ../trunk-jpl/src/java/doc/examples/snowpack_config.xml (revision 17808)
+@@ -0,0 +1,1084 @@
++
++
++
++
++
++
++ Size in days of a chunk of data to read at once.
++
++
++
++
++ Alternate way of buffer centering: When rebuffering, the new date will be located BUFF_BEFORE days from the
++ beginning of the buffer (therefore, it takes a value in days).
++
++
++
++
++
++
++
++
++
++
++
++ coordinate system
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ plugin for METEO data
++
++
++
++
++ The name of the parameter to copy (e.g. TA, RH, VW, ISWR, etc)
++
++ Copy a meteo parameter into a new one (you should not need this)
++
++
++
++
++
++
++
++
++ Path to the land surface and snow input parameters
++
++
++
++
++
++ Plugin to use for reading SNO data
++
++
++
++ file name for the initial profile for station number #
++
++
++
++
++
++
++
++ Path to the outputs (this path MUST exist, it won't be created)
++
++
++
++ Option to give an additional simulation specific output name to the run in addition to "STATION_NAME")
++
++
++
++
++
++
++
++ Write meteo data out?
++
++
++
++ When to start writing meteo data out (offset, in days)
++
++
++
++ How often to write meteo data out (in days: 3 hours=.125, 1 hour=4.1666e-2)
++
++
++
++
++
++ If AVGSUM_TIME_SERIES is set, mean fluxes and cumulated masses since last dump are written, else current energy fluxes, cumulated masses over last COMPUTATION_STEP_LENGTH (recommended setting in operational mode).
++
++
++
++
++
++ If CUMSUM_MASS is set, current value of cumulated masses since begin of run are dumped. Precipitations (rain and snow, rain) are always dumped as rates (kg m-2 h-1).
++
++
++
++
++
++ Write precipitation as rates (kg m-2 h-1, default) or as sums over the output time step. Please note that the units label in the output file and in SN_GUI <b>will remain kg m-2 h-1</b> and will therefore not match sums.
++
++
++
++
++
++
++
++
++
++ How to write the profiles (default: ASCII)
++
++
++
++
++
++ Write profile data out?
++
++
++
++ When to start writing profile data out (offset, in days)
++
++
++
++ How often to write profile data out (in days: 3 hours=.125, 1 hour=4.1666e-2)
++
++
++
++
++
++ Write the hand hardness in newtons (default) or as index
++
++
++
++
++
++ Classify the profile (default=false)? This is according to Schweizer, J. and M. Luetschg, <i>Characteristics of human-triggered avalanches</i>, 2001, Cold Reg. Sci. Technol. <b>33</b>(2-3)
++
++
++
++
++
++
++
++
++ Plugin to use for reading SNO data
++
++
++
++ Dump snow files every BACKUP_DAYS_BETWEEN days
++
++
++
++ First dump of sno files happens at end of run or after FIRST_BACKUP days, whichever happens first
++
++
++
++
++
++
++
++
++
++ Write canopy data out? To be set to TRUE only if CANOPY=TRUE
++
++
++
++
++
++ Write hazard data out? This must be FALSE for Alpine3D
++
++
++
++
++
++ Write turbulent fluxes out?
++
++
++
++
++
++ Write snow/soil temperatures out?
++
++
++
++
++
++
++ Write long wave radiation out?
++
++
++
++
++
++ Write short wave radiation out?
++
++
++
++
++
++ Write mass balance terms out?
++
++
++
++
++
++ Write meteo parameters out?
++
++
++
++
++
++ Write stability parameters out?
++
++
++
++
++
++
++
++
++
++ Internal time step (in minutes) used for model simulation. Please note that this MUST be the same as HNW::accumulate (the latter being in seconds) if re-acumulating precipitation, otherwise it would lead to wrong results.
++
++
++
++ Aerodynamic roughness length as a parameter for the Monin-Obukhov bulk formulation; A typical value for complex terrain is 0.01 m and for snow covered flat sites 0.001 m.
++
++
++
++ The instrument height (or model layer height) for meteorological input data except for wind, which may be at a different height; note that height is above ground for a standard SNOWPACK application but above surface (snow or ground) for Alpine3D applications.
++
++
++
++ The instrument height (or model layer height) for wind input data; note that height is above ground for a standard SNOWPACK application but above surface (snow or ground) for Alpine3D applications
++
++
++
++
++
++
++
++
++ Input mode by which a measurement of snow depth is used to drive the snow cover mass balance
++
++
++
++ Define the shortwave radiation input: <ol> <li value="0">Incoming shortwave radiation is measured and albedo estimated by the model;</li> <li>Reflected shortwave radiation is available as input and albedo is estimated by the model (IMIS standard);</li> <li>Incoming and reflected shortwave radiation are both measured and the albedo is estimated from both measurements subject to plausibility checks.</li> </ol>
++
++
++
++ Select the atmospheric stability correction model:<ol> <li value="-1"> use a simplified Richardson number stability correction;</li> <li>assume standard Monin-Obukhov bulk formulation for surface exchange iteration with Paulson, Stearns and Weidner (can be used with BC_CHANGE=0); </li> <li> force Monin-Obukhov formulation to assume neutral conditions regardless of the actual stratification; it has been shown to work well in complex terrain settings. It should be used with BC_CHANGE=1, i.e., Dirichlet bc but also is recommended with Neumann b.c., i.e., BC_CHANGE=0.</li> </ol>
++
++
++
++
++
++ Switch to tell the model that canopy is present (note that Canopy parameters should then be provided in the *.sno file)
++
++
++
++
++
++ A measured surface temperature is available and can be reliably used for various consistency tests (it needs to be set to true if enabling CHANGE_BC).
++
++
++
++
++
++ Use measured surface temperature as Dirichlet temperature BC for sub-freezing snowpacks and switch to Neumann only for melting snowpacks. If set to false, assumes Neumann boundary conditions.
++
++
++
++ Threshold value (small number below freezing), which switches from Dirichlet to Neumann BCs if CHANGE_BC is selected
++
++
++
++
++
++
++
++
++
++
++ Based on meteorological input from a (flat field) automatic station or numerical weather model, up to 8 expositions can be calculated in addition to the flat field if the corresponding *.sno files are provided. For example, if you provide a flat field *.snow file (mandatory), which is named KLO3.sno and you want 4 slopes to be calculated the corresponding slope files should be named KLO21.sno, …,KLO24.sno
++
++
++
++
++
++ Use the provided incoming long wave on the virtual slopes?
++
++
++
++
++
++ Specifies if redistribution of snow is allowed from (upwind) expositions to lee slopes. In case just the flat field is calculated, snow erosion is enabled but only for "ENFORCE_MEASURED_SNOW_HEIGHTS".
++
++
++
++
++
++
++
++
++ Soil layers as defined by the *.sno files are included in the simulation
++
++
++
++
++
++ Assume that the lower temperature boundary condition is given by GEO_HEAT (Neumann) and not by a measured temperature
++
++
++
++ Constant geothermal heat flux at great) depth W m-2): Lower flux boundary condition for temperature equation if BC is Neumann
++
++
++
++
++
++
++
++
++ <font color="FF0000">The keys in this section deeply affect the operation of the SNOWPACK model. This could lead to unexpected behavior or surprising results. If you are not an experienced Snowpack user, please do NOT change any keys below!</font>
++
++
++
++
++
++
++
++ variant selection (includes a choice of specific models)
++
++
++
++
++
++
++
++ perp_to_slope
++
++
++
++
++
++ Shifts the origin of the wind rose for snow redistribution and slope simulations: e.g. choose 45° to have NE/SE/SW/NW
++
++
++
++ Scaling factor to apply to wind values in case of drifting snow
++
++
++
++
++
++
++
++
++ Tell the model that relative humidity values are with respect to water regardless of the temperature
++
++
++
++ Temperature threshold for rain/snow transition
++
++
++
++ If ENFORCE_MEASURED_SNOW_HEIGHTS, relative humidity threshold for precipitation to occur
++
++
++
++ If ENFORCE_MEASURED_SNOW_HEIGHTS, (TA-TSS) threshold for precipitation to occur
++
++
++
++
++
++
++ Relative humidity threshold above which no surface hoar is allowed to form (because at very high humidity, typically no hoar crystals can form)
++
++
++
++ Wind speed threshold above which no surface hoar is allowed to form (because it will drift away)
++
++
++
++ Define the initial density for surface hoar at the time it gets buried by new snow
++
++
++
++ Define a threshold below which any traces of surface hoar will not be given a separate hoar layer when buried.
++
++
++
++ Assumed density of surface hoar while exposed at the surface and not buried
++
++
++
++
++
++
++ positions of temperatur sensors in snow or soil: positive values refer to heigths measured from the ground surface (snow only), negative values refer to depths measured from either the ground surface or the snow surface in case no soil layers are present. A sensor must at least be covered by MIN_DEPTH_SUBSURF (m) snow for its temperature to be output.
++
++
++
++
++ Minimum snow depth above a temperature sensor to accept the measurement
++
++
++
++ If you go to Antarctica or the tropics you may expect different reasonable temperatures
++
++
++
++ If you go to Antarctica or the tropics you may expect different reasonable temperatures
++
++
++
++
++
++
++
++
++
++
++
++ Choice of new snow density model (diverse statistical models)
++
++
++
++ Fixed value to be used as new snow density if a constant density model is chosen, otherwise the choices are "PARAMETERIZED" "EVENT" "MEASURED"
++
++
++
++
++
++ metamorphism_model
++
++
++
++ new_snow_grain_rad
++
++
++
++
++
++ strength_model
++
++
++
++
++
++ viscosity_model
++
++
++
++
++
++
++ hardness_model
++
++
++
++
++
++ Choose the Doorschot saltation model over the simple Sorenson parameterization
++
++
++
++
++
++ Select a multi stream model for shortwave radiation penetration into the snow cover
++
++
++
++
++
++ Force the model to work with a fixed albedo
++
++
++
++
++
++
++
++
++
++ Identify grass growing under the snow height sensor. This usually works well but might sometimes lead to problems
++
++
++
++
++
++ Switch to tell the model that a impermeable layer should be simulated on top of some snow or ice: this requires that the *.sno file contains this layer, which is characterized via the soil parameters; the option has successfully been used to simulate snow and ice protection using geo-textiles and saw dust.
++
++
++
++
++
++ If switched on, you can also simulate ponding on impermeable ice surfaces below the snow cover
++
++
++
++
++
++ Assuming an impermeable surface such as on a road or on geo-textiles (e.g. for snow farming), a liquid water layer is allowed to form on this surface
++
++
++
++
++
++
++ Standard size of a new element added to the stack of elements (layers) during snowfall events
++
++
++
++ Threshold value for enforcing the layer to be merged with the layer above or below
++
++
++
++
++
++ Combine neighboring elements based on a set of similarity conditions which are hard-coded
++
++
++
++
++
++
++ filename for station number #
++
++
++
++
++ station id for the given station number #
++
++
++
++
++ Coordinates are given as "lat lon" or "xcoord ycoord epsg_code"
++
++
++
++
++
++
++ string containing the path to the xml files
++
++
++
++
++
++
++ database name, as provided by your database administrator
++
++
++ database user name
++
++
++ database password associated with the user name
++
++
++
++
++ OPTIONAL: use ANETZ stations to provide precipitations for normal IMIS stations.
++ Each IMIS station is associated with one or two ANETZ stations and does a weighted
++ average to get what should be its local precipitations
++
++
++
++
++ OPTIONAL: if set to false (default), all IMIS precipitation will be deleted (since IMIS stations don't have heated rain gauges, their precipitation measurements are not good in winter conditions). If set to true, it is strongly advised to use a FilterHNWMelt filter to detect snow melting in the rain gauge and perform winter conditions detection in the application.
++
++
++
++
++ if set to true, the SNOWPACK simulated Snow Water Equivalent from the database will be used to compute HNW. Data gaps greater than 3 hours on SWE will lead to unchanged hnw while all data that can properly be computed will overwrite hnw. (default=false)
++
++
++
++
++
++
++
++ string containing the path to the grib files
++
++
++ grib file extension, or none for no file extension (default: .grb)
++
++
++
++
++
++
++
++ string containing the path to the data files
++
++
++ absolute filename of the geotop.inpts file
++
++
++ prefix to append when generating a file name for reading
++
++
++
++
++
++ webserver running GSN with its port number and full path. For example:
++ http://montblanc.slf.ch:22001/services/A3DWebService
++
++
++ Should the connection go through a proxy? This is useful for servers
++ filtering on domains but usually not necessary.
++
++
++
++
++
++
++
++
++
++
++ string containing the path to the smet files
++
++
++
++
++
++
++ string containing the path to the SNOWPACK files
++
++
++ filename of the meta data file (in METEOPATH)
++
++
++ the number of measured snow temperatures that are provided
++
++
++ the number of solutes for which input data are provided
++
++
++
++
++
++
++
++
++
++
++
++
++
++ OPTIONAL: wind velocity to use for blowing and drifting snow is provided
++
++
++
++
++ OPTIONAL: measured new snow density is provided
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Mean average processing. The mean average filter returns the mean value of all values within a user given time window.
++
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Median average processing. The median average filter returns the median value of all values within a user given time window.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Standard deviation filter. Values outside of mean ± 2 std_dev are rejected.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Median Absolute Deviation. Values outside of median ± 3 σ_MAD are rejected. <br>
++ See http://en.wikipedia.org/wiki/Median_absolute_deviation for more information.
++
++
++
++
++
++
++ The keyword "soft" maybe added, if the window position is allowed to be adjusted to the data present.
++ The two arguments may be preceded by the keywords "left", "center" or "right", indicating the window position.
++
++
++ Tukey 53H method A smooth time sequence is generated from the median, substracted from the original signal and
++ compared with the standard deviation. see "Despiking Acoustic Doppler Velocimeter Data", Derek G. Goring and Vladimir
++ L. Nikora, Journal of Hydraulic Engineering, 128, 1, 2002 The deviation factor coeffecient is currently hard-coded as k=1.5.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Wind vector averaging. This calculates the vector average over a user given time period. Each wind vector
++ within this period is added and the final sum is normalized by the number of vectors that have been added.
++
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++ Alpha needs to be provided as last argument. Please note that the standard filter works with a left window!
++
++
++ Exponential smooting processing, exponential moving average s_0 = x_0 s_n = alpha*x_(t-1) + (1-alpha)*s_t-1
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++ Please note that the standard filter works with a left window!
++
++
++ Weighted moving average smoothing such as: WMA = (1*X1 + 2*X2 + ... + n*Xn) / sum_of_weights
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ This implements the standard methods for precipitation correction as described in "WMO Solid Precipitation Measurement Intercomparison", B. Goodison, P. Louie and D. Yang, 872, 1998 as well as the overview given by "Literature Study on the Correction of Precipitation Measurements", Annette Wagner, 2009. The correction parameters for the shielded Hellmann gauge (German version) are from "Wind-induced Precipitation Undercatch of the Hellmann Gauges", Daqing Yang et al, Nordic Hydrology, 30, 1999, pp 57-80.
++
++
++
++
++
++
++ This applies a constant correction factor to the precipitation, one for pure snow and one for mixed precipitation. The following thresholds are used: pure snow below -2 C; mixed precipitation between -2 and +2 C; pure rain above 2 C. These threshold can be changed (see online documentation).
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Affects resampling: expresses (in seconds) how far a valid point can be
++ searched for when re-interpolating a missing value
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+\ No newline at end of file
+
+Property changes on: ../trunk-jpl/src/java/doc/examples/snowpack_config.xml
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/doc/examples/issm.xml
+===================================================================
+--- ../trunk-jpl/src/java/doc/examples/issm.xml (revision 0)
++++ ../trunk-jpl/src/java/doc/examples/issm.xml (revision 17808)
+@@ -0,0 +1,1284 @@
++
++
++
++
++
++
++
++ select a mesh dimension 0(default) or 3
++
++
++
++
++
++ number of elements
++
++
++
++ number of verticies
++
++
++
++ vertex indices of the mesh elements
++
++
++
++ vertices x coordinate [m]
++
++
++
++ vertices y coordinate [m]
++
++
++
++ vertices z coordinate [m]
++
++
++
++ edges of the 2d mesh (vertex1 vertex2 element1 element2)
++
++
++
++ number of edges of the 2d mesh
++
++
++
++
++
++
++ mesh dimension
++
++
++
++ number of extrusion layers
++
++
++
++ lower vertices flags list
++
++
++
++ lower elements flags list
++
++
++
++ upper vertices flags list
++
++
++
++ upper element flag list
++
++
++
++ upper vertex list (NaN for vertex on the upper surface)
++
++
++
++ upper element list (NaN for element on the upper layer)
++
++
++
++ lower vertex list (NaN for vertex on the lower surface)
++
++
++
++ lower element list (NaN for element on the lower layer
++
++
++
++ vertices on the boundary of the domain flag list
++
++
++
++ edges on domain boundary (vertex1 vertex2 element)
++
++
++
++ number associated to each segment
++
++
++
++ list of vertices connected to vertex_i
++
++
++
++ list of vertices connected to element_i
++
++
++
++ average number of vertices connected to one vertex
++
++
++
++
++
++
++ vertices extracted from the model
++
++
++
++ elements extracted from the model
++
++
++
++
++
++
++ vertices latitude [degrees]
++
++
++
++ verticies longitude [degrees]
++
++
++
++ Indicate hemisphere 'n' or 's'
++
++
++
++
++
++
++ is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0
++
++
++
++ presence of ice if > 0, icefront position if = 0, no ice if < 0
++
++
++
++
++
++
++
++ surface elevation [m]
++
++
++
++ ice thickness [m]
++
++
++
++ bed elevation [m]
++
++
++
++ bathymetry elevation [m]
++
++
++
++ coefficient for ice shelves; thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro
++
++
++
++
++
++
++ gravitational acceleration [m/s^2]
++
++
++
++ number of seconds in a year [s/yr]
++
++
++
++ reference temperature used in the enthalpy model [K]
++
++
++
++
++
++ surface mass balance [m/yr ice eq]
++
++
++
++
++
++ basal melting rate (positive if melting) [m/yr]
++
++
++
++ additional melting applied to compensate for dh/dt [m/yr]
++
++
++
++ geothermal heat flux [W/m^2]
++
++
++
++
++
++ ice density [kg/m^3]
++
++
++
++ ocean water density [kg/m^3]
++
++
++
++ fresh water density [kg/m^3]
++
++
++
++ water viscosity [N s/m^2]
++
++
++
++ heat capacity [J/kg/K]
++
++
++
++ latent heat of fusion [J/kg]
++
++
++
++ ice thermal conductivity [W/m/K]
++
++
++
++ temperate ice thermal conductivity [W/m/K]
++
++
++
++ melting point of ice at 1atm in K
++
++
++
++ rate of change of melting point with pressure [K/Pa]
++
++
++
++ mixed layer capacity [W/kg/K]
++
++
++
++ thermal exchange velocity [m/s]
++
++
++
++ flow law parameter [Pa/s^(1/n)]
++
++
++
++ Glens flow law exponent
++
++
++
++ law for the temperature dependance of the rheology: "None", "Paterson", "Arrhenius" or "LliboutryDuval"
++
++
++
++ Lithosphere shear modulus [Pa]
++
++
++
++ Lithosphere density [g/cm^-3]
++
++
++
++ Mantle shear modulus [Pa]
++
++
++
++ Mantle density [g/cm^-3]
++
++
++
++
++
++
++
++
++
++ damage law (string) from {"undamaged","pralong"}
++
++
++
++ damage tensor (scalar)
++
++
++
++ damage law (string) from {"undamaged","pralong"}
++
++
++
++ damage constraints (NaN means no constraint)
++
++
++
++ maximum possible damage (0<=max_damage<1)
++
++
++
++ 0: no, 1: artificial_diffusivity, 2: SUPG
++
++
++
++ maximum number of non linear iterations
++
++
++
++ stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)
++
++
++
++ threshold to declare convergence of damage evolution solution (default is 0)
++
++
++
++ scaling exponent (default is 3)
++
++
++
++
++
++
++
++
++ friction coefficient [SI]
++
++
++
++ p exponent
++
++
++
++ q exponent
++
++
++
++
++
++
++
++
++ is the Shallow Ice Approximation (SIA) used ?
++
++
++
++ is the Shelfy-Stream Approximation (SSA) used ?
++
++
++
++ is the L1L2 approximation used ?
++
++
++
++ is the Higher-Order (HO) approximation used ?
++
++
++
++ are the Full-FS (FS) equations used ?
++
++
++
++ Finite Element for SSA "P1", "P1bubble" "P1bubblecondensed" "P2"
++
++
++
++ Finite Element for HO "P1" "P1bubble" "P1bubblecondensed" "P1xP2" "P2xP1" "P2"
++
++
++
++ Finite Element for FS "P1P1" (debugging only) "P1P1GLS" "MINIcondensed" "MINI" "TaylorHood"
++
++
++
++ flow equation for each vertex
++
++
++
++ flow equation for each element
++
++
++
++ vertices on SSAs border (for tiling)
++
++
++
++ vertices on HOs border (for tiling)
++
++
++
++ vertices on FS border (for tiling)
++
++
++
++
++
++
++ simulation starting time [yr]
++
++
++
++ final time to stop the simulation [yr]
++
++
++
++ length of time steps [yr]
++
++
++
++ use cfl condition to define time step ? (0 or 1)
++
++
++
++ coefficient applied to cfl condition
++
++
++
++
++
++
++
++
++ x component of velocity [m/yr]
++
++
++
++ y component of velocity [m/yr]
++
++
++
++ z component of velocity [m/yr]
++
++
++
++ velocity norm [m/yr]
++
++
++
++ pressure field [Pa]
++
++
++
++ fraction of water in the ice
++
++
++
++ ice thickness [m]
++
++
++
++ sediment water head of subglacial system [m]
++
++
++
++ epl water head of subglacial system [m]
++
++
++
++ thickness of subglacial water [m]
++
++
++
++
++
++
++ structure containing all rift information (vertices coordinates, segments, type of melange, ...)
++
++
++
++ N/A
++
++
++
++
++
++
++
++ use Valgrind to debug (0 or 1)
++
++
++
++
++ use gnu-profiler to find out where the time is spent
++
++
++
++
++ enables profiling (memory, flops, time)
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ results are output for all the nodes of each element
++
++
++
++ I/O gathering strategy for result outputs (default 1)
++
++
++
++ is the memory limited ? (0 or 1)
++
++
++
++ frequency at which results are saved in all solutions with multiple time_steps
++
++
++
++ maximum number of minutes to wait for batch results (NaN to deactivate)
++
++
++
++ server hostname where model should be uploaded
++
++
++
++ path on server where model should be uploaded
++
++
++
++ server login
++
++
++
++ port login (default is 0)
++
++
++
++ unique id generated when uploading the file to server
++
++
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++ N/A
++
++
++
++
++
++ thickness constraints (NaN means no constraint) [m]
++
++
++
++ ice thickening rate used in the mass conservation (dh/dt) [m/yr]
++
++
++
++ 0: None, 1: SU, 2: SSAs artificial diffusivity, 3:DG
++
++
++
++
++
++
++
++ mechanical equilibrium residual convergence criterion
++
++
++
++ velocity relative convergence criterion, NaN: not applied
++
++
++
++ velocity absolute convergence criterion, NaN: not applied
++
++
++
++ 0: Picards fixed point, 1: Newtons method, 2: hybrid
++
++
++
++ maximum number of nonlinear iterations
++
++
++
++ over-shooting constant new=new+C*(new-old)
++
++
++
++
++
++
++ x-axis velocity constraint (NaN means no constraint) [m/yr]
++
++
++
++ y-axis velocity constraint (NaN means no constraint) [m/yr]
++
++
++
++ z-axis velocity constraint (NaN means no constraint) [m/yr]
++
++
++
++
++
++
++ threshold for instability of mechanical constraints
++
++
++
++ number of iterations before rift penalties are locked
++
++
++
++
++
++
++ use dampening for floating ice ? Only for FS model
++
++
++
++ multiplier for incompressibility equation. Only for FS model
++
++
++
++ local referential
++
++
++
++ loading force applied on each point [N/m^3]
++
++
++
++ additional outputs requested
++
++
++
++
++
++
++
++
++
++ type of grounding line migration: "SoftMigration","AgressiveMigration" or "None"
++
++
++
++ melting rate applied when previously grounded parts start floating [m/yr]
++
++
++
++
++
++
++
++
++ water thickness constraints (NaN means no constraint) [m]
++
++
++
++ Manning roughness coefficient
++
++
++
++ tortuosity parameter
++
++
++
++ dimensionless exponent in Manning velocity formula
++
++
++
++ dimensionless exponent in Manning velocity formula
++
++
++
++ parameter in effective pressure formula
++
++
++
++ artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.
++
++
++
++
++
++
++
++ thickness constraints (NaN means no constraint) [m]
++
++
++
++ calving rate at given location [m/a]
++
++
++
++ do we use free surfaces (FS only) are mass conservation
++
++
++
++ minimum ice thickness allowed [m]
++
++
++
++ adjustment of ice shelves surface and bed elevations: 'Incremental' or 'Absolute'
++
++
++
++ 0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin
++
++
++
++
++
++
++ offset used by penalties: penalty = Kmax*10^offset
++
++
++
++ pairs of vertices that are penalized
++
++
++
++ additional outputs requested
++
++
++
++
++
++
++
++ temperature constraints (NaN means no constraint) [K]
++
++
++
++ 0: no, 1: artificial_diffusivity, 2: SUPG
++
++
++
++ maximum number of non linear iterations
++
++
++
++ stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)
++
++
++
++ threshold to declare convergence of thermal solution (default is 0)
++
++
++
++ scaling exponent (default is 3)
++
++
++
++ use an enthalpy formulation to include temperate ice (default is 0)
++
++
++
++ enable dynamic setting of basal forcing. required for enthalpy formulation (default is 0)
++
++
++
++ additional outputs requested
++
++
++
++
++
++
++
++ relative tolerance criterion [K]
++
++
++
++ maximum number of iterations
++
++
++
++ additional requested outputs
++
++
++
++
++
++
++
++ indicates whether a masstransport solution is used in the transient
++
++
++
++ indicates whether a stressbalance solution is used in the transient
++
++
++
++ indicates whether a thermal solution is used in the transient
++
++
++
++ indicates whether a groundingline migration is used in the transient
++
++
++
++ indicates whether a postglacial rebound model is used in the transient
++
++
++
++ indicates whether damage evolution is used in the transient
++
++
++
++ LEVEL SET DESCRIPTION...
++
++
++
++ list of additional outputs requested
++
++
++
++
++
++
++
++ mantle viscosity[Pa s]
++
++
++
++ lithosphere thickness (km)
++
++
++
++ 1: square-edged (default). 2: elliptical. See iedge in GiaDeflectionCore
++
++
++
++
++
++
++
++
++ indicates if the automatic differentiation is activated
++
++
++
++ list of dependent variables
++
++
++
++ list of independent variables
++
++
++
++ ADOLC driver ('fos_forward' or 'fov_forward')
++
++
++
++ Number of operations per buffer (==OBUFSIZE in usrparms.h)
++
++
++
++ Number of locations per buffer (==LBUFSIZE in usrparms.h)
++
++
++
++ Number of values per buffer (==CBUFSIZE in usrparms.h)
++
++
++
++ Number of taylors per buffer (<=TBUFSIZE in usrparms.h)
++
++
++
++ free location block sorting/consolidation triggered if the ratio between allocated and used locations exceeds gcTriggerRatio
++
++
++
++ free location block sorting/consolidation triggered if the allocated locations exceed gcTriggerMaxSize
++
++
++
++
++
++
++
++ name of kml output targets file
++
++
++
++ name of kml input tracks file
++
++
++
++ structure of kml flight requirements (not used yet)
++
++
++
++ element or nodal criterion for flight path evaluation (metric)
++
++
++
++
++
++
++ number of grids at equator (determines resolution)
++
++
++
++
++ flag to consider target values for flight path evaluation
++
++
++
++
++ flag to split polygons on the antimeridian
++
++
++
++
++
++
++
++ optimize? (default false)
++
++
++
++ number of directions to test when moving a point. If this value = 1, a random direction is tested. A value > 1 results in directions equally spaced from [0, 2*PI] being tested. For example, 4 would result in directions [0, PI/2, PI, 3PI/2]
++
++
++
++ specifies the distance in km (default 25) to move a randomly selected path point on each iteration
++
++
++
++ number of iterations (default 30,000) to run for flightplan optimization, i.e. the number of times to randomly select a point and move it.
++
++
++
++
++
++
++ name of kml solution file
++
++
++
++ quality of kml solution
++
++
++
++
++
++
++
++ is inversion activated?
++
++
++
++ 1: linear viscosity, 0: non-linear viscosity
++
++
++
++ ex: {'FrictionCoefficient'}, or {'MaterialsRheologyBbar'}
++
++
++
++ number of optimization searches
++
++
++
++ indicate the type of response for each optimization step
++
++
++
++ cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter
++
++
++
++ misfit convergence criterion. Default is 1%, NaN if not applied
++
++
++
++ maximum iterations during each optimization step
++
++
++
++ scaling factor on gradient direction during optimization, for each optimization step
++
++
++
++ decrease threshold for misfit, default is 30%
++
++
++
++ absolute minimum acceptable value of the inversed parameter on each vertex
++
++
++
++ absolute maximum acceptable value of the inversed parameter on each vertex
++
++
++
++ observed velocity x component [m/yr]
++
++
++
++ observed velocity y component [m/yr]
++
++
++
++ observed velocity magnitude [m/yr]
++
++
++
++ observed thickness [m])
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ is qmu analysis activated?
++
++
++
++ (arrays of each variable class)
++
++
++
++ (arrays of each response class)
++
++
++
++ number of responses
++
++
++
++ (array of method-independent parameters)
++
++
++
++ (information from dakota files)
++
++
++
++ user provided mesh partitioning, defaults to metis if not specified
++
++
++
++ number of partitions for semi-discrete qmu
++
++
++
++
++
++
++
++ use an enthalpy formulation to include temperate ice (default is 0)
++
++
++
++ array of dakota_method class
++
++
++
++ directory for mass flux profiles
++
++
++
++
++
++
++
++
++
++
++
++ additional outputs requested
++
++
++
++ weight applied to each mesh vertex
++
++
++
++
++
++
++
++ list of potential outputs that can be requested, but which need additional data to be defined
++
++
++
++
++
++
++
++ notes in a cell of strings
++
++
++
++ model name
++
++
++
++ empty field to store some data
++
++
++
++
++
+\ No newline at end of file
+
+Property changes on: ../trunk-jpl/src/java/doc/examples/issm.xml
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/doc/examples/min_example.xml
+===================================================================
+--- ../trunk-jpl/src/java/doc/examples/min_example.xml (revision 0)
++++ ../trunk-jpl/src/java/doc/examples/min_example.xml (revision 17808)
+@@ -0,0 +1,40 @@
++
++
++
++
++
++ This is a parameter that asks for a string value and that is present in
++ both the section "section1" and "section2".
++
++
++
++
++
++
++
++
++
++ This parameter belongs to section1.
++ When the "null" option is selected, the dropdown menu appears
++ red because this parameter is non-optional.
++ When the value "ONE" is selected a nested parameter "SOME_INTEGER" appears.
++
++
++
++
++
++
++
++
+\ No newline at end of file
+
+Property changes on: ../trunk-jpl/src/java/doc/examples/min_example.xml
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/lib/miglayout-4.0.jar
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/lib/miglayout-4.0.jar
+===================================================================
+--- ../trunk-jpl/src/java/lib/miglayout-4.0.jar (revision 17807)
++++ ../trunk-jpl/src/java/lib/miglayout-4.0.jar (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/lib/miglayout-4.0.jar
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/MANIFEST.MF
+===================================================================
+--- ../trunk-jpl/src/java/MANIFEST.MF (revision 0)
++++ ../trunk-jpl/src/java/MANIFEST.MF (revision 17808)
+@@ -0,0 +1,14 @@
++Manifest-Version: 1.0
++Ant-Version: Apache Ant 1.8.4
++Created-By: 1.6.0_51-b11-457-11M4509 (Apple Inc.)
++Built-By: larour
++Built-On: 2014-04-14
++Built-At: 14:27:23
++Main-Class: main/GUIBuilder
++Specification-Title: INI file generator
++Specification-Version: 1.0.0-20140414
++Specification-Vendor: SLF, www.slf.ch
++Implementation-Title: INIshell ini creator
++Implementation-Version: 1.0.0
++Implementation-Vendor: SLF, www.slf.ch
++
+Index: ../trunk-jpl/src/java/src/gui_elements/CombinedPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/CombinedPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/CombinedPanel.java (revision 17808)
+@@ -0,0 +1,267 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.event.ItemEvent;
++import java.text.NumberFormat;
++import java.util.*;
++import java.text.DecimalFormat;
++import java.text.DecimalFormatSymbols;
++
++import javax.swing.JCheckBox;
++import javax.swing.JComponent;
++import javax.swing.JFormattedTextField;
++import javax.swing.JTextField;
++import javax.swing.JLabel;
++import javax.swing.JComboBox;
++
++import main.XMLHelper;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
++import net.miginfocom.swing.MigLayout;
++
++/**
++ * @brief The CombinedPanel may contain other panels, such as check and drop down boxes and text fields
++ *
++ * @author Thomas Egger
++ */
++public class CombinedPanel extends OptionPanel {
++ enum Type { CHOICE, INTEGER, DECIMAL, STRING, DROPDOWN }
++
++ /**
++ *
++ */
++ private static final long serialVersionUID = -6751282938445852408L;;
++
++ private final LinkedList valueComponents;
++
++ /**
++ * Constructor for a panel that can hold text, numbers and check boxes. It
++ * corresponds to the parameter type "combination" in the configuration file
++ * and its subcomponents correspond to the option values.
++ *
++ * @param element
++ * @throws GUIBuildException
++ */
++ public CombinedPanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ super(element, parent, false); //doing layout by itself
++
++ //System.out.println("Hierarchy: Parent: " + parent.getKey() + ": "+ parent.getHierarchy() + " own: " + getHierarchy());
++
++ int column1 = 200;
++ column1 -= getHierarchy() * 5;
++ this.setLayout(new MigLayout("gapx 6, wrap 8, ins n 5 n n", "["+column1+"!][78!][78!][78!][78!][78!][78!][20!][200:400:400]", ""));
++
++ this.add(jlabel, "gapleft " + getHierarchy() * 5);
++ this.add(help, "cell 8 0, wrap");
++
++ valueComponents = new LinkedList();
++
++ final Element[] optionElements = XMLHelper.getElementArray(element, "option");
++
++ byte lblcounter = 0;
++
++ DecimalFormat format = (DecimalFormat)DecimalFormat.getInstance();
++ DecimalFormatSymbols custom = new DecimalFormatSymbols();
++ custom.setDecimalSeparator('.');
++ format.setDecimalFormatSymbols(custom);
++ format.setGroupingUsed(false);
++
++ DecimalFormat integerFormat = (DecimalFormat)DecimalFormat.getIntegerInstance();
++ integerFormat.setGroupingUsed(false);
++
++ int row = 0;
++ int column = 1;
++
++ for (int i=0;i 12) width = 2; //for oversize labels
++
++ if (column+width >= 7) {
++ column = 1;
++ row++;
++ }
++ lblcomponent = new JLabel(label);
++ valueComponents.add(lblcomponent);
++
++ //System.out.println("component: " + component.getClass() + ");
++ //System.out.println("component: " + lblcomponent.getClass() + " size: " + lblcomponent.getWidth() + " col: " + column + " row: " + row);
++ this.add(lblcomponent, "cell " + column + " " + row + " " + width + " 1");
++ column += width;
++ width = 1;
++ lblcomponent.setVisible(true);
++ }
++
++ if (column >= 7) {
++ column = 1;
++ row++;
++ }
++ //System.out.println("component: " + component.getClass() + " size: " + component.getWidth() + " col: " + column + " row: " + row);
++ this.add(component, "cell " + column + " " + row + " " + width + " 1");
++ column++;
++
++ valueComponents.add(component);
++ component.setVisible(true);
++ }
++
++ //System.out.println("\t-->Instantiated one Combined Panel with " + optionElements.length + " components");
++ }
++
++ @Override
++ public void close() {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void set(HashMap hm, String inkey, String invalue) {
++ if (!hm.containsKey(hashKey)) return;
++ String val = (String)hm.get(hashKey);
++
++ //System.out.println("\tSetting CombinedPanel: " + hashKey + " = " + val);
++ //System.out.println("\tThis CombinedPanel has the key: " + this.getKey() + " should be: " + inkey + " val: " + invalue);
++
++ //Now loop through valueComponents and see if the value string can be matched
++ if (val == null) return;
++
++ String[] tokens = val.split("\\s+");
++ int counter = 0;
++
++ //System.out.println("\t\tLooking at VAL param: " + val);
++ for (final JComponent comp : valueComponents) {
++ boolean digested = false;
++ if (tokens.length <= counter) break;
++ //System.out.println("\t\tLooking at USER param: " + tokens[counter]);
++
++ if (comp.getClass() == JCheckBox.class) {
++ String cbString = ((JCheckBox) comp).getText();
++ if (tokens[counter].equals(cbString)) {
++ ((JCheckBox) comp).setSelected(true);
++ digested = true;
++ }
++ } else if (comp.getClass() == JComboBox.class) {
++ JComboBox box = (JComboBox) comp;
++
++ for (int ii=0; ii 0)
++ value += " ";
++ }
++
++ if (value.equals("")) return null;
++ else return value;
++ }
++
++ @Override
++ public void itemStateChanged(ItemEvent arg0) {
++ String selectedOption = null;
++
++ if (arg0.getItemSelectable().getClass() == JCheckBox.class) {
++ selectedOption = ((JCheckBox) arg0.getItemSelectable()).getText();
++ super.handleItemEvent(arg0, selectedOption);
++ } else if (arg0.getItemSelectable().getClass() == JComboBox.class) {
++ selectedOption = ((String)((JComboBox)arg0.getItemSelectable()).getSelectedItem());
++ //HACK: should call super...
++ }
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/CombinedPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/SelectorPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/SelectorPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/SelectorPanel.java (revision 17808)
+@@ -0,0 +1,233 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++ *
++ * INIshell is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation, either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * INIshell is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with INIshell. If not, see .
++ *
++ */
++
++package gui_elements;
++
++import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
++
++import javax.swing.JButton;
++import javax.swing.JOptionPane;
++
++
++import main.GUIBuilder;
++import main.XMLHelper;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
++
++import java.util.List;
++import java.util.ArrayList;
++import java.util.HashMap;
++
++/**
++ * This class introduces more flexibility into the inishell interface:
++ * The SelectorPanel offers the user to add a specific parameter to
++ * the interface.
++ *
++ * @author Thomas Egger
++ */
++public class SelectorPanel extends ControlledPanel implements ActionListener {
++
++ private static final long serialVersionUID = 8610877538909126920L;
++
++ String[] parameters;
++
++ JButton addButton;
++ JButton removeButton;
++ Element template;
++ String templateKey;
++ HashMap mapOfParameters;
++ ControlledPanel cp = null;
++
++ public SelectorPanel(Element element, ControlledPanel parent) {
++ super(element, parent);
++ templateKey = ""; //will store the pattern of the key
++
++ addButton = new JButton("+");
++ this.add(addButton, "cell 1 0, split 2, grow");
++ addButton.addActionListener(this);
++
++ removeButton = new JButton("-");
++ this.add(removeButton, "cell 1 0, grow, wrap");
++ removeButton.addActionListener(this);
++
++ //The following lines try to extract the template key (e.g. %::filters#, %::resample, COPY::%)
++ final NodeList nodelist = element.getChildNodes();
++ for (int ii = 0; ii < nodelist.getLength(); ii++) {
++ if (nodelist.item(ii).getNodeType() == Node.ELEMENT_NODE) {
++ Element currentElement = (Element)nodelist.item(ii);
++ if (currentElement.getAttribute("template").equals("true")){
++ template = (Element)currentElement.cloneNode(true);
++ templateKey = template.getAttribute("key");
++ template.setAttribute("template", "false");
++ }
++ }
++ }
++
++ final Element[] options = XMLHelper.getElementArray(element, "option");
++ parameters = new String[options.length + 1];
++ for (int ii=0; ii < options.length; ii++) {
++ parameters[ii] = options[ii].getAttribute("value");
++ }
++ parameters[options.length] = "Other...";
++
++ key = templateKey; //IMPORTANT: this changes the key only, not the label!
++ hashKey = this.getSection().toUpperCase() + "::" + this.getKey().toUpperCase();
++ mapOfParameters = new HashMap();
++ }
++
++ @Override
++ public void actionPerformed(ActionEvent arg0) {
++ if (arg0.getSource() == addButton) {
++ add();
++ } else if (arg0.getSource() == removeButton) {
++ remove();
++ }
++ }
++
++ @Override
++ public void set(HashMap hm, String key, String value) {
++ //HACK
++ //System.out.println("\tKEY: " + key + " VAL: " + value);
++
++ String myKey = this.section.toUpperCase() + "::" + templateKey.toUpperCase().replace("%","([a-zA-Z0-9_]+)");
++ myKey = myKey.replace("#","[1-9]+[0-9]*"); //all integer numbers from 1 to infinity
++ //System.out.println("PATTERN: " + myKey);
++ String myKey2 = key.replaceAll(myKey, "$1");
++ String myKey3 = key.replaceAll(myKey, "$0");
++
++ //System.out.println("HUHUI: " + templateKey + " --- " + myKey2 + " -- " + myKey3);
++
++ boolean toAdd = true;
++ if (mapOfParameters.get(myKey2) != null) toAdd = false; //Parameter already exists
++
++ if (toAdd) {
++ ControlledPanel child = add(myKey2, true, hm, key, value);
++ cp = child;
++ if (child != null) child.set(hm, key, value);
++ } else {
++ if (cp != null) cp.set(hm, key, value);
++ }
++ }
++
++ public void add() {
++ String param = "";
++ String choice = "Other...";
++
++ if (parameters.length > 1)
++ choice = (String)JOptionPane.showInputDialog(this, "Add a parameter", "Add", JOptionPane.QUESTION_MESSAGE, null, parameters, null);
++
++ if (choice == null) return;
++
++ if (choice.equals("Other...")) {
++ param = JOptionPane.showInputDialog(this, "Enter the name of a meteo parameter\n(e.g. VW_AVG, P2");
++ } else {
++ param = choice;
++ }
++
++ add(param, false, null, null, null);
++ }
++
++ public ControlledPanel add(String param, boolean doSet, HashMap hm, String key, String value) {
++ //System.out.println("Trying to add SelectorPanel: " + key + " ... " + value);
++
++ if ((param == null) || (param.length() == 0)) return null;
++ param = param.toUpperCase();
++
++ if (mapOfParameters.get(param) != null) return null; //Parameter already exists
++
++ Element child = (Element)template.cloneNode(true);
++ recursiveKeyReplace(child, param);
++ element.appendChild(child);
++
++ ControlledPanel childPanel = null;
++ try {
++ childPanel = ControlledPanel.createSingleParameterPanel(child, this);
++ childPanel.setKey(childPanel.getKey());
++ GUIBuilder.gui.addToTab(childPanel, section, this);
++ childPanel.hold();
++ GUIBuilder.control(childPanel);
++ GUIBuilder.recursiveBuild(child, this, doSet, hm, key, value);
++
++ mapOfParameters.put(param, childPanel);
++ } catch (final GUIBuildException e1) {
++ e1.printStackTrace();
++ }
++
++ this.invalidate();
++
++ return childPanel;
++ }
++
++ @Override
++ public void close() {
++
++ }
++
++ @Override
++ public String getValue() {
++ return null;
++ }
++
++ public void remove() {
++ if (mapOfParameters.size() == 0) return;
++
++ String choice = (String)JOptionPane.showInputDialog(this, "Remove a parameter", "Remove", JOptionPane.QUESTION_MESSAGE, null, mapOfParameters.keySet().toArray(), null);
++
++ if (choice == null) return; //nothing to do
++
++ String childKey = templateKey.replaceAll("%", choice);
++ final Element child = XMLHelper.getCertainChildElement(element, "parameter", "key", childKey);
++
++ if (child == null) return;
++
++ try { //this makes sure that all child nodes are destroyed
++ GUIBuilder.recursiveDestruct(child, this);
++ element.removeChild(child);
++ final ControlledPanel childPanel = GUIBuilder.panelControl.get(section, childKey);
++
++ childPanel.release();
++ childPanel.close();
++
++ if (!childPanel.isNeeded())
++ GUIBuilder.gui.removeFromTab(childPanel, section, this);
++
++ mapOfParameters.remove(choice);
++ } catch (final GUIBuildException e) {
++ e.printStackTrace();
++ }
++
++ this.invalidate();
++ }
++
++ private void recursiveKeyReplace(Element element, String string) {
++ if (element.hasAttribute("key"))
++ element.setAttribute("key", element.getAttribute("key").replaceAll("%", string));
++
++ final NodeList nodelist = element.getChildNodes();
++ for (int i = 0; i < nodelist.getLength(); i++) {
++ if (nodelist.item(i).getNodeType() == Node.ELEMENT_NODE) {
++ recursiveKeyReplace(((Element) nodelist.item(i)), string);
++ }
++ }
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/SelectorPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/GUIBuildException.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/GUIBuildException.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/GUIBuildException.java (revision 17808)
+@@ -0,0 +1,33 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++public class GUIBuildException extends Exception {
++
++ /**
++ *
++ */
++ private static final long serialVersionUID = 1L;
++
++ public GUIBuildException(String message) {
++ super(message);
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/GUIBuildException.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/ControlledPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/ControlledPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/ControlledPanel.java (revision 17808)
+@@ -0,0 +1,285 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.Color;
++import java.awt.Component;
++import java.awt.Font;
++
++import javax.swing.JEditorPane;
++import javax.swing.JLabel;
++import javax.swing.JPanel;
++import javax.swing.JSeparator;
++import javax.swing.*;
++import java.util.HashMap;
++import javax.swing.border.*;
++
++import main.GUI;
++import main.GUIBuilder;
++import main.XMLHelper;
++import net.miginfocom.swing.MigLayout;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++
++/**
++ * Abstract class for JPanels that are maintained with their key and designated
++ * section and can return their current value.
++ */
++public abstract class ControlledPanel extends JPanel {
++
++ private static final long serialVersionUID = 1L;
++
++ private int dependencies;
++
++ protected JLabel jlabel;
++
++ protected String section;
++ protected String key;
++ protected String label;
++ protected String hashKey;
++
++ protected Element element;
++
++ protected boolean optional;
++ protected String replace;
++
++ protected int hierarchy;
++ protected String helptext;
++ protected JEditorPane help;
++
++ /**
++ * Constructor for a controlled panel.
++ *
++ * @param element
++ */
++ public ControlledPanel(Element element, ControlledPanel parent) {
++ this(element, parent, true);
++ }
++
++ public ControlledPanel(Element element, ControlledPanel parent, boolean doLayout) {
++ super();
++ initialize(element, parent);
++
++ if (doLayout) {
++ int column1 = 200;
++ column1 -= getHierarchy() * 5; //Indentation for the label, 5px per hierarchy level
++
++ setLayout(new MigLayout("gapx 6, wrap 8, top, ins n 5 n n", "["+ column1 + "!][100!][100!][100!][100!][100!][300:400:400]", ""));
++ add(jlabel, "growx, ay top, gaptop 5, gapleft " + getHierarchy() * 5);
++ add(help, "cell 6 0, wrap");
++ }
++ }
++
++ private void initialize(Element element, ControlledPanel parent) {
++ dependencies = 0;
++
++ this.element = element;
++ this.key = element.getAttribute("key");
++ this.label = this.key;
++
++ this.section = element.getAttribute("section");
++ this.hashKey = this.section.toUpperCase() + "::" + this.key.toUpperCase();
++ this.optional = element.getAttribute("optional").equals("true");
++
++ jlabel = new JLabel(this.label + ": ");
++ jlabel.setForeground(GUI.LABEL_COLOR);
++
++ this.setBackground(Color.white);
++ this.setVisible(true);
++
++ /* Add help to the right side of the panel. */
++ helptext = XMLHelper.getChildElementContent(element, "help");
++ help = ControlledPanel.createHelpPane(""+helptext+"");
++ if (helptext != null) help.setText(helptext);
++
++ if (parent != null) {
++ setHierarchy(parent.getHierarchy() + 1);
++ } else {
++ setHierarchy(0);
++ }
++ }
++
++ /**
++ * Creates a ControlledPanel for a parameter that matches its type. (i.e.
++ * radio buttons for an option parameter, ...
++ *
++ * @param element
++ * @return the Controlled Panel
++ * @throws GUIBuildException
++ */
++ public static ControlledPanel createSingleParameterPanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ ControlledPanel panel;
++
++ //System.out.println("IN create: " + XMLHelper.getString((Node)element));
++
++ if (element.hasAttribute("counter")) {
++ panel = new DuplicatorPanel(element, parent);
++ } else if (element.getTagName().equals("frame")) {
++ panel = new FramePanel(element, parent);
++ } else if (element.getAttribute("type").equals("path") || element.getAttribute("type").equals("file")) {
++ panel = new PathPanel(element, parent);
++ } else if (element.getAttribute("type").equals("alternative") || element.getAttribute("type").equals("logical")) {
++ panel = new AlternativePanel(element, parent);
++ } else if (element.getAttribute("type").equals("choice")) {
++ panel = new CheckBoxPanel(element, parent);
++ } else if (element.getAttribute("type").equals("integer") || element.getAttribute("type").equals("integer+")){
++ panel = new IntegerPanel(element, parent);
++ } else if (element.getAttribute("type").equals("decimal")) {
++ panel = new DecimalPanel(element, parent);
++ } else if (element.getAttribute("type").equals("double")) {
++ panel = new TextfieldPanel(element, parent);
++ } else if (element.getAttribute("type").equals("string") || element.getAttribute("type").equals("char") || element.getAttribute("type").equals("cell")){
++ panel = new TextfieldPanel(element, parent);
++ } else if (element.getAttribute("type").equals("combination")) {
++ panel = new CombinedPanel(element, parent);
++ } else if (element.getAttribute("type").equals("selector")) {
++ panel = new SelectorPanel(element, parent);
++ } else {
++ throw new GUIBuildException("Cannot create a GUI panel for a parameter of type " + element.getAttribute("type"));
++ }
++
++ return panel;
++ }
++
++ public static JEditorPane createHelpPane(String helptext){
++ JEditorPane help = new JEditorPane();
++ help.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);
++ help.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 12));
++ help.setEditable(false);
++ help.setContentType("text/html");
++ help.setForeground(Color.GRAY);
++ help.addHyperlinkListener(GUIBuilder.gui);
++
++ if (helptext!=null) {
++ help.setText(""+helptext+"");
++ } else {
++ help.setText("");
++ }
++
++ return help;
++ }
++
++ public void setHierarchy(int val) {
++ hierarchy = val;
++ }
++
++ public int getHierarchy() {
++ return hierarchy;
++ }
++
++ /**
++ * This method should be called when the panel is removed.
++ */
++ public abstract void close();
++
++ /**
++ * @return the GUI component.
++ */
++ public Component getComponent() {
++ return this;
++ }
++
++ /**
++ * @return the number of dependencies on the panel.
++ */
++ public int getDependencies() {
++ return dependencies;
++ }
++
++ /**
++ * @return the key of the corresponding key / value set
++ */
++ public String getKey() {
++ return key;
++ }
++
++ /**
++ * @return the current value of the key / value set null if the key value
++ * set should not be printed
++ */
++ public abstract String getValue();
++
++ /**
++ * This method should be called when another panel depends needs this panel
++ * to exist.
++ */
++ public synchronized void hold() {
++ this.dependencies++;
++ }
++
++ /**
++ * @return true if dependencies on this panel exist
++ * @throws GUIBuildException
++ */
++ public synchronized boolean isNeeded() throws GUIBuildException {
++ if (dependencies == 0) {
++ return false;
++ } else if (dependencies > 0) {
++ return true;
++ } else {
++ throw new GUIBuildException("Inplausible number of dependencies on panel");
++ }
++ }
++
++ /**
++ * @return true if a value for the underlying parameter is optional
++ */
++ public boolean isOptional() {
++ return optional;
++ }
++
++ /**
++ * This method should be called when a panel no longer needs this panel to
++ * exist. The panel will be removed if no dependency exists.
++ */
++ public synchronized void release() {
++ this.dependencies--;
++ }
++
++ public void set(HashMap hm, String key, String value) {
++ System.out.println("Set not implemented for ControlledPanel: " + serialVersionUID);
++ }
++
++ public String getHashKey() {
++ return hashKey;
++ }
++
++ /**
++ * This method sets a new key for a panel and changes its label.
++ *
++ * @param key
++ * the new key
++ */
++ public void setKey(String key) {
++ this.key = key;
++ element.setAttribute("key", key);
++ jlabel.setText(this.label + ": ");
++ }
++
++ /**
++ * Getter method for the section.
++ * @return the section
++ */
++ public String getSection() {
++ return section;
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/ControlledPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/CheckBoxPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/CheckBoxPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/CheckBoxPanel.java (revision 17808)
+@@ -0,0 +1,139 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import main.*;
++
++import java.awt.Color;
++import java.awt.event.ItemEvent;
++import java.util.HashMap;
++
++import javax.swing.JCheckBox;
++import javax.swing.JOptionPane;
++import javax.swing.JLabel;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++
++public class CheckBoxPanel extends OptionPanel {
++
++ private static final long serialVersionUID = 552186457208697362L;
++ private final JCheckBox[] boxes;
++ String concat;
++ private String setKey = null, setValue = null;
++ private boolean doSet = false;
++ private HashMap setMap;
++
++
++ /**
++ * Constructor for a panel that can hold a number of checkboxes to compose
++ * the value for a key/value set.
++ *
++ * @param element
++ * @throws GUIBuildException
++ */
++ public CheckBoxPanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ super(element, parent);
++
++ concat = "";
++ boxes = new JCheckBox[values.length];
++ for (int i = 0; i < values.length; i++) {
++ boxes[i] = new JCheckBox(values[i]);
++
++ this.add(boxes[i], "cell 1 " + i + ", wrap, ay top");
++
++ String extra = "";
++ if (i > 0)
++ extra = ", gapleft 12";
++
++ this.add(ControlledPanel.createHelpPane(this.helptexts[i]), "cell 6 "+ i +", width 200:400:400, wrap" + extra);
++
++ boxes[i].setBackground(Color.white);
++ boxes[i].setVisible(true);
++ boxes[i].addItemListener(this);
++ if (defaultTrues.contains(values[i])) {
++ boxes[i].setSelected(true);
++ concat += values[i] + " ";
++ }
++ }
++ }
++
++ @Override
++ public void close() {
++ for (final JCheckBox box : boxes)
++ box.setSelected(false);
++ }
++
++ @Override
++ public String getValue() {
++ if (!isOptional() && concat.equals("")) {
++ JOptionPane.showMessageDialog(null, "No option was selected for "
++ + getKey() + " (section '" + getSection().toUpperCase() + "')"
++ + ".\nA value is required. Your .ini-file is probably incorrect.",
++ "Problem when building .ini file",
++ JOptionPane.WARNING_MESSAGE);
++ }
++
++ if (concat.equals("")) return null;
++ else return concat.trim();
++ }
++
++ public synchronized void set(HashMap hm, String key, String value) {
++ String val = ((String)hm.get(hashKey)).toUpperCase();
++ //System.out.println("\tABOUT TO CHANGE CHECKBOXPANEL KEY: " + key + " VAL: " + val);
++
++ String[] tokens = val.split("\\s+");
++ for (final JCheckBox box : boxes) {
++ box.setSelected(false);
++
++ for (final String token : tokens) {
++ if (token.equals(box.getText())) {
++ //System.out.println("\t\tSelecting Checkbox: " + token);
++ doSet = true;
++ setKey = key;
++ setValue = value;
++ setMap = hm;
++ box.setSelected(true);
++ }
++ }
++ }
++ }
++
++
++ @Override
++ public synchronized void itemStateChanged(ItemEvent arg0) {
++ final String selectedOption = ((JCheckBox) arg0.getItemSelectable()).getText();
++
++ if (arg0.getStateChange() == ItemEvent.SELECTED) {
++ concat += selectedOption + " ";
++ } else {
++ concat = concat.replaceAll(new String(" " + selectedOption + " "), " ");
++ concat = concat.replaceFirst(new String("^" + selectedOption + " "), ""); //at the beginning of the concat
++ }
++
++ //super.handleItemEvent(arg0, selectedOption);
++ super.handleItemEvent(arg0, selectedOption, doSet, setMap, setKey, setValue);
++ doSet = false;
++ setKey = null;
++ setMap = null;
++ setValue = null;
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/CheckBoxPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/DuplicatorPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/DuplicatorPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/DuplicatorPanel.java (revision 17808)
+@@ -0,0 +1,175 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
++import java.util.*;
++
++import javax.swing.JButton;
++
++import main.GUIBuilder;
++import main.XMLHelper;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
++
++public class DuplicatorPanel extends ControlledPanel implements ActionListener {
++
++ /**
++ *
++ */
++ private static final long serialVersionUID = 6801877538909126920L;
++ JButton addButton;
++ Element clone;
++
++ JButton removeButton;
++
++ public DuplicatorPanel(Element element, ControlledPanel parent) {
++ super(element, parent);
++
++ addButton = new JButton("+");
++ this.add(addButton, "cell 1 0, split 2, grow");
++ addButton.addActionListener(this);
++
++ removeButton = new JButton("-");
++ this.add(removeButton, "cell 1 0, grow, wrap");
++ removeButton.addActionListener(this);
++
++ clone = (Element) element.cloneNode(true);
++ clone.removeAttribute("counter");
++ clone.setAttribute("counted", "true");
++ }
++
++ @Override
++ public void actionPerformed(ActionEvent arg0) {
++ if (arg0.getSource() == addButton) {
++ add();
++ } else if (arg0.getSource() == removeButton) {
++ remove();
++ }
++ }
++
++ @Override
++ public void set(HashMap hm, String key, String value) {
++ //System.out.println("Trying to add DUPLICATOR Panel: " + key + " ... " + value + " HashKey: " + this.getHashKey());
++
++ if (key.indexOf('#') == -1) {
++ ControlledPanel child = add(true, hm, key, value);
++ child.set(hm, key, value);
++ }
++ }
++
++ public ControlledPanel add() {
++ return add(false, null, null, null);
++ }
++
++ public ControlledPanel add(boolean doSet, HashMap hm, String key, String value) {
++
++ final Element child = (Element) this.clone.cloneNode(true);
++ final int counter = Integer.parseInt(element.getAttribute("counter"));
++ element.setAttribute("counter", (counter + 1) + "");
++
++ // child.setAttribute("key",element.getAttribute("key").replaceAll("#",counter+""));
++
++ //System.out.println("\t-->Adding a child panel to DUPLICATOR with key: " + key + " val: " + value + " HASH: " + this.getHashKey() + " hier: " + this.getHierarchy());
++
++ recursiveKeyReplace(child, counter + "");
++ element.appendChild(child);
++
++ ControlledPanel childPanel = null;
++ try {
++ childPanel = ControlledPanel.createSingleParameterPanel(child, this);
++ childPanel.setKey(childPanel.getKey());
++ GUIBuilder.gui.addToTab(childPanel, section, this);
++ childPanel.hold();
++ GUIBuilder.control(childPanel);
++ GUIBuilder.recursiveBuild(child, this, doSet, hm, key, value);
++
++ } catch (final GUIBuildException e1) {
++ // TODO Auto-generated catch block
++ e1.printStackTrace();
++ }
++
++ this.invalidate();
++
++ return childPanel;
++ }
++
++ @Override
++ public void close() {
++ boolean doRemove = true;
++
++ do {
++ doRemove = remove();
++ } while (doRemove);
++ }
++
++ @Override
++ public String getValue() {
++ return null;
++ }
++
++ public boolean remove() {
++ final int counter = Integer.parseInt(element.getAttribute("counter")) - 1;
++ final String childKey = element.getAttribute("key").replace("#", counter + "");
++ final Element child = XMLHelper.getCertainChildElement(element, "parameter", "key", childKey);
++
++ if (child == null) return false;
++
++ element.removeChild(child);
++ element.setAttribute("counter", (counter) + "");
++
++ final ControlledPanel childPanel = GUIBuilder.panelControl.get(section, childKey);
++
++ if (childPanel != null) {
++ childPanel.release();
++ childPanel.close();
++
++ try {
++ if (!childPanel.isNeeded()) {
++ GUIBuilder.gui.removeFromTab(childPanel, section, this);
++ }
++ } catch (final GUIBuildException e) {
++ // TODO Auto-generated catch block
++ e.printStackTrace();
++ }
++ }
++
++ this.invalidate();
++
++ return true;
++ }
++
++ private void recursiveKeyReplace(Element element, String string) {
++ if (element.hasAttribute("key")) {
++ element.setAttribute("key", element.getAttribute("key").replaceAll("#", string));
++ }
++ final NodeList nodelist = element.getChildNodes();
++ for (int i = 0; i < nodelist.getLength(); i++) {
++ if (nodelist.item(i).getNodeType() == Node.ELEMENT_NODE) {
++ recursiveKeyReplace(((Element) nodelist.item(i)), string);
++ }
++ }
++ }
++
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/DuplicatorPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/OptionPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/OptionPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/OptionPanel.java (revision 17808)
+@@ -0,0 +1,144 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.event.ItemEvent;
++import java.awt.event.ItemListener;
++import java.util.LinkedList;
++import java.util.HashMap;
++import javax.swing.event.EventListenerList;
++
++import main.GUIBuilder;
++import main.XMLHelper;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++
++/**
++ * A ControlledPanel that maintains a group of choices and invokes panel
++ * creation according to the current choices.
++ *
++ * @author korhammer et egger
++ *
++ */
++public abstract class OptionPanel extends ControlledPanel implements ItemListener {
++
++ private static final long serialVersionUID = 88L;
++
++ protected LinkedList defaultTrues;
++ protected EventListenerList listenerList;
++
++ protected String[] values;
++ protected String[] labels;
++ protected String[] helptexts;
++
++ /**
++ * The constructor for an OptionPanel.
++ *
++ * @param element
++ * : The xml element which the OptionPanel is created for.
++ * @throws GUIBuildException
++ */
++ public OptionPanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ this(element, parent, true);
++ }
++
++ public OptionPanel(Element element, ControlledPanel parent, boolean doLayout) throws GUIBuildException {
++ super(element, parent, doLayout);
++
++ String elementdefault = "";
++
++ if (element.hasAttribute("default"))
++ elementdefault = element.getAttribute("default");
++
++ listenerList = new EventListenerList();
++
++ final Element[] options = XMLHelper.getElementArray(element, "option");
++ defaultTrues = new LinkedList();
++
++ values = new String[options.length];
++ labels = new String[options.length];
++ helptexts = new String[options.length];
++
++ for (int i=0;i.
++*
++*/
++
++package gui_elements;
++
++import main.GUI;
++
++import java.awt.*;
++import java.awt.event.*;
++import java.util.HashMap;
++
++import javax.swing.JTextField;
++import javax.swing.JOptionPane;
++
++import org.w3c.dom.Element;
++
++/**
++ * A panel that contains a textfield.
++ *
++ * @author korhammer et egger
++ *
++ */
++public class TextfieldPanel extends ControlledPanel implements KeyListener {
++
++ private static final long serialVersionUID = 1L;
++ private String defaultText;
++
++ protected JTextField textfield;
++
++ /**
++ * The constructor for a TextfieldPanel.
++ *
++ * @param element
++ */
++ public TextfieldPanel(Element element, ControlledPanel parent) {
++ super(element, parent);
++ textfield = new JTextField(10);
++ textfield.setVisible(true);
++ this.add(textfield, "width 250:100:400, cell 1 0, growx, ay top, gaptop 3");
++ textfield.addKeyListener(this);
++
++ defaultText = "";
++ if (element.hasAttribute("default")) {
++ defaultText = element.getAttribute("default");
++ }
++ textfield.setText(defaultText);
++
++ if (!optional)
++ textfield.setBackground(GUI.WARNING_BACKGROUND_COLOR);
++
++ this.checkBgColor();
++ textfield.invalidate();
++ }
++
++
++
++ @Override
++ public void close() {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void set(HashMap hm, String key, String value) {
++ //System.out.println("\tI'm changing the label of the TextField with key '" + this.getKey() + "'");
++ String val = (String)hm.get(hashKey);
++ if (val != null) textfield.setText(val);
++ this.checkBgColor();
++ }
++
++ @Override
++ public String getValue() {
++ String thetext = textfield.getText();
++
++ if (!isOptional() && thetext.equals("")) {
++ JOptionPane.showMessageDialog(null, "No value was entered for "
++ + getKey() + " (section '" + getSection().toUpperCase() + "')"
++ + ".\nA value is required. Your .ini-file is probably incorrect.",
++ "Problem when building .ini file",
++ JOptionPane.WARNING_MESSAGE);
++ }
++
++ if (thetext.equals(""))
++ return null;
++
++ return thetext;
++ }
++
++ /** Handle the key typed event from the text field. */
++ public void keyTyped(KeyEvent e) {}
++
++ /** Handle the key-pressed event from the text field. */
++ public void keyPressed(KeyEvent e) {}
++
++ /** Handle the key-released event from the text field. */
++ public void keyReleased(KeyEvent e) {
++ checkBgColor();
++ }
++
++ public void checkBgColor() {
++ String text = textfield.getText();
++
++ if (!optional) {
++ if (text.length() > 0) {
++ textfield.setBackground(GUI.NORMAL_BACKGROUND_COLOR);
++ } else {
++ textfield.setBackground(GUI.WARNING_BACKGROUND_COLOR);
++ }
++ textfield.invalidate();
++ }
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/TextfieldPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/FramePanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/FramePanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/FramePanel.java (revision 17808)
+@@ -0,0 +1,71 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import main.GUIBuilder;
++import main.XMLHelper;
++
++import java.util.HashMap;
++import javax.swing.JPanel;
++import javax.swing.border.*;
++import javax.swing.BorderFactory;
++
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
++import net.miginfocom.swing.MigLayout;
++
++public class FramePanel extends ControlledPanel {
++
++ private static final long serialVersionUID = 1987664773406118295L;
++ protected String title = "";
++
++ /**
++ *
++ *
++ * @param element
++ * @throws GUIBuildException
++ */
++ public FramePanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ super(element, parent, false);
++ this.setLayout(new MigLayout("wrap 8, top, ins n 5 n n", "[200!][100!][100!][100!][100!][100!][300:400:400]", ""));
++
++ if (parent == null) hierarchy = 1;
++
++ title = element.getAttribute("label");
++
++ Border mytitledborder = BorderFactory.createTitledBorder(title);
++ //Border loweredetched = BorderFactory.createEtchedBorder(EtchedBorder.LOWERED);
++ this.setBorder(mytitledborder);
++
++ this.invalidate();
++ }
++
++ @Override
++ public String getValue() {
++ return null;
++ }
++
++ @Override
++ public void close() {
++
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/FramePanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/PathPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/PathPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/PathPanel.java (revision 17808)
+@@ -0,0 +1,118 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
++import java.util.HashMap;
++
++import javax.swing.JButton;
++import javax.swing.JFileChooser;
++import javax.swing.JPanel;
++
++import org.w3c.dom.Element;
++
++public class PathPanel extends TextfieldPanel implements ActionListener {
++
++ /**
++ *
++ */
++ private static final long serialVersionUID = 1486664773406118295L;
++
++ JButton select_button;
++
++ /**
++ * Creates a panel with a text field and a file / path chooser button.
++ *
++ * @param element
++ * @throws GUIBuildException
++ */
++ public PathPanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ super(element, parent);
++
++ if (element.getAttribute("type").equals("path")) {
++ select_button = new JButton("Select Path");
++ } else if (element.getAttribute("type").equals("file")) {
++ select_button = new JButton("Select File");
++ } else {
++ throw new GUIBuildException("PathPanel is not applicable for parameter types other than 'file' and 'path'.");
++ }
++
++ this.remove(textfield);
++ this.add(textfield, "cell 1 0, growx, span2");
++
++ select_button.addActionListener(this);
++ select_button.setActionCommand("open chooser");
++ select_button.setVisible(true);
++ this.add(select_button, "cell 3 0, growx, wrap");
++
++ }
++
++ @Override
++ public void actionPerformed(ActionEvent event) {
++ if (event.getActionCommand().equals("open chooser") && event.getSource() == this.select_button) {
++ try {
++ chooseFile();
++ } catch (final GUIBuildException e) {
++ // TODO Auto-generated catch block
++ e.printStackTrace();
++ }
++ }
++ }
++
++ @Override
++ public void set(HashMap hm, String key, String value) {
++ String val = (String)hm.get(hashKey);
++ if (val != null) textfield.setText(val);
++ this.checkBgColor();
++ }
++
++ /**
++ * Opens the file chooser dialog and writes the path / filepath into the
++ * texfield.
++ *
++ * @throws GUIBuildException
++ */
++ public void chooseFile() throws GUIBuildException {
++ final JFileChooser filechooser = new JFileChooser(System.getProperty("user.dir"));
++
++ if (element.getAttribute("type").equals("path")) {
++ filechooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
++ } else if (element.getAttribute("type").equals("file")) {
++ filechooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
++ } else {
++ throw new GUIBuildException("PathPanel is not applicable for parameter types other than 'file' and 'path'.");
++ }
++
++ final int returnVal = filechooser.showOpenDialog(new JPanel());
++
++ if (returnVal == JFileChooser.APPROVE_OPTION) {
++ if (element.getAttribute("type").equals("path")) {
++ textfield.setText(filechooser.getSelectedFile().getAbsolutePath());
++ } else {
++ textfield.setText(filechooser.getSelectedFile().getName());
++ }
++
++ checkBgColor();
++ }
++ }
++
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/PathPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/IntegerPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/IntegerPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/IntegerPanel.java (revision 17808)
+@@ -0,0 +1,246 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.event.*;
++import java.util.HashMap;
++
++import javax.swing.JButton;
++import javax.swing.JOptionPane;
++import javax.swing.SwingConstants;
++
++import org.w3c.dom.Element;
++
++/**
++ * A panel that maintains a number in an editable textfield,
++ * optionally with a maximum and minimum value.
++ * @author korhammer
++ *
++ */
++/**
++ * @author korhammer
++ *
++ */
++public class IntegerPanel extends TextfieldPanel implements ActionListener, FocusListener {
++ /**
++ *
++ */
++ private static final long serialVersionUID = -8959578535487185306L;
++
++ private int defaultvalue;
++ private int maximumvalue;
++ private int minimumvalue;
++
++ private boolean printPlus;
++
++ private final JButton down;
++ private final JButton up;
++
++ /**
++ * Constructor for a NumberPanel.
++ *
++ * @param element
++ * @throws GUIBuildException
++ */
++ public IntegerPanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ super(element, parent);
++
++ setDefaultvalue(0);
++ minimumvalue = Integer.MIN_VALUE;
++ maximumvalue = Integer.MAX_VALUE;
++ printPlus = false;
++
++ if (element.getAttribute("type").equals("integer+")) {
++ setPrintplus(true);
++ } else {
++ setPrintplus(false);
++ }
++
++ if (element.hasAttribute("default")) {
++ setDefaultvalue(element.getAttribute("default"));
++ }
++ if (element.hasAttribute("maximum")) {
++ setMaximumvalue(element.getAttribute("maximum"));
++ }
++ if (element.hasAttribute("minimum")) {
++ setMinimumvalue(element.getAttribute("minimum"));
++ }
++
++ textfield.setColumns(4);
++ textfield.invalidate();
++ textfield.setHorizontalAlignment(SwingConstants.RIGHT);
++
++ up = new JButton("+");
++ up.addActionListener(this);
++ down = new JButton("-");
++ down.addActionListener(this);
++ this.add(up, "split 2, growx, ay top");
++ this.add(down, "growx, ay top");
++ textfield.addActionListener(this);
++ textfield.addFocusListener(this);
++
++ }
++
++ /**
++ * Parses a String to an integer. Different from the standard methods as it
++ * handles the + sign e.g. in time zones.
++ *
++ * @param text
++ * @return the parsed number
++ * @throws NumberFormatException
++ */
++ private static int parse(String text) throws NumberFormatException {
++
++ final char first = text.charAt(0);
++
++ if (first == '+')
++ return Integer.parseInt(text.substring(1));
++ if (first == '-')
++ return Integer.parseInt(text);
++ return Integer.parseInt(text);
++ }
++
++ /*
++ * (non-Javadoc)
++ *
++ * @see
++ * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
++ */
++ @Override
++ public void actionPerformed(ActionEvent e) {
++ if (e.getSource() == up) {
++ manipulateNumber(1);
++ } else if (e.getSource() == down) {
++ manipulateNumber(-1);
++ } else if (e.getSource() == textfield) {
++ parseTextfield();
++ }
++ }
++
++ @Override
++ public void set(HashMap hm, String key, String value) {
++ String val = (String)hm.get(hashKey);
++ if (val != null) {
++ try {
++ Integer.parseInt(val);
++ textfield.setText(val);
++ } catch (Exception e) {} //Do nothing if conversion fails
++ }
++ }
++
++ @Override
++ public void focusGained(FocusEvent arg0) {
++
++ }
++
++ @Override
++ public void focusLost(FocusEvent arg0) {
++ parseTextfield();
++ }
++
++ /**
++ * Manipulates the number in the text field by parsing it, adding the
++ * increment and writing it back into the textfield.
++ *
++ * @param increment
++ */
++ public void manipulateNumber(int increment) {
++ int number;
++
++ try {
++ number = parseTextfield();
++ } catch (final NumberFormatException nfe) {
++ return;
++ }
++
++ if (number + increment <= maximumvalue
++ && number + increment >= minimumvalue) {
++ number += increment;
++ } else if (number + increment < minimumvalue) {
++ number = minimumvalue;
++ } else if (number + increment > maximumvalue) {
++ number = maximumvalue;
++ }
++
++ printToTextfield(number);
++ }
++
++ /**
++ * Calls the parse method on the textfield.
++ *
++ * @return
++ * @throws NumberFormatException
++ */
++ public int parseTextfield() throws NumberFormatException {
++ try {
++ return parse(textfield.getText());
++ } catch (final NumberFormatException nfe) {
++ JOptionPane.showMessageDialog(null, "The textfield " + getKey()
++ + " does not contain a number.");
++ throw nfe;
++ }
++ }
++
++ /**
++ * Prints a number to the text field optionally with a plus sign.
++ *
++ * @param number
++ */
++ public void printToTextfield(int number) {
++ if (this.printPlus && number > 0) {
++ textfield.setText("+" + number);
++ } else {
++ textfield.setText("" + number);
++ }
++ checkBgColor();
++ }
++
++ public void setDefaultvalue(int defaultvalue) {
++ this.defaultvalue = defaultvalue;
++ this.printToTextfield(defaultvalue);
++ }
++
++ public void setDefaultvalue(String defaultvalue) {
++ this.defaultvalue = parse(defaultvalue);
++ this.printToTextfield(this.defaultvalue);
++ }
++
++ public void setMaximumvalue(int maximumvalue) {
++ this.maximumvalue = maximumvalue;
++ }
++
++ public void setMaximumvalue(String maximumvalue) {
++ this.maximumvalue = parse(maximumvalue);
++ }
++
++ public void setMinimumvalue(int minimumvalue) {
++ this.minimumvalue = minimumvalue;
++ }
++
++ public void setMinimumvalue(String minimumvalue) {
++ this.minimumvalue = parse(minimumvalue);
++ }
++
++ public void setPrintplus(boolean printPlus) {
++ this.printPlus = printPlus;
++ printToTextfield(parse(textfield.getText()));
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/IntegerPanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/AlternativePanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/AlternativePanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/AlternativePanel.java (revision 17808)
+@@ -0,0 +1,177 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.event.ItemEvent;
++
++import javax.swing.JComboBox;
++import javax.swing.JOptionPane;
++import java.util.HashMap;
++import javax.swing.*;
++import java.awt.*;
++
++import main.GUI;
++
++import org.w3c.dom.Element;
++
++/**
++ * The AlternativePanel contains a dropdown list with alternatives to choose from.
++ *
++ * @author Thomas Egger
++ *
++ */
++public class AlternativePanel extends OptionPanel {
++
++ private static final long serialVersionUID = 4468480774697888798L;
++ private final JComboBox box;
++
++ private String setKey = null, setValue = null;
++ private boolean doSet = false;
++ private HashMap setMap;
++
++ /**
++ * Constructor for the AlternativePanel
++ *
++ * @param element the element for which the panel is created.
++ * @throws GUIBuildException
++ */
++ public AlternativePanel(Element element, ControlledPanel parent) throws GUIBuildException {
++ super(element, parent);
++
++ box = new JComboBox(labels);
++ box.insertItemAt("", 0); //Add an empty label
++ box.setVisible(true);
++ box.setSelectedIndex(0);
++ box.addItemListener(this);
++
++ //Issue 263: On OSX the box.setBackground method does not function without this tweak:
++ if (System.getProperty("os.name").equals("Mac OS X"))
++ box.setRenderer(new ColorCellRenderer(box.getPreferredSize().width));
++
++ if (!optional) box.setBackground(GUI.WARNING_BACKGROUND_COLOR);
++
++ if (defaultTrues.size() > 1) {
++ throw new GUIBuildException("Element " + getHashKey() + " has multiple default values");
++ } else if (defaultTrues.size() == 1) {
++ box.setSelectedItem(defaultTrues.getFirst());
++ }
++
++ this.add(box, "cell 1 0, growx, ay top, wrap");
++ }
++
++ @Override
++ public void close() {
++ this.box.setSelectedIndex(0);
++ }
++
++ @Override
++ public String getValue() {
++
++ if (box.getSelectedIndex() != 0) {
++ //String selectedString = (String) box.getSelectedItem();
++ int index = box.getSelectedIndex() - 1;
++ if (index < 0)
++ return "";
++
++ return values[index];
++ }
++
++ if (!isOptional()) {
++ JOptionPane.showMessageDialog(null, "No option was selected for "
++ + getKey() + " (section '" + getSection().toUpperCase() + "')"
++ + ".\nA value is required. Your .ini-file is probably incorrect.",
++ "Problem when building .ini file",
++ JOptionPane.WARNING_MESSAGE);
++ }
++
++ return null;
++ }
++
++ @Override
++ public synchronized void set(HashMap hm, String key, String value) {
++ doSet = true;
++ setKey = key;
++ setValue = value;
++ setMap = hm;
++
++ if (!hm.containsKey(hashKey)) return;
++ String val = ((String)hm.get(hashKey)).toUpperCase();
++
++ //System.out.println("\tAP: Setting AlternativePanel: " + hashKey + " = " + val);
++
++ for (int ii=0; ii 0) && (helptexts[box.getSelectedIndex()-1] != null)) {
++ help.setText("" + helptexts[box.getSelectedIndex()-1] + "");
++ } else {
++ if (helptext != null)
++ help.setText("" + helptext + "");
++ }
++
++ //handle selected Item
++ final String selectedOption = (String) arg0.getItem();
++ if (selectedOption == "") {
++ if (!optional) {
++ box.setBackground(GUI.WARNING_BACKGROUND_COLOR);
++ }
++ } else {
++ if (!optional) {
++ box.setBackground(GUI.NORMAL_BACKGROUND_COLOR);
++ }
++ //System.out.println("\tDOSET of AlternativePanel: " + doSet);
++ super.handleItemEvent(arg0, selectedOption, doSet, setMap, setKey, setValue);
++ doSet = false;
++ setKey = null;
++ setMap = null;
++ setValue = null;
++ }
++ }
++}
++
++class ColorCellRenderer implements ListCellRenderer {
++ protected DefaultListCellRenderer defaultRenderer = new DefaultListCellRenderer();
++ private Dimension preferredSize = new Dimension(0, 18);
++
++ public ColorCellRenderer(int width) {
++ width -= 50;
++
++ if (width < 100) width = 100; //Default size on OSX
++
++ preferredSize = new Dimension(width, 18);
++ }
++
++ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
++ JLabel renderer = (JLabel) defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
++ renderer.setPreferredSize(preferredSize);
++ return renderer;
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/gui_elements/AlternativePanel.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/gui_elements/DecimalPanel.java
+===================================================================
+--- ../trunk-jpl/src/java/src/gui_elements/DecimalPanel.java (revision 0)
++++ ../trunk-jpl/src/java/src/gui_elements/DecimalPanel.java (revision 17808)
+@@ -0,0 +1,133 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package gui_elements;
++
++import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
++import java.awt.event.FocusEvent;
++import java.awt.event.FocusListener;
++import java.util.HashMap;
++
++import java.text.DecimalFormat;
++import java.text.ParseException;
++import java.text.DecimalFormatSymbols;
++import javax.swing.JFormattedTextField;
++
++import org.w3c.dom.Element;
++
++public class DecimalPanel extends TextfieldPanel implements ActionListener, FocusListener{
++
++ /**
++ *
++ */
++ private static final long serialVersionUID = 1555742510677354674L;
++ double defaultvalue;
++ double maximumvalue;
++ double minimumvalue;
++
++ JFormattedTextField textfield;
++
++ public DecimalPanel(Element element, ControlledPanel parent) {
++ super(element, parent);
++ this.remove(super.textfield);
++
++ DecimalFormat format = (DecimalFormat)DecimalFormat.getInstance();
++ DecimalFormatSymbols custom = new DecimalFormatSymbols();
++ custom.setDecimalSeparator('.');
++ format.setDecimalFormatSymbols(custom);
++ format.setGroupingUsed(false);
++
++ textfield = new JFormattedTextField(format);
++ textfield.addActionListener(this);
++ textfield.addFocusListener(this);
++ this.add(textfield,"cell 1 0, growx, ay top, gaptop 3");
++ textfield.setVisible(true);
++ this.invalidate();
++ defaultvalue = 0.0;
++ maximumvalue = Double.MAX_VALUE;
++ minimumvalue = Double.MIN_VALUE;
++
++
++ if(element.hasAttribute("minimum")){
++ minimumvalue = Double.parseDouble(element.getAttribute("minimum"));
++ }
++ if(element.hasAttribute("maximum")){
++ maximumvalue = Double.parseDouble(element.getAttribute("maximum"));
++ }
++ if(element.hasAttribute("default")){
++ defaultvalue = Double.parseDouble(element.getAttribute("default"));
++ }
++ setToDefaultValue();
++ }
++
++ private void setToDefaultValue() {
++ textfield.setValue(new Double(defaultvalue));
++ this.invalidate();
++ }
++
++ private void checkValue(){
++ try {
++ textfield.commitEdit();
++ } catch (ParseException e) {
++ // TODO Auto-generated catch block
++ e.printStackTrace();
++ }
++ double currentvalue = ((Number)textfield.getValue()).doubleValue();
++ if(currentvalue > maximumvalue){
++ textfield.setValue(new Double(maximumvalue));
++ }
++ else if(currentvalue.
++*
++*/
++
++package main;
++
++import gui_elements.ControlledPanel;
++
++import java.io.File;
++import java.io.FileWriter;
++import java.io.IOException;
++import java.util.HashMap;
++import java.util.LinkedList;
++import java.util.Set;
++import java.util.TreeMap;
++import java.util.Iterator;
++
++/**
++ * Class that maintains all ControlledPanels so that values can be retrieved
++ * from panels, ini-files can be written. And a panel is not multiply created.
++ *
++ * @author korhammer
++ *
++ */
++public class PanelControl {
++
++ LinkedList order;
++ HashMap> panels;
++ HashMap comments = null;
++ HashMap added_comments = null;
++ HashMap> unusedKeys = null;
++ PanelNode rootNode = null;
++
++ /**
++ * Constructor for the panel control.
++ */
++ public PanelControl() {
++ panels = new HashMap>();
++ order = new LinkedList();
++
++ unusedKeys = new HashMap>();
++ }
++
++ public PanelControl(PanelControl p) {
++ panels = new HashMap>(p.panels);
++ order = new LinkedList(p.order);
++ if (added_comments != null)
++ added_comments = new HashMap(p.added_comments);
++
++ if (comments != null)
++ comments = new HashMap(p.comments);
++ }
++
++ public void setUnusedKeys(String key, String value) {
++ //Parse key
++ int offset = key.indexOf("::");
++ String section = key.substring(0, offset);
++ String sectionkey = key.substring(offset + 2);
++
++ HashMap hm = unusedKeys.get(section);
++ if (hm == null) unusedKeys.put(section, new HashMap());
++
++ unusedKeys.get(section).put(sectionkey, value);
++ }
++
++ public void setComments(HashMap inaddedcomments, HashMap incomments) {
++ this.added_comments = new HashMap(inaddedcomments);
++ this.comments = new HashMap(incomments);
++ }
++
++ /**
++ * @param section
++ * @param key
++ * @return true if a panel with such key is maintained in the specified
++ * section
++ */
++ public boolean contains(String section, String key) {
++ if (!panels.containsKey(section))
++ return false;
++
++ return panels.get(section).containsKey(key);
++ }
++
++ /**
++ *
++ * @param section
++ * @param key
++ * @return the panel with the specified section / key pair
++ */
++ public ControlledPanel get(String section, String key) {
++ return panels.get(section).get(key);
++ }
++
++ /**
++ * Prints the ini-file at the specified path.
++ *
++ * @param path
++ */
++ public void printToFile(String path) {
++ /* create file */
++ final File file = new File(path);
++
++ try {
++ final FileWriter writer = new FileWriter(file);
++
++ writer.write(this.toString());
++ writer.close();
++ } catch (final IOException e) {
++ // TODO Auto-generated catch block
++ e.printStackTrace();
++ }
++ }
++
++ /**
++ * Adds the panel to the specified section.
++ *
++ * @param section
++ * @param panel
++ */
++ public void put(String section, ControlledPanel panel) {
++ final String key = panel.getKey();
++ if (!panels.containsKey(section)) {
++ order.add(section);
++ panels.put(section, new TreeMap());
++ }
++ panels.get(section).put(key, panel);
++ }
++
++ /**
++ * Removes the panel with the specified section and key.
++ *
++ * @param section
++ * @param key
++ * @return the panel
++ */
++ public ControlledPanel remove(String section, String key) {
++ return panels.get(section).remove(key);
++ }
++
++ /**
++ * Prints the maintained panels to a string.
++ *
++ * @return an ini-file-like structure
++ */
++ public void setRootNode(PanelNode inrootNode) {
++ rootNode = inrootNode;
++ }
++
++ public String extractKey(String instring) {
++ int offset = instring.indexOf("::");
++ if (offset == -1) return null;
++
++ return instring.substring(offset+2);
++ }
++
++ @Override
++ public String toString() {
++ String out = "";
++
++ for (final String section : order) {
++ /* create section */
++ final String sectionstring = "[" + section.toUpperCase() + "]\n";
++ String keyvaluestring = "";
++
++ /* print section */
++ LinkedList keys = new LinkedList();
++ PanelNode sectionNode = rootNode.get(section.toUpperCase());
++ if (sectionNode != null) sectionNode.getKeyList(keys);
++
++ //final Set keys = panels.get(section).keySet();
++ for (final String hashKey : keys) {
++ String key = extractKey(hashKey);
++ if (key == null) continue;
++
++ final String value = panels.get(section).get(key).getValue();
++ if (value != null) {
++ if ((comments != null) && comments.containsKey(hashKey.toUpperCase())) {
++ String precomments = comments.get(hashKey.toUpperCase());
++ if (!precomments.equals(""))
++ keyvaluestring += precomments;
++ }
++
++ keyvaluestring += key + "\t=\t" + value;
++
++ if ((added_comments != null) && added_comments.containsKey(hashKey.toUpperCase()))
++ keyvaluestring += "\t" + added_comments.get(hashKey.toUpperCase());
++
++ keyvaluestring += "\n";
++ }
++ }
++
++ //Add unused keys
++ HashMap extra = unusedKeys.get(section.toUpperCase());
++ if (extra != null) {
++ if (!keyvaluestring.equals("")) keyvaluestring += "\n";
++
++ for (String extrakey : extra.keySet()) {
++ String hashKey = section.toUpperCase() + "::" + extrakey.toUpperCase();
++ if ((comments != null) && comments.containsKey(hashKey)) {
++ String precomments = comments.get(hashKey);
++ if (!precomments.equals(""))
++ keyvaluestring += precomments;
++ }
++
++ keyvaluestring += extrakey + "\t=\t" + extra.get(extrakey);
++
++ if ((added_comments != null) && added_comments.containsKey(hashKey))
++ keyvaluestring += "\t" + added_comments.get(hashKey);
++
++ keyvaluestring += "\n";
++ }
++ }
++
++ //check if there aren't any comments in that section
++ String hashKey = section.toUpperCase() + "::";
++ if ((comments != null) && comments.containsKey(hashKey)) {
++ String precomments = comments.get(hashKey);
++ if (!precomments.equals("")) {
++ if (precomments.indexOf("\n") == -1) precomments += "\n";
++ keyvaluestring = precomments + keyvaluestring + "\n";
++ }
++ }
++
++ /* add section only if keys / values are printed */
++ if (!keyvaluestring.equals("")) {
++ out += sectionstring + keyvaluestring + "\n";
++ }
++ }
++
++ return out;
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/main/PanelControl.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/main/XMLHelper.java
+===================================================================
+--- ../trunk-jpl/src/java/src/main/XMLHelper.java (revision 0)
++++ ../trunk-jpl/src/java/src/main/XMLHelper.java (revision 17808)
+@@ -0,0 +1,525 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package main;
++
++import gui_elements.GUIBuildException;
++
++import java.io.IOException;
++import java.util.LinkedList;
++
++import javax.xml.parsers.DocumentBuilder;
++import javax.xml.parsers.DocumentBuilderFactory;
++import javax.xml.parsers.ParserConfigurationException;
++import javax.xml.transform.TransformerConfigurationException;
++import javax.xml.transform.TransformerException;
++import javax.xml.transform.TransformerFactory;
++
++import org.w3c.dom.Document;
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
++import org.xml.sax.SAXException;
++
++//for the XML printing
++import javax.xml.transform.stream.StreamResult;
++import javax.xml.transform.*;
++import javax.xml.transform.dom.*;
++import java.io.StringWriter;
++
++public class XMLHelper {
++
++ /**
++ * Find the parameter values for which the element should be cloned
++ * e.g. for section tags.
++ *
++ * @param element
++ * @param tagName
++ * @param attributeName
++ * @param parentArgument
++ * @return the
++ */
++ public static String[] findApplicableValues(Element element,
++ String tagName, String attributeName, String parentArgument) {
++
++ final String[] argumentsFromElement = getAttributesFromChildren(
++ element, tagName, attributeName);
++
++ /*
++ * If no such arguments are specified for the current element but there
++ * are for the parent element, take that of the parent.
++ */
++ if (argumentsFromElement.length == 0 && parentArgument != null)
++ return new String[] { parentArgument };
++ else if ((argumentsFromElement.length > 0 && parentArgument != null)) {
++ if (getCertainChildElement(element, tagName, attributeName,
++ parentArgument) != null)
++ return new String[] { parentArgument };
++ else
++ /*
++ * The empty intersection is an empty array so that his case can
++ * be handled differently from the null case below.
++ */
++ return new String[0];
++ }
++
++ /*
++ * If no arguments are specified for the parent use all element
++ * arguments.
++ */
++ else if (argumentsFromElement.length > 0 && parentArgument == null)
++ return argumentsFromElement;
++ else if (argumentsFromElement.length == 0 && parentArgument == null)
++ return null;
++ return null;
++ }
++
++ /**
++ * Get all children of an element that have a certain element tag and
++ * extract the values for a certain attribute.
++ *
++ * @param parent
++ * the parent element
++ * @param tag
++ * the element tag
++ * @param attribute
++ * the attribute name
++ *
++ * @return a String array with the attribute values
++ */
++ public static String[] getAttributesFromChildren(Element parent, String tag, String attribute) {
++ final Element[] elements = getElementArray(parent, tag);
++
++ final String[] attributes = new String[elements.length];
++ for (int i = 0; i < elements.length; i++) {
++ attributes[i] = elements[i].getAttribute(attribute);
++ }
++ return attributes;
++ }
++
++ /**
++ * Returns the first child element that has the specified element tag and
++ * the value for the specified attribute.
++ *
++ * @param parent
++ * @param tag
++ * @param attribute
++ * @param value
++ * @return the first child element that meets the criteria
++ */
++ public static Element getCertainChildElement(Element parent, String tag,
++ String attribute, String value) {
++ final Element[] allElements = getElementArray(parent, tag);
++ for (final Element element : allElements) {
++ if (element.hasAttribute(attribute)) {
++ if (element.getAttribute(attribute).equals(value))
++ return element;
++ }
++ }
++ return null;
++ }
++
++ /**
++ * For the specified element gets the text that is contained in the first
++ * child that has a certain element name.
++ *
++ *
++ * @param parent
++ * the parent element
++ * @param tag
++ * the element tag for the child
++ * @return the text content
++ */
++ public static String getChildElementContent(Element parent, String tag) {
++ final Element[] elements = getElementArray(parent, tag);
++ if (elements.length == 0)
++ return null;
++
++ return elements[0].getTextContent();
++ }
++
++
++
++ /**
++ * @param parent
++ * @param tag
++ * @return all child elements of the parent with the specified tag
++ */
++ public static Element[] getElementArray(Element parent, String tag) {
++ if (!parent.hasChildNodes())
++ return new Element[0];
++
++ final NodeList nodeList = parent.getChildNodes();
++ final LinkedList elementlist = new LinkedList();
++ for (int i = 0; i < nodeList.getLength(); i++) {
++
++ final Node element = nodeList.item(i);
++ if (element.getNodeType() == Node.ELEMENT_NODE && ((Element) element).getTagName().equals(tag)) {
++ elementlist.add((Element) element);
++ }
++ }
++ final Element[] elements = new Element[elementlist.size()];
++
++ return elementlist.toArray(elements);
++ }
++
++ public static Element[] getElementArray(Element parent, String[] tags) {
++ if (!parent.hasChildNodes())
++ return new Element[0];
++
++ final NodeList nodeList = parent.getChildNodes();
++ final LinkedList elementlist = new LinkedList();
++ for (int ii = 0; ii < nodeList.getLength(); ii++) {
++
++ final Node element = nodeList.item(ii);
++ if (element.getNodeType() == Node.ELEMENT_NODE) {
++ //Loop through all possible tags
++ for (int jj=0; jj.
++*
++*/
++
++package main;
++
++import gui_elements.ControlledPanel;
++import gui_elements.GUIBuildException;
++
++import java.awt.BorderLayout;
++import java.awt.Color;
++import java.awt.Component;
++import java.awt.Container;
++import java.awt.Desktop;
++import java.awt.*;
++import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
++import java.awt.event.WindowEvent;
++import java.awt.event.WindowListener;
++import java.io.IOException;
++import java.net.URISyntaxException;
++import java.util.HashMap;
++import java.util.LinkedList;
++
++import javax.swing.BoxLayout;
++import javax.swing.ImageIcon;
++import javax.swing.JButton;
++import javax.swing.JEditorPane;
++import javax.swing.JFileChooser;
++import javax.swing.JFrame;
++import javax.swing.JOptionPane;
++import javax.swing.JPanel;
++import javax.swing.JScrollPane;
++import javax.swing.JTabbedPane;
++import javax.swing.JToolBar;
++import javax.swing.event.HyperlinkEvent;
++import javax.swing.event.HyperlinkListener;
++import javax.swing.filechooser.FileNameExtensionFilter;
++import java.io.*;
++import javax.swing.*;
++import java.awt.*;
++import java.awt.event.*;
++
++import net.miginfocom.swing.MigLayout;
++
++/**
++ * The GUI created by the author.
++ *
++ * @author korhammer et egger
++ *
++ */
++public class GUI extends JFrame implements WindowListener, ActionListener, HyperlinkListener {
++
++ /**
++ *
++ */
++ private static final long serialVersionUID = -2428732881181670225L;
++ public static PanelNode rootNode = null;
++
++ private static String title = GUI.class.getPackage().getImplementationTitle() + " " + GUI.class.getPackage().getImplementationVersion();
++
++ public static final Color LABEL_COLOR = Color.decode("#000080");
++ public static Color NORMAL_BACKGROUND_COLOR = Color.decode("#EEEEEE");
++ public static Color WARNING_BACKGROUND_COLOR = Color.decode("#FF0011");
++
++ public static ImageIcon openicon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/xml_open.png"));
++ public static ImageIcon openiniicon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/fileopen.png"));
++ public static ImageIcon exporticon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/filesave.png"));
++ public static ImageIcon previewicon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/kghostview.png"));
++ public static ImageIcon reseticon = new ImageIcon(GUI.class.getClassLoader().getResource("resources/icons/reset.png"));
++
++ private final JButton createbutton;
++ private final JButton previewButton;
++ private final JButton openbutton;
++ private final JButton openinibutton;
++ private final JButton resetbutton;
++
++ private final JTabbedPane tabpane;
++ private final JToolBar toolbar;
++ private HashMap tabpanels;
++
++ private String configFilePath, iniFilePath;
++
++ /*
++ * Creates a window with the static components of the GUI, i.e. components
++ * that do not depend on the configuration file.
++ */
++ public GUI() throws GUIBuildException {
++ super(title);
++
++ configFilePath = System.getProperty("user.dir");
++ iniFilePath = System.getProperty("user.dir");
++
++ tabpanels = new HashMap();
++
++ Dimension screenDim = new Dimension(1280, 800);
++ Dimension maxDim = null;
++
++ if (this.getMaximizedBounds() == null) {
++ Toolkit tk = Toolkit.getDefaultToolkit();
++ maxDim = tk.getScreenSize();
++ this.setMaximizedBounds(new Rectangle(0, 0, (int)maxDim.getWidth(), (int)maxDim.getHeight()));
++ } else {
++ maxDim = this.getMaximizedBounds().getSize();
++ }
++
++ if (maxDim.height < screenDim.height) {
++ screenDim.height = maxDim.height;
++ if (screenDim.height > 100)
++ screenDim.height -= 25;
++ }
++
++ if (maxDim.width < screenDim.width) {
++ screenDim.width = maxDim.width;
++ if (screenDim.width > 100)
++ screenDim.width -= 25;
++ }
++
++ this.setSize(screenDim);
++ //this.setExtendedState(MAXIMIZED_BOTH);
++ this.setVisible(true);
++ this.setLayout(new BorderLayout());
++
++ this.toolbar = new JToolBar();
++ toolbar.setLayout(new BoxLayout(toolbar, 1));
++ toolbar.setFloatable(false);
++ this.setVisible(true);
++ this.add(toolbar, BorderLayout.WEST);
++
++ this.tabpane = new JTabbedPane();
++ this.add(tabpane);
++ tabpane.setVisible(true);
++
++ this.openbutton = new JButton(openicon);
++ this.openbutton.setActionCommand("open config");
++ this.openbutton.setToolTipText("Open XML-configuration");
++ openbutton.addActionListener(this);
++ toolbar.add(this.openbutton);
++
++ this.openinibutton = new JButton(openiniicon);
++ this.openinibutton.setActionCommand("open ini");
++ this.openinibutton.setToolTipText("Open existing INI file");
++ openinibutton.addActionListener(this);
++ toolbar.add(this.openinibutton);
++
++ this.resetbutton = new JButton(reseticon);
++ this.resetbutton.setActionCommand("reset");
++ this.resetbutton.setToolTipText("Reset Interface");
++ resetbutton.addActionListener(this);
++ toolbar.add(this.resetbutton);
++
++ this.createbutton = new JButton(exporticon);
++ this.createbutton.setActionCommand("write config");
++ this.createbutton.setToolTipText("Write to INI-file");
++ createbutton.addActionListener(this);
++ toolbar.add(this.createbutton);
++
++ this.previewButton = new JButton(previewicon);
++ this.previewButton.setActionCommand("preview");
++ this.previewButton.setToolTipText("Preview INI-file");
++ previewButton.addActionListener(this);
++ toolbar.add(previewButton);
++
++ this.addWindowListener(this);
++
++ rootNode = new PanelNode("");
++ }
++
++ /**
++ * Writes the application name into the GUI window title bar.
++ *
++ * @param application
++ */
++ public void setApplicationForTitle(String application){
++ if(application.equals("")){
++ this.setTitle(title);
++ }
++ else{
++ this.setTitle(title + " for "+application);
++ }
++ }
++
++ public void hideOpenButton(){
++ openbutton.setVisible(false);
++ }
++
++ /**
++ * Closes all tabs.
++ */
++ public void closeAllTabs(){
++ tabpane.removeAll();
++ }
++
++ /**
++ * Adds a component to the tab specified and creates the tab if it does not
++ * already exist.
++ *
++ * @param comp
++ * @param tabName
++ * @throws GUIBuildException
++ */
++ public void addToTab(ControlledPanel comp, String tabName, ControlledPanel parentPanel) throws GUIBuildException {
++ tabName = Character.toUpperCase(tabName.charAt(0)) + tabName.substring(1).toLowerCase();
++
++ String section = ((ControlledPanel)comp).getSection().toUpperCase();
++ String key = section + "::" + ((ControlledPanel)comp).getKey();//((ControlledPanel)comp).getHashKey();
++ //System.out.println("\tPanel: " + ((ControlledPanel)comp).getHashKey() + " Section: " + ((ControlledPanel)comp).getSection());
++
++ PanelNode sectionNode = rootNode.getChild(section);
++ if (sectionNode == null) {
++ PanelNode tmp = new PanelNode(section);
++ //System.out.println("\t--Adding section '" + section + "' to tree");
++ sectionNode = rootNode.add(tmp);
++ }
++
++ if (parentPanel != null) {
++ //System.out.println("\tLooking for node: " + parentPanel.getHashKey());
++ sectionNode = sectionNode.get(parentPanel.getSection().toUpperCase() + "::" + parentPanel.getKey());
++ }
++
++ if (sectionNode != null) {
++ PanelNode keyNode = sectionNode.get(key);
++ if (keyNode == null) {
++ PanelNode tmp = new PanelNode(key);
++ keyNode = sectionNode.add(tmp);
++ //System.out.println("\t--Adding key '" + key + "' to tree as leaf to " + sectionNode.getData());
++ }
++ }
++
++ JPanel tab;
++ if (tabpane.indexOfTab(tabName) == -1) {
++
++ tab = new JPanel();
++ tab.setBackground(Color.white);
++ tab.setVisible(true);
++ tab.setLayout(new MigLayout("wrap 1"));
++
++ JScrollPane scrollpane = new JScrollPane(tab);
++ tabpane.add(tabName, scrollpane);
++ tabpanels.put(tabName, tab);
++
++ } else {
++ tab = tabpanels.get(tabName);
++ }
++
++ if (parentPanel != null && containsPanel(tab, parentPanel)) {
++ parentPanel.add(comp, "span");
++ } else {
++ tab.add(comp);
++ }
++
++ //JViewport jv = ((JScrollPane)tabpane.getComponentAt(tabpane.indexOfTab(tabName))).getViewport();
++ //jv.setViewPosition(new Point(0,0));
++
++ this.validate();
++ }
++
++ public void removeFromTab(ControlledPanel parameterPanel, String section, ControlledPanel parentPanel) {
++ final String tabTitle = section.substring(0, 1).toUpperCase() + section.substring(1).toLowerCase();
++ final int index = tabpane.indexOfTab(tabTitle);
++
++ final Container container = (Container) tabpane.getComponentAt(index);
++
++ //System.out.println("Removing Panel: " + parameterPanel.getHashKey());
++ PanelNode tmp = rootNode.get(parameterPanel.getSection().toUpperCase() + "::" + parameterPanel.getKey());
++ tmp.getParent().remove(tmp);
++
++ if (parentPanel != null && containsPanel(container, parentPanel)) {
++ parentPanel.remove(parameterPanel);
++ } else {
++ container.remove(parameterPanel);
++ }
++
++ GUIBuilder.panelControl.remove(section, parameterPanel.getKey());
++
++ container.repaint();
++ this.validate();
++ }
++
++ public boolean containsPanel(Container container, JPanel panel) {
++
++ for (final Component component : container.getComponents()) {
++ if (component == panel)
++ return true;
++ if (containsPanel((Container) component, panel))
++ return true;
++ }
++ return false;
++ }
++
++ @Override
++ public void actionPerformed(ActionEvent e) {
++ if (e.getActionCommand().equals("write config") && GUIBuilder.application!=null ) {
++ GUIBuilder.panelControl.setRootNode(rootNode);
++
++ try {
++ GUIBuilder.printIOFile();
++ } catch (final IOException e1) {
++ // TODO Auto-generated catch block
++ e1.printStackTrace();
++ } catch (final GUIBuildException e2) {
++ // TODO Auto-generated catch block
++ e2.printStackTrace();
++ }
++ } else if (e.getActionCommand().equals("preview") && GUIBuilder.application!=null) {
++ GUIBuilder.panelControl.setRootNode(rootNode);
++ previewINIFile();
++ } else if (e.getActionCommand().equals("reset") && GUIBuilder.application!=null) {
++ resetGUI();
++ } else if( (e.getActionCommand().equals("open config"))) {
++ openFile();
++ } else if( (e.getActionCommand().equals("open ini"))) {
++ openINIFile();
++ }
++ }
++
++ public void resetGUI() {
++ try {
++ int returnval = GUIBuilder.closeFile();
++ if (returnval == JOptionPane.CANCEL_OPTION) return;
++ GUIBuilder.buildGUI(GUIBuilder.currentConfigFile);
++ } catch (GUIBuildException e) {
++ e.printStackTrace();
++ }
++ }
++
++ public void previewINIFile(){
++ JFrame frame = new JFrame();
++ frame.setSize(600,800);
++ frame.setVisible(true);
++ //frame.setLayout(new BorderLayout());
++
++ JEditorPane pane = new JEditorPane();
++
++ pane.setText(GUIBuilder.panelControl.toString());
++ pane.setVisible(true);
++ pane.setEditable(false);
++
++ JScrollPane scrollPane = new JScrollPane(pane);
++ scrollPane.setVisible(true);
++ frame.add(scrollPane);
++
++ frame.validate();
++ frame.repaint();
++ }
++
++ public void openINIFile(){
++ final FileNameExtensionFilter inifilter = new FileNameExtensionFilter(".ini files", "ini");
++ final JFileChooser filechooser = new JFileChooser(iniFilePath);
++ filechooser.setFileFilter(inifilter);
++ final int returnval = filechooser.showOpenDialog(new JPanel());
++
++ HashMap hm = new HashMap();
++ HashMap comments = new HashMap();
++ HashMap added_comments = new HashMap();
++
++ if (returnval == JFileChooser.APPROVE_OPTION) {
++ final String path = filechooser.getSelectedFile().toString();
++ if (filechooser.getSelectedFile().isDirectory()) return;
++
++ iniFilePath = filechooser.getSelectedFile().getParent();
++
++ System.out.println("Opening INI file: " + path);
++
++ try {
++ BufferedReader br = new BufferedReader(new FileReader(path));
++ String line;
++
++ String section = "GENERAL::";
++ String clines = "";
++
++ while((line = br.readLine()) != null) {
++ int offset = line.indexOf(";");
++ int offset2 = line.indexOf("#");
++
++ if ((offset2 != -1) && (offset != -1)) {
++ if (offset2 < offset) offset = offset2;
++ } else if ((offset2 != -1) && (offset == -1)) {
++ offset = offset2;
++ }
++
++ String comment = null;
++ //System.out.println("CLINES" + clines);
++ if (offset != -1) {
++ //System.out.println("COMMENT: " + line.substring(offset));
++ comment = line.substring(offset);
++ } else {
++ //System.out.println("COMMENTLESS");
++ }
++
++ if (-1 != offset) line = line.substring(0, offset);
++
++ offset = line.indexOf("#");
++ if (-1 != offset) line = line.substring(0, offset);
++
++ line = line.trim(); //take away ws
++
++ if (line.length()>1) {
++
++ if (line.charAt(0) == '[') {
++ offset = line.indexOf("]");
++ if ((offset == -1) || (offset <= 1)) continue;
++
++ if (!clines.equals("")) {
++ int lbr = clines.indexOf("\n");
++ clines = clines.substring(0, lbr);
++ //System.out.println("Adding the precomment: " + clines);
++ comments.put(section, clines);
++ clines = "";
++ }
++
++ section = line.substring(1, offset).toUpperCase() + "::";
++ //System.out.println("New Section: " + section);
++
++ } else {
++ String[] tokens = line.split("=");
++ if (tokens.length == 2) {
++ String key = tokens[0].trim();
++ String value = tokens[1].trim();
++ if (key.length() > 0) {
++ hm.put(section + key.toUpperCase(), value);
++ if (comment != null) added_comments.put(section + key.toUpperCase(), comment);
++ if (!clines.equals("")) {
++ //System.out.println("Adding the precomment: " + clines);
++ comments.put(section + key.toUpperCase(), clines);
++ clines = "";
++ }
++ }
++ }
++ }
++
++ //System.out.println(line);
++ } else {
++ //it was a comment line only, associate it with the next key
++ if (comment != null) clines += comment;
++ clines += "\n";
++ }
++ }
++ br.close();
++
++ GUIBuilder.setValues(hm, added_comments, comments);
++ } catch (Exception e) {
++ // TODO Auto-generated catch block
++ e.printStackTrace();
++ }
++ }
++ }
++
++ public void openFile(){
++ /* If a configuration is already open, ask for close. */
++ final FileNameExtensionFilter xmlfilter = new FileNameExtensionFilter(".xml files", "xml");
++ final JFileChooser filechooser = new JFileChooser(configFilePath);
++ filechooser.setFileFilter(xmlfilter);
++ final int returnval = filechooser.showOpenDialog(new JPanel());
++ if (returnval == JFileChooser.APPROVE_OPTION) {
++ if(GUIBuilder.application != null){
++ final int returnval2 = GUIBuilder.closeFile();
++ if (returnval2 == JOptionPane.CANCEL_OPTION) return;
++ }
++
++ final String path = filechooser.getSelectedFile().toString();
++ if (filechooser.getSelectedFile().isDirectory()) return;
++
++ configFilePath = filechooser.getSelectedFile().getParent();
++
++ try {
++ GUIBuilder.buildGUI(path);
++ } catch (GUIBuildException e) {
++ // TODO Auto-generated catch block
++ e.printStackTrace();
++ }
++ }
++ }
++
++ @Override
++ public void windowActivated(WindowEvent e) {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void windowClosed(WindowEvent e) {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void windowClosing(WindowEvent e) {
++ System.exit(NORMAL);
++
++ }
++
++ @Override
++ public void windowDeactivated(WindowEvent e) {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void windowDeiconified(WindowEvent e) {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void windowIconified(WindowEvent e) {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void windowOpened(WindowEvent e) {
++ // TODO Auto-generated method stub
++
++ }
++
++ @Override
++ public void hyperlinkUpdate(HyperlinkEvent e) {
++
++ if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
++ try {
++ Desktop.getDesktop().browse(e.getURL().toURI());
++ } catch (IOException e1) {
++ // TODO Auto-generated catch block
++ e1.printStackTrace();
++ } catch (URISyntaxException e1) {
++ // TODO Auto-generated catch block
++ e1.printStackTrace();
++ }
++ }
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/main/GUI.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/main/PanelNode.java
+===================================================================
+--- ../trunk-jpl/src/java/src/main/PanelNode.java (revision 0)
++++ ../trunk-jpl/src/java/src/main/PanelNode.java (revision 17808)
+@@ -0,0 +1,69 @@
++package main;
++
++import java.util.List;
++import java.util.LinkedList;
++
++public class PanelNode {
++ private String data;
++ private PanelNode parent;
++ private LinkedList children = new LinkedList();
++
++ public PanelNode(String indata) {
++ data = indata;
++ parent = null;
++ }
++
++ public PanelNode(PanelNode p) {
++ data = p.data;
++ parent = p.parent;
++ children = new LinkedList(p.children);
++ }
++
++ public String getData() {
++ return data;
++ }
++
++ public PanelNode getChild(String data) {
++ for (PanelNode child : children) {
++ if (child.data.equals(data))
++ return child;
++ }
++
++ return null;
++ }
++
++ public PanelNode add(PanelNode c) {
++ c.parent = this;
++ children.add(c);
++
++ return children.getLast();
++ }
++
++ public PanelNode get(String searchstring) {
++ if (data.equals(searchstring)) return this;
++
++ for (PanelNode child : children) {
++ PanelNode tmp = child.get(searchstring);
++ if (tmp != null) return tmp;
++ }
++
++ return null; //Nothing found in subtree
++ }
++
++ public boolean remove(PanelNode tmp) {
++ return children.remove(tmp);
++ }
++
++ public PanelNode getParent() {
++ return parent;
++ }
++
++ public void getKeyList(LinkedList keyList) {
++ if ((data.indexOf('#') == -1) && (data.indexOf('%') == -1))
++ keyList.add(data);
++
++ for (PanelNode child : children) {
++ child.getKeyList(keyList);
++ }
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/main/PanelNode.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/main/GUIBuilder.java
+===================================================================
+--- ../trunk-jpl/src/java/src/main/GUIBuilder.java (revision 0)
++++ ../trunk-jpl/src/java/src/main/GUIBuilder.java (revision 17808)
+@@ -0,0 +1,391 @@
++/***********************************************************************************/
++/* Copyright 2012 WSL Institute for Snow and Avalanche Research SLF-DAVOS */
++/***********************************************************************************/
++/* This file is part of INIshell.
++*
++* INIshell is free software: you can redistribute it and/or modify
++* it under the terms of the GNU General Public License as published by
++* the Free Software Foundation, either version 3 of the License, or
++* (at your option) any later version.
++*
++* INIshell is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with INIshell. If not, see .
++*
++*/
++
++package main;
++
++import gui_elements.ControlledPanel;
++import gui_elements.GUIBuildException;
++
++import java.io.IOException;
++
++import javax.swing.ProgressMonitor;
++import javax.swing.JFileChooser;
++import javax.swing.JOptionPane;
++import javax.swing.JPanel;
++import javax.swing.filechooser.FileNameExtensionFilter;
++
++import java.util.*;
++
++import org.w3c.dom.Document;
++import org.w3c.dom.Element;
++
++/**
++ * The main class to build the .ini file creator. Upon construction it reads an
++ * XML file and creates the corresponding GUI. Maintains an ElementControl
++ * object.
++ *
++ * @author korhammer et egger
++ *
++ */
++public class GUIBuilder {
++ public static ProgressMonitor monitor;
++
++ public static final String xsd = GUIBuilder.class.getClassLoader().getResource("resources/config_schema-0.1.1.xsd").toString();
++ public static String res_filepath = GUIBuilder.class.getClassLoader().getResource("resources/default_config.xml").toString(); //the default config to start with
++ public static Document doc;
++
++ public static GUI gui;
++ public static PanelControl panelControl;
++
++ public static String application;
++ public static String currentConfigFile;
++
++ public static String saveFilePath = System.getProperty("user.dir");
++
++
++ private static String getFileExtension(final String file_and_path) {
++ final String file_sep = System.getProperty("file.separator");
++
++ // get filename without path
++ final int fileSepIndex = file_and_path.lastIndexOf(file_sep);
++ if (fileSepIndex == -1) {
++ return "";
++ }
++ final String filename = file_and_path.substring(fileSepIndex+1); //remove path
++
++ // get the extension from the filename
++ final int extIndex = filename.lastIndexOf(".");
++ if (extIndex == -1)
++ return "";
++
++ return filename.substring(extIndex+1);
++ }
++
++ /**
++ * The main method. Opens the GUI Builder with a menu bar on the side.
++ * If an XML filepath is handed over as an argument,
++ * the XML file is opened.
++ *
++ * @param args
++ * @throws GUIBuildException
++ */
++ public static void main(String args[]) throws GUIBuildException {
++
++ new GUIBuilder();
++
++ if ((args.length != 0) && (args[0].length() > 0))
++ res_filepath = args[0]; //User may provice xml file as first argument
++
++ buildGUI(res_filepath);
++ //gui.hideOpenButton();
++ }
++
++ /**
++ * Builds a GUI from the XML-file specified with validation through
++ * the specified schema.
++ *
++ * @param filepath
++ * @param schemapath
++ * @throws GUIBuildException
++ */
++ public GUIBuilder() throws GUIBuildException {
++ if (System.getProperty("mrj.version") != null) { //detect if running on mac
++ System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Inishell");
++ System.setProperty("apple.awt.brushMetalLook", "true");
++ }
++ gui = new GUI();
++ }
++
++ public static void setComments(HashMap added_comments, HashMap comments) {
++ panelControl.setComments(added_comments, comments);
++ }
++
++ /**
++ * Builds the gui for a filepath that can either be handed over as an argument
++ * on application start or chosen by using the open button.
++ *
++ * @param filepath
++ * @throws GUIBuildException
++ */
++ public static void buildGUI(String filepath) throws GUIBuildException{
++ currentConfigFile = filepath;
++
++ doc = XMLHelper.readXML(filepath, xsd);
++ doc = XMLHelper.resolveReferences(doc);
++
++ application = doc.getDocumentElement().getAttribute("application");
++
++ gui.setApplicationForTitle(application);
++
++ panelControl = new PanelControl();
++
++ final Element root = doc.getDocumentElement();
++ recursiveBuild(root, null, false);
++ }
++
++
++ public static void setValues(final HashMap hm, final HashMap added_comments, final HashMap comments) {
++ if (hm == null) return;
++
++ monitor = new ProgressMonitor(gui, "Loading INI file", "0 out of " + panelControl.order.size() + " sections loaded", 0, panelControl.order.size());
++ monitor.setMillisToPopup(0);
++
++ Thread myrunner = new Thread() {
++ public void run() {
++ int progress_counter = 0; //Effectively counts the sections already parsed into the GUI
++ try {
++ final int returnval = GUIBuilder.closeFile();
++ if (returnval == JOptionPane.CANCEL_OPTION) return;
++ monitor.setProgress(progress_counter);
++
++ GUIBuilder.buildGUI(currentConfigFile);
++ } catch (GUIBuildException e) {
++ e.printStackTrace();
++ }
++
++ gui.setEnabled(false); //Disable user interaction while the ProgressMonitor is on
++
++ HashSet usedKeys = new HashSet(); //save all keys that were used from the HashMap
++ HashSet unusedKeys = new HashSet(); //save all keys that were used from the HashMap
++
++ Iterator>> sectionIterator = panelControl.panels.entrySet().iterator();
++ while (sectionIterator.hasNext()) {
++ progress_counter++;
++ monitor.setProgress(progress_counter);
++ monitor.setNote(progress_counter + " out of " + panelControl.order.size() + " sections loaded");
++
++ if (monitor.isCanceled()) { //user cancelled loading
++ monitor.close();
++ gui.setEnabled(true);
++ break; //HACK, should reset the whole environment before breaking
++ }
++
++ Map.Entry> entry = sectionIterator.next();
++ TreeMap value = entry.getValue();
++
++ List sectionKeys = new ArrayList(hm.keySet()); //all keys as defined in the existing ini
++ String sectionKey = entry.getKey().toUpperCase() + "::"; //The section string
++ filterList(sectionKey, sectionKeys); //filter keys for current section only (optimization)
++
++ LinkedList todos = new LinkedList();
++ LinkedList keys = new LinkedList();
++ LinkedList values = new LinkedList();
++
++ do {
++ todos.clear();
++ keys.clear();
++ values.clear();
++
++ Iterator> keyIterator = value.entrySet().iterator();
++ while(keyIterator.hasNext()) { //go through all keys of current section
++ final ControlledPanel mypanel = keyIterator.next().getValue();
++ //System.out.println("\t" + mypanel.getKey());
++
++ String pattern = mypanel.getHashKey();
++ pattern = pattern.replace("%","[a-zA-Z0-9_]+");
++ pattern = pattern.replace("#","[1-9]+[0-9]*"); //all integer numbers from 1 to infinity
++ //System.out.println("Current pattern: " + pattern);
++
++ //Loop through all defined keys of this section and compare them with pattern
++ Iterator keyit = sectionKeys.iterator();
++ while (keyit.hasNext()) {
++ final String currkey = keyit.next();
++ //System.out.println("sectionKeys contains: " + currkey);
++
++ if ((!usedKeys.contains(currkey)) && currkey.matches(pattern)) {
++ //Add mypanel to list of todos
++ //System.out.println("Adding panel for " + currkey);
++ todos.add(mypanel);
++ keys.add(currkey);
++ values.add(hm.get(currkey));
++
++ usedKeys.add(currkey);
++ }
++ }
++ }
++
++ for (int jj = 0; jj < todos.size(); jj++) {
++ //System.out.println("--> SETTING " + keys.get(jj) + " = " +values.get(jj));
++ todos.get(jj).set(hm, keys.get(jj), values.get(jj));
++ }
++ } while (todos.size() != 0);
++
++ if (progress_counter == panelControl.order.size()) gui.setEnabled(true);
++ }
++
++ //Now find out all keys that were not used in the hashmap
++ for (String key : hm.keySet()) {
++ if (!usedKeys.contains(key)) {
++ //System.out.println("Unknown key = " + key);
++ unusedKeys.add(key);
++ panelControl.setUnusedKeys(key, hm.get(key));
++ }
++ }
++
++ setComments(added_comments, comments);
++ }
++ };//thread
++ myrunner.start();
++ }
++
++ private static void filterList(String filter, List list) {
++ for (Iterator it=list.iterator(); it.hasNext();) {
++ final String next = it.next();
++ if (!next.startsWith(filter)) {
++ it.remove();
++ }
++ }
++ }
++
++ public static int closeFile(){
++ final int returnval = JOptionPane.showConfirmDialog(new JPanel(),
++ "You will lose all changes made to the current ini-file. " +
++ "Do you want this?", "Inishell is already open for " + application, JOptionPane.OK_CANCEL_OPTION);
++
++
++
++ if (returnval == JOptionPane.OK_OPTION) {
++ gui.closeAllTabs();
++ gui.rootNode = new PanelNode("");
++ application = null;
++ doc = null;
++ panelControl = null;
++ }
++
++ return returnval;
++ }
++
++
++ /**
++ * Puts the specified panel into the panel control.
++ * @param panel
++ */
++ public static void control(ControlledPanel panel) {
++ final String section = panel.getSection();
++ panelControl.put(section, panel);
++ }
++
++
++ /**
++ * Recursively traverses all children of the specified element
++ * and builds the corresponding panels.
++ *
++ * @param parentElement
++ * @param parentPanel
++ * @throws GUIBuildException
++ */
++ public static void recursiveBuild(Element parentElement, ControlledPanel parentPanel, boolean doSet) throws GUIBuildException {
++ recursiveBuild(parentElement, parentPanel, doSet, null, null, null);
++ }
++
++
++ public static void recursiveBuild(Element parentElement, ControlledPanel parentPanel, boolean doSet, HashMap hm, String key, String value) throws GUIBuildException {
++
++ /* get all child elements for the root */
++ final String[] tags = {"parameter", "frame"};
++ final Element[] parameterElements = XMLHelper.getElementArray(parentElement, tags);
++
++ for (final Element element : parameterElements) {
++ final String section = element.getAttribute("section");
++ ControlledPanel parameterPanel;
++
++ if (!panelControl.contains(section, element.getAttribute("key"))) {
++ //System.out.println("Adding through recursiveBuild: " + element.getAttribute("key"));
++ parameterPanel = ControlledPanel.createSingleParameterPanel(element, parentPanel);
++ parameterPanel.setKey(parameterPanel.getKey());
++
++ if (!element.getAttribute("template").equals("true")) {
++ //if (doSet) System.out.println("\tSETTING component key: " + key + " value: " + value);
++ if (doSet) parameterPanel.set(hm, parameterPanel.getKey(), value);
++
++ gui.addToTab(parameterPanel, section, parentPanel);
++ control(parameterPanel);
++ }
++ } else {
++ parameterPanel = panelControl.get(section, element.getAttribute("key"));
++ }
++
++ parameterPanel.hold();
++ recursiveBuild(element, parameterPanel, doSet);
++ }
++
++ gui.validate();
++ }
++
++ /**
++ * Recursively destructs child elements of the specified root.
++ *
++ * @param rootElement
++ * @param rootPanel
++ * @throws GUIBuildException
++ */
++ public static void recursiveDestruct(Element rootElement, ControlledPanel rootPanel)
++ throws GUIBuildException {
++
++ /* get all child elements for the root */
++ final Element[] parameterElements = XMLHelper.getElementArray(rootElement, "parameter");
++
++ for (final Element element : parameterElements) {
++ final String section = element.getAttribute("section");
++ final ControlledPanel parameterPanel = panelControl.get(section, element.getAttribute("key"));
++ recursiveDestruct(element, parameterPanel);
++
++ parameterPanel.release();
++ parameterPanel.close();
++
++ if (!parameterPanel.isNeeded()) {
++ gui.removeFromTab(parameterPanel, section, rootPanel);
++ }
++
++ }
++
++ gui.validate();
++ }
++
++
++ /**
++ * Opens a prompt for the path to save the ini file to. Then prints the ini
++ * to the path specified.
++ *
++ * @throws IOException
++ * @throws GUIBuildException
++ */
++ public static void printIOFile() throws IOException, GUIBuildException {
++ final FileNameExtensionFilter inifilter = new FileNameExtensionFilter(".ini files", "ini");
++
++ final JFileChooser filechooser = new JFileChooser(saveFilePath);
++ filechooser.setFileFilter(inifilter);
++
++ final int returnval = filechooser.showSaveDialog(new JPanel());
++
++ if (returnval == JFileChooser.APPROVE_OPTION) {
++ String path = filechooser.getSelectedFile().getAbsolutePath();
++ final String ext = getFileExtension(path).toLowerCase();
++ if(!ext.equals("ini")) {
++ path += ".ini";
++ }
++
++ if (filechooser.getSelectedFile().isDirectory()) return;
++ saveFilePath = filechooser.getSelectedFile().getParent();
++
++ panelControl.printToFile(path);
++ }
++ }
++}
+
+Property changes on: ../trunk-jpl/src/java/src/main/GUIBuilder.java
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/document-open-2.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/document-open-2.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/document-open-2.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/document-open-2.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/document-open-2.png
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/document-preview.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/document-preview.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/document-preview.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/document-preview.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/document-preview.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/document-export-4.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/document-export-4.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/document-export-4.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/document-export-4.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/document-export-4.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/config_schema.xsd
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/config_schema.xsd (revision 0)
++++ ../trunk-jpl/src/java/src/resources/config_schema.xsd (revision 17808)
+@@ -0,0 +1,141 @@
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+Property changes on: ../trunk-jpl/src/java/src/resources/config_schema.xsd
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/default_config.xml
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/default_config.xml (revision 0)
++++ ../trunk-jpl/src/java/src/resources/default_config.xml (revision 17808)
+@@ -0,0 +1,919 @@
++
++
++
++
++
++ Size in days of a chunk of data to read at once.
++
++
++
++
++ Alternate way of buffer centering: When rebuffering, the new date will be located BUFF_BEFORE days from the
++ beginning of the buffer (therefore, it takes a value in days).
++
++
++
++
++
++
++
++
++
++
++
++ coordinate system
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ plugin for METEO data
++
++
++
++
++
++ The name of the parameter to copy (e.g. TA, RH, VW, ISWR, etc)
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ plugin for Digital Elevation Model data
++
++
++
++
++
++
++
++
++ plugin for land cover data
++
++
++
++
++
++
++
++
++
++
++
++
++
++ plugin for 2D gridded data
++
++
++
++
++
++ filename for station number #
++
++
++
++
++ station id for the given station number #
++
++
++
++
++ Coordinates are given as "lat lon" or "xcoord ycoord epsg_code"
++
++
++
++
++
++
++ string containing the path to the xml files
++
++
++
++
++
++
++ database name, as provided by your database administrator
++
++
++ database user name
++
++
++ database password associated with the user name
++
++
++
++
++ OPTIONAL: use ANETZ stations to provide precipitations for normal IMIS stations.
++ Each IMIS station is associated with one or two ANETZ stations and does a weighted
++ average to get what should be its local precipitations
++
++
++
++
++ OPTIONAL: if set to false (default), all IMIS precipitation will be deleted (since IMIS stations don't have heated rain gauges, their precipitation measurements are not good in winter conditions). If set to true, it is strongly advised to use a FilterHNWMelt filter to detect snow melting in the rain gauge and perform winter conditions detection in the application.
++
++
++
++
++ if set to true, the SNOWPACK simulated Snow Water Equivalent from the database will be used to compute HNW. Data gaps greater than 3 hours on SWE will lead to unchanged hnw while all data that can properly be computed will overwrite hnw. (default=false)
++
++
++
++
++
++
++
++ string containing the path to the grib files
++
++
++ grib file extension, or none for no file extension (default: .grb)
++
++
++
++
++
++
++
++ string containing the path to the data files
++
++
++ absolute filename of the geotop.inpts file
++
++
++ prefix to append when generating a file name for reading
++
++
++
++
++
++ string containing the path to the data files
++
++
++ specifiy in which order the columns should be printed out
++
++
++
++
++
++ webserver running GSN with its port number and full path. For example:
++ http://montblanc.slf.ch:22001/services/A3DWebService
++
++
++ Should the connection go through a proxy? This is useful for servers
++ filtering on domains but usually not necessary.
++
++
++
++
++
++
++
++
++
++
++ string containing the path to the smet files
++
++
++
++
++
++
++ string representing path where SMET files should be saved
++
++
++
++
++
++
++
++
++
++ string containing the path to the SNOWPACK files
++
++
++ filename of the meta data file (in METEOPATH)
++
++
++
++ the number of measured snow temperatures provided
++
++
++
++ the number of solutes for which input data are provided
++
++
++
++
++
++
++
++
++
++
++
++
++
++ OPTIONAL: wind velocity to use for blowing and drifting snow is provided
++
++
++
++
++ OPTIONAL: measured new snow density is provided
++
++
++
++
++
++
++
++
++
++
++ generate names compatible with Alpine3D's grid viewer?
++
++
++ grid file extension, or none for no file extension (default: .asc)
++
++
++
++
++
++ x coordinate of the lower left corner of the grids
++
++
++ y coordinate of the lower left corner of the grids
++
++
++ grid file extension, or none for no file extension (default: .asc)
++
++
++
++
++
++ prefix to append when generating a file name for reading (ie: something like "laf" for Cosmo-Analysis-full domain)
++
++
++ grib file extension, or none for no file extension (default: .grb)
++
++
++
++
++
++
++
++ generate a world file for each output file? This file contains the geolocalization information
++
++
++
++
++ generate a legend?
++
++
++
++
++ autoscale color scale?
++
++
++
++
++ scaling algorithm (default=bilinear)
++
++
++ minimum dimensions of the PNG, like 640x480
++
++
++ maximum dimensions of the PNG, like 1024x768
++
++
++
++
++ generate a color indexed file (default=true)
++
++
++
++
++ optimize for speed (default=false)
++
++
++ number of colors in the palette (default=30)
++
++
++
++
++
++ lower left x coordinate
++
++
++ lower left y coordinate
++
++
++ cellsize in meters
++
++
++ minimum value in real world coordinates to match with the minimum value read out of the PGM file (such minimum being greater than 0 because 0 is NODATA)
++
++
++ maximum value in real world coordinates to match with the maximum value read out of the PGM file
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Mean average processing. The mean average filter returns the mean value of all values within a user given time window.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Median average processing. The median average filter returns the median value of all values within a user given time window.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Standard deviation filter. Values outside of mean ± 2 std_dev are rejected.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Median Absolute Deviation. Values outside of median ± 3 σ_MAD are rejected. <br>
++ See http://en.wikipedia.org/wiki/Median_absolute_deviation for more information.
++
++
++
++
++
++
++ The keyword "soft" maybe added, if the window position is allowed to be adjusted to the data present.
++ The two arguments may be preceded by the keywords "left", "center" or "right", indicating the window position.
++
++
++ Tukey 53H method A smooth time sequence is generated from the median, substracted from the original signal and
++ compared with the standard deviation. see "Despiking Acoustic Doppler Velocimeter Data", Derek G. Goring and Vladimir
++ L. Nikora, Journal of Hydraulic Engineering, 128, 1, 2002 The deviation factor coeffecient is currently hard-coded as k=1.5.
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++
++
++ Wind vector averaging. This calculates the vector average over a user given time period. Each wind vector
++ within this period is added and the final sum is normalized by the number of vectors that have been added.
++
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++ Alpha needs to be provided as last argument. Please note that the standard filter works with a left window!
++
++
++ Exponential smooting processing, exponential moving average s_0 = x_0 s_n = alpha*x_(t-1) + (1-alpha)*s_t-1
++
++
++
++
++
++
++ Activate "soft" if the window position is allowed to be adjusted, window position maybe left, center or right.
++ Minimal number of points in window and minimal time interval spanning the window (seconds) are required.
++ Please note that the standard filter works with a left window!
++
++
++ Weighted moving average smoothing such as: WMA = (1*X1 + 2*X2 + ... + n*Xn) / sum_of_weights
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ This implements the standard methods for precipitation correction as described in "WMO Solid Precipitation Measurement Intercomparison", B. Goodison, P. Louie and D. Yang, 872, 1998 as well as the overview given by "Literature Study on the Correction of Precipitation Measurements", Annette Wagner, 2009. The correction parameters for the shielded Hellmann gauge (German version) are from "Wind-induced Precipitation Undercatch of the Hellmann Gauges", Daqing Yang et al, Nordic Hydrology, 30, 1999, pp 57-80.
++
++
++
++
++
++
++ This applies a constant correction factor to the precipitation, one for pure snow and one for mixed precipitation. The following thresholds are used: pure snow below -2 C; mixed precipitation between -2 and +2 C; pure rain above 2 C. These threshold can be changed (see online documentation).
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Affects resampling: expresses (in seconds) how far a valid point can be
++ searched for when re-interpolating a missing value
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ Detrend the measured data, fill the grid with the average over all the stations, reapply the elevation trend
++
++
++
++
++ Detrend the measured data, apply Inverse Distance Weighted average, reapply elevation trend
++
++
++
++ Same as IDW_LAPSE, but only considering a given number of neighboring stations
++
++
++
++
++
++ Base algorithm (do not forget to add the options for the base algorithm)
++
++ Distribute precipitation with a base algorithm (IDW_LAPSE by default), then reduce/remove precipitation on
++ steep slopes and correct with the local curvature. This is to simulate snow redistribution processes.
++
++
++
++ Variogram model
++
++ Ordinary kriging (EXPERIMENTAL)
++
++
++
++
++
++
+\ No newline at end of file
+
+Property changes on: ../trunk-jpl/src/java/src/resources/default_config.xml
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/file_ops.xcf
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/file_ops.xcf
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/file_ops.xcf (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/file_ops.xcf (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/file_ops.xcf
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/filesave.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/filesave.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/filesave.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/filesave.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/filesave.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/viewmag.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/viewmag.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/viewmag.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/viewmag.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/viewmag.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/ini_open.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/ini_open.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/ini_open.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/ini_open.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/ini_open.png
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/fileopen.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/fileopen.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/fileopen.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/fileopen.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/fileopen.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/xml_open.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/xml_open.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/xml_open.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/xml_open.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/xml_open.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/filesaveas.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/filesaveas.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/filesaveas.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/filesaveas.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/filesaveas.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/opensettings.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/opensettings.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/opensettings.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/opensettings.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/opensettings.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/reset.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/reset.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/reset.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/reset.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/reset.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/advancedsettings.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/advancedsettings.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/advancedsettings.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/advancedsettings.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/advancedsettings.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/mydocuments.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/mydocuments.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/mydocuments.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/mydocuments.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/mydocuments.png
+___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/readme.txt
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/readme.txt (revision 0)
++++ ../trunk-jpl/src/java/src/resources/icons/readme.txt (revision 17808)
+@@ -0,0 +1,10 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++This copyright and license notice covers the images in this directory.
++************************************************************************
++
++TITLE: Crystal Project Icons
++AUTHOR: Everaldo Coelho
++SITE: http://www.everaldo.com
++CONTACT: everaldo@everaldo.com
++
++Copyright (c) 2006-2007 Everaldo Coelho.
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/readme.txt
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/icons/kghostview.png
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/src/java/src/resources/icons/kghostview.png
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/icons/kghostview.png (revision 17807)
++++ ../trunk-jpl/src/java/src/resources/icons/kghostview.png (revision 17808)
+
+Property changes on: ../trunk-jpl/src/java/src/resources/icons/kghostview.png
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Added: svn:mime-type
+## -0,0 +1 ##
++application/octet-stream
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/src/resources/config_schema-0.1.1.xsd
+===================================================================
+--- ../trunk-jpl/src/java/src/resources/config_schema-0.1.1.xsd (revision 0)
++++ ../trunk-jpl/src/java/src/resources/config_schema-0.1.1.xsd (revision 17808)
+@@ -0,0 +1,154 @@
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+Property changes on: ../trunk-jpl/src/java/src/resources/config_schema-0.1.1.xsd
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/COPYING
+===================================================================
+--- ../trunk-jpl/src/java/COPYING (revision 0)
++++ ../trunk-jpl/src/java/COPYING (revision 17808)
+@@ -0,0 +1,674 @@
++ GNU GENERAL PUBLIC LICENSE
++ Version 3, 29 June 2007
++
++ Copyright (C) 2007 Free Software Foundation, Inc.
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++ Preamble
++
++ The GNU General Public License is a free, copyleft license for
++software and other kinds of works.
++
++ The licenses for most software and other practical works are designed
++to take away your freedom to share and change the works. By contrast,
++the GNU General Public License is intended to guarantee your freedom to
++share and change all versions of a program--to make sure it remains free
++software for all its users. We, the Free Software Foundation, use the
++GNU General Public License for most of our software; it applies also to
++any other work released this way by its authors. You can apply it to
++your programs, too.
++
++ When we speak of free software, we are referring to freedom, not
++price. Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++them if you wish), that you receive source code or can get it if you
++want it, that you can change the software or use pieces of it in new
++free programs, and that you know you can do these things.
++
++ To protect your rights, we need to prevent others from denying you
++these rights or asking you to surrender the rights. Therefore, you have
++certain responsibilities if you distribute copies of the software, or if
++you modify it: responsibilities to respect the freedom of others.
++
++ For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must pass on to the recipients the same
++freedoms that you received. You must make sure that they, too, receive
++or can get the source code. And you must show them these terms so they
++know their rights.
++
++ Developers that use the GNU GPL protect your rights with two steps:
++(1) assert copyright on the software, and (2) offer you this License
++giving you legal permission to copy, distribute and/or modify it.
++
++ For the developers' and authors' protection, the GPL clearly explains
++that there is no warranty for this free software. For both users' and
++authors' sake, the GPL requires that modified versions be marked as
++changed, so that their problems will not be attributed erroneously to
++authors of previous versions.
++
++ Some devices are designed to deny users access to install or run
++modified versions of the software inside them, although the manufacturer
++can do so. This is fundamentally incompatible with the aim of
++protecting users' freedom to change the software. The systematic
++pattern of such abuse occurs in the area of products for individuals to
++use, which is precisely where it is most unacceptable. Therefore, we
++have designed this version of the GPL to prohibit the practice for those
++products. If such problems arise substantially in other domains, we
++stand ready to extend this provision to those domains in future versions
++of the GPL, as needed to protect the freedom of users.
++
++ Finally, every program is threatened constantly by software patents.
++States should not allow patents to restrict development and use of
++software on general-purpose computers, but in those that do, we wish to
++avoid the special danger that patents applied to a free program could
++make it effectively proprietary. To prevent this, the GPL assures that
++patents cannot be used to render the program non-free.
++
++ The precise terms and conditions for copying, distribution and
++modification follow.
++
++ TERMS AND CONDITIONS
++
++ 0. Definitions.
++
++ "This License" refers to version 3 of the GNU General Public License.
++
++ "Copyright" also means copyright-like laws that apply to other kinds of
++works, such as semiconductor masks.
++
++ "The Program" refers to any copyrightable work licensed under this
++License. Each licensee is addressed as "you". "Licensees" and
++"recipients" may be individuals or organizations.
++
++ To "modify" a work means to copy from or adapt all or part of the work
++in a fashion requiring copyright permission, other than the making of an
++exact copy. The resulting work is called a "modified version" of the
++earlier work or a work "based on" the earlier work.
++
++ A "covered work" means either the unmodified Program or a work based
++on the Program.
++
++ To "propagate" a work means to do anything with it that, without
++permission, would make you directly or secondarily liable for
++infringement under applicable copyright law, except executing it on a
++computer or modifying a private copy. Propagation includes copying,
++distribution (with or without modification), making available to the
++public, and in some countries other activities as well.
++
++ To "convey" a work means any kind of propagation that enables other
++parties to make or receive copies. Mere interaction with a user through
++a computer network, with no transfer of a copy, is not conveying.
++
++ An interactive user interface displays "Appropriate Legal Notices"
++to the extent that it includes a convenient and prominently visible
++feature that (1) displays an appropriate copyright notice, and (2)
++tells the user that there is no warranty for the work (except to the
++extent that warranties are provided), that licensees may convey the
++work under this License, and how to view a copy of this License. If
++the interface presents a list of user commands or options, such as a
++menu, a prominent item in the list meets this criterion.
++
++ 1. Source Code.
++
++ The "source code" for a work means the preferred form of the work
++for making modifications to it. "Object code" means any non-source
++form of a work.
++
++ A "Standard Interface" means an interface that either is an official
++standard defined by a recognized standards body, or, in the case of
++interfaces specified for a particular programming language, one that
++is widely used among developers working in that language.
++
++ The "System Libraries" of an executable work include anything, other
++than the work as a whole, that (a) is included in the normal form of
++packaging a Major Component, but which is not part of that Major
++Component, and (b) serves only to enable use of the work with that
++Major Component, or to implement a Standard Interface for which an
++implementation is available to the public in source code form. A
++"Major Component", in this context, means a major essential component
++(kernel, window system, and so on) of the specific operating system
++(if any) on which the executable work runs, or a compiler used to
++produce the work, or an object code interpreter used to run it.
++
++ The "Corresponding Source" for a work in object code form means all
++the source code needed to generate, install, and (for an executable
++work) run the object code and to modify the work, including scripts to
++control those activities. However, it does not include the work's
++System Libraries, or general-purpose tools or generally available free
++programs which are used unmodified in performing those activities but
++which are not part of the work. For example, Corresponding Source
++includes interface definition files associated with source files for
++the work, and the source code for shared libraries and dynamically
++linked subprograms that the work is specifically designed to require,
++such as by intimate data communication or control flow between those
++subprograms and other parts of the work.
++
++ The Corresponding Source need not include anything that users
++can regenerate automatically from other parts of the Corresponding
++Source.
++
++ The Corresponding Source for a work in source code form is that
++same work.
++
++ 2. Basic Permissions.
++
++ All rights granted under this License are granted for the term of
++copyright on the Program, and are irrevocable provided the stated
++conditions are met. This License explicitly affirms your unlimited
++permission to run the unmodified Program. The output from running a
++covered work is covered by this License only if the output, given its
++content, constitutes a covered work. This License acknowledges your
++rights of fair use or other equivalent, as provided by copyright law.
++
++ You may make, run and propagate covered works that you do not
++convey, without conditions so long as your license otherwise remains
++in force. You may convey covered works to others for the sole purpose
++of having them make modifications exclusively for you, or provide you
++with facilities for running those works, provided that you comply with
++the terms of this License in conveying all material for which you do
++not control copyright. Those thus making or running the covered works
++for you must do so exclusively on your behalf, under your direction
++and control, on terms that prohibit them from making any copies of
++your copyrighted material outside their relationship with you.
++
++ Conveying under any other circumstances is permitted solely under
++the conditions stated below. Sublicensing is not allowed; section 10
++makes it unnecessary.
++
++ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
++
++ No covered work shall be deemed part of an effective technological
++measure under any applicable law fulfilling obligations under article
++11 of the WIPO copyright treaty adopted on 20 December 1996, or
++similar laws prohibiting or restricting circumvention of such
++measures.
++
++ When you convey a covered work, you waive any legal power to forbid
++circumvention of technological measures to the extent such circumvention
++is effected by exercising rights under this License with respect to
++the covered work, and you disclaim any intention to limit operation or
++modification of the work as a means of enforcing, against the work's
++users, your or third parties' legal rights to forbid circumvention of
++technological measures.
++
++ 4. Conveying Verbatim Copies.
++
++ You may convey verbatim copies of the Program's source code as you
++receive it, in any medium, provided that you conspicuously and
++appropriately publish on each copy an appropriate copyright notice;
++keep intact all notices stating that this License and any
++non-permissive terms added in accord with section 7 apply to the code;
++keep intact all notices of the absence of any warranty; and give all
++recipients a copy of this License along with the Program.
++
++ You may charge any price or no price for each copy that you convey,
++and you may offer support or warranty protection for a fee.
++
++ 5. Conveying Modified Source Versions.
++
++ You may convey a work based on the Program, or the modifications to
++produce it from the Program, in the form of source code under the
++terms of section 4, provided that you also meet all of these conditions:
++
++ a) The work must carry prominent notices stating that you modified
++ it, and giving a relevant date.
++
++ b) The work must carry prominent notices stating that it is
++ released under this License and any conditions added under section
++ 7. This requirement modifies the requirement in section 4 to
++ "keep intact all notices".
++
++ c) You must license the entire work, as a whole, under this
++ License to anyone who comes into possession of a copy. This
++ License will therefore apply, along with any applicable section 7
++ additional terms, to the whole of the work, and all its parts,
++ regardless of how they are packaged. This License gives no
++ permission to license the work in any other way, but it does not
++ invalidate such permission if you have separately received it.
++
++ d) If the work has interactive user interfaces, each must display
++ Appropriate Legal Notices; however, if the Program has interactive
++ interfaces that do not display Appropriate Legal Notices, your
++ work need not make them do so.
++
++ A compilation of a covered work with other separate and independent
++works, which are not by their nature extensions of the covered work,
++and which are not combined with it such as to form a larger program,
++in or on a volume of a storage or distribution medium, is called an
++"aggregate" if the compilation and its resulting copyright are not
++used to limit the access or legal rights of the compilation's users
++beyond what the individual works permit. Inclusion of a covered work
++in an aggregate does not cause this License to apply to the other
++parts of the aggregate.
++
++ 6. Conveying Non-Source Forms.
++
++ You may convey a covered work in object code form under the terms
++of sections 4 and 5, provided that you also convey the
++machine-readable Corresponding Source under the terms of this License,
++in one of these ways:
++
++ a) Convey the object code in, or embodied in, a physical product
++ (including a physical distribution medium), accompanied by the
++ Corresponding Source fixed on a durable physical medium
++ customarily used for software interchange.
++
++ b) Convey the object code in, or embodied in, a physical product
++ (including a physical distribution medium), accompanied by a
++ written offer, valid for at least three years and valid for as
++ long as you offer spare parts or customer support for that product
++ model, to give anyone who possesses the object code either (1) a
++ copy of the Corresponding Source for all the software in the
++ product that is covered by this License, on a durable physical
++ medium customarily used for software interchange, for a price no
++ more than your reasonable cost of physically performing this
++ conveying of source, or (2) access to copy the
++ Corresponding Source from a network server at no charge.
++
++ c) Convey individual copies of the object code with a copy of the
++ written offer to provide the Corresponding Source. This
++ alternative is allowed only occasionally and noncommercially, and
++ only if you received the object code with such an offer, in accord
++ with subsection 6b.
++
++ d) Convey the object code by offering access from a designated
++ place (gratis or for a charge), and offer equivalent access to the
++ Corresponding Source in the same way through the same place at no
++ further charge. You need not require recipients to copy the
++ Corresponding Source along with the object code. If the place to
++ copy the object code is a network server, the Corresponding Source
++ may be on a different server (operated by you or a third party)
++ that supports equivalent copying facilities, provided you maintain
++ clear directions next to the object code saying where to find the
++ Corresponding Source. Regardless of what server hosts the
++ Corresponding Source, you remain obligated to ensure that it is
++ available for as long as needed to satisfy these requirements.
++
++ e) Convey the object code using peer-to-peer transmission, provided
++ you inform other peers where the object code and Corresponding
++ Source of the work are being offered to the general public at no
++ charge under subsection 6d.
++
++ A separable portion of the object code, whose source code is excluded
++from the Corresponding Source as a System Library, need not be
++included in conveying the object code work.
++
++ A "User Product" is either (1) a "consumer product", which means any
++tangible personal property which is normally used for personal, family,
++or household purposes, or (2) anything designed or sold for incorporation
++into a dwelling. In determining whether a product is a consumer product,
++doubtful cases shall be resolved in favor of coverage. For a particular
++product received by a particular user, "normally used" refers to a
++typical or common use of that class of product, regardless of the status
++of the particular user or of the way in which the particular user
++actually uses, or expects or is expected to use, the product. A product
++is a consumer product regardless of whether the product has substantial
++commercial, industrial or non-consumer uses, unless such uses represent
++the only significant mode of use of the product.
++
++ "Installation Information" for a User Product means any methods,
++procedures, authorization keys, or other information required to install
++and execute modified versions of a covered work in that User Product from
++a modified version of its Corresponding Source. The information must
++suffice to ensure that the continued functioning of the modified object
++code is in no case prevented or interfered with solely because
++modification has been made.
++
++ If you convey an object code work under this section in, or with, or
++specifically for use in, a User Product, and the conveying occurs as
++part of a transaction in which the right of possession and use of the
++User Product is transferred to the recipient in perpetuity or for a
++fixed term (regardless of how the transaction is characterized), the
++Corresponding Source conveyed under this section must be accompanied
++by the Installation Information. But this requirement does not apply
++if neither you nor any third party retains the ability to install
++modified object code on the User Product (for example, the work has
++been installed in ROM).
++
++ The requirement to provide Installation Information does not include a
++requirement to continue to provide support service, warranty, or updates
++for a work that has been modified or installed by the recipient, or for
++the User Product in which it has been modified or installed. Access to a
++network may be denied when the modification itself materially and
++adversely affects the operation of the network or violates the rules and
++protocols for communication across the network.
++
++ Corresponding Source conveyed, and Installation Information provided,
++in accord with this section must be in a format that is publicly
++documented (and with an implementation available to the public in
++source code form), and must require no special password or key for
++unpacking, reading or copying.
++
++ 7. Additional Terms.
++
++ "Additional permissions" are terms that supplement the terms of this
++License by making exceptions from one or more of its conditions.
++Additional permissions that are applicable to the entire Program shall
++be treated as though they were included in this License, to the extent
++that they are valid under applicable law. If additional permissions
++apply only to part of the Program, that part may be used separately
++under those permissions, but the entire Program remains governed by
++this License without regard to the additional permissions.
++
++ When you convey a copy of a covered work, you may at your option
++remove any additional permissions from that copy, or from any part of
++it. (Additional permissions may be written to require their own
++removal in certain cases when you modify the work.) You may place
++additional permissions on material, added by you to a covered work,
++for which you have or can give appropriate copyright permission.
++
++ Notwithstanding any other provision of this License, for material you
++add to a covered work, you may (if authorized by the copyright holders of
++that material) supplement the terms of this License with terms:
++
++ a) Disclaiming warranty or limiting liability differently from the
++ terms of sections 15 and 16 of this License; or
++
++ b) Requiring preservation of specified reasonable legal notices or
++ author attributions in that material or in the Appropriate Legal
++ Notices displayed by works containing it; or
++
++ c) Prohibiting misrepresentation of the origin of that material, or
++ requiring that modified versions of such material be marked in
++ reasonable ways as different from the original version; or
++
++ d) Limiting the use for publicity purposes of names of licensors or
++ authors of the material; or
++
++ e) Declining to grant rights under trademark law for use of some
++ trade names, trademarks, or service marks; or
++
++ f) Requiring indemnification of licensors and authors of that
++ material by anyone who conveys the material (or modified versions of
++ it) with contractual assumptions of liability to the recipient, for
++ any liability that these contractual assumptions directly impose on
++ those licensors and authors.
++
++ All other non-permissive additional terms are considered "further
++restrictions" within the meaning of section 10. If the Program as you
++received it, or any part of it, contains a notice stating that it is
++governed by this License along with a term that is a further
++restriction, you may remove that term. If a license document contains
++a further restriction but permits relicensing or conveying under this
++License, you may add to a covered work material governed by the terms
++of that license document, provided that the further restriction does
++not survive such relicensing or conveying.
++
++ If you add terms to a covered work in accord with this section, you
++must place, in the relevant source files, a statement of the
++additional terms that apply to those files, or a notice indicating
++where to find the applicable terms.
++
++ Additional terms, permissive or non-permissive, may be stated in the
++form of a separately written license, or stated as exceptions;
++the above requirements apply either way.
++
++ 8. Termination.
++
++ You may not propagate or modify a covered work except as expressly
++provided under this License. Any attempt otherwise to propagate or
++modify it is void, and will automatically terminate your rights under
++this License (including any patent licenses granted under the third
++paragraph of section 11).
++
++ However, if you cease all violation of this License, then your
++license from a particular copyright holder is reinstated (a)
++provisionally, unless and until the copyright holder explicitly and
++finally terminates your license, and (b) permanently, if the copyright
++holder fails to notify you of the violation by some reasonable means
++prior to 60 days after the cessation.
++
++ Moreover, your license from a particular copyright holder is
++reinstated permanently if the copyright holder notifies you of the
++violation by some reasonable means, this is the first time you have
++received notice of violation of this License (for any work) from that
++copyright holder, and you cure the violation prior to 30 days after
++your receipt of the notice.
++
++ Termination of your rights under this section does not terminate the
++licenses of parties who have received copies or rights from you under
++this License. If your rights have been terminated and not permanently
++reinstated, you do not qualify to receive new licenses for the same
++material under section 10.
++
++ 9. Acceptance Not Required for Having Copies.
++
++ You are not required to accept this License in order to receive or
++run a copy of the Program. Ancillary propagation of a covered work
++occurring solely as a consequence of using peer-to-peer transmission
++to receive a copy likewise does not require acceptance. However,
++nothing other than this License grants you permission to propagate or
++modify any covered work. These actions infringe copyright if you do
++not accept this License. Therefore, by modifying or propagating a
++covered work, you indicate your acceptance of this License to do so.
++
++ 10. Automatic Licensing of Downstream Recipients.
++
++ Each time you convey a covered work, the recipient automatically
++receives a license from the original licensors, to run, modify and
++propagate that work, subject to this License. You are not responsible
++for enforcing compliance by third parties with this License.
++
++ An "entity transaction" is a transaction transferring control of an
++organization, or substantially all assets of one, or subdividing an
++organization, or merging organizations. If propagation of a covered
++work results from an entity transaction, each party to that
++transaction who receives a copy of the work also receives whatever
++licenses to the work the party's predecessor in interest had or could
++give under the previous paragraph, plus a right to possession of the
++Corresponding Source of the work from the predecessor in interest, if
++the predecessor has it or can get it with reasonable efforts.
++
++ You may not impose any further restrictions on the exercise of the
++rights granted or affirmed under this License. For example, you may
++not impose a license fee, royalty, or other charge for exercise of
++rights granted under this License, and you may not initiate litigation
++(including a cross-claim or counterclaim in a lawsuit) alleging that
++any patent claim is infringed by making, using, selling, offering for
++sale, or importing the Program or any portion of it.
++
++ 11. Patents.
++
++ A "contributor" is a copyright holder who authorizes use under this
++License of the Program or a work on which the Program is based. The
++work thus licensed is called the contributor's "contributor version".
++
++ A contributor's "essential patent claims" are all patent claims
++owned or controlled by the contributor, whether already acquired or
++hereafter acquired, that would be infringed by some manner, permitted
++by this License, of making, using, or selling its contributor version,
++but do not include claims that would be infringed only as a
++consequence of further modification of the contributor version. For
++purposes of this definition, "control" includes the right to grant
++patent sublicenses in a manner consistent with the requirements of
++this License.
++
++ Each contributor grants you a non-exclusive, worldwide, royalty-free
++patent license under the contributor's essential patent claims, to
++make, use, sell, offer for sale, import and otherwise run, modify and
++propagate the contents of its contributor version.
++
++ In the following three paragraphs, a "patent license" is any express
++agreement or commitment, however denominated, not to enforce a patent
++(such as an express permission to practice a patent or covenant not to
++sue for patent infringement). To "grant" such a patent license to a
++party means to make such an agreement or commitment not to enforce a
++patent against the party.
++
++ If you convey a covered work, knowingly relying on a patent license,
++and the Corresponding Source of the work is not available for anyone
++to copy, free of charge and under the terms of this License, through a
++publicly available network server or other readily accessible means,
++then you must either (1) cause the Corresponding Source to be so
++available, or (2) arrange to deprive yourself of the benefit of the
++patent license for this particular work, or (3) arrange, in a manner
++consistent with the requirements of this License, to extend the patent
++license to downstream recipients. "Knowingly relying" means you have
++actual knowledge that, but for the patent license, your conveying the
++covered work in a country, or your recipient's use of the covered work
++in a country, would infringe one or more identifiable patents in that
++country that you have reason to believe are valid.
++
++ If, pursuant to or in connection with a single transaction or
++arrangement, you convey, or propagate by procuring conveyance of, a
++covered work, and grant a patent license to some of the parties
++receiving the covered work authorizing them to use, propagate, modify
++or convey a specific copy of the covered work, then the patent license
++you grant is automatically extended to all recipients of the covered
++work and works based on it.
++
++ A patent license is "discriminatory" if it does not include within
++the scope of its coverage, prohibits the exercise of, or is
++conditioned on the non-exercise of one or more of the rights that are
++specifically granted under this License. You may not convey a covered
++work if you are a party to an arrangement with a third party that is
++in the business of distributing software, under which you make payment
++to the third party based on the extent of your activity of conveying
++the work, and under which the third party grants, to any of the
++parties who would receive the covered work from you, a discriminatory
++patent license (a) in connection with copies of the covered work
++conveyed by you (or copies made from those copies), or (b) primarily
++for and in connection with specific products or compilations that
++contain the covered work, unless you entered into that arrangement,
++or that patent license was granted, prior to 28 March 2007.
++
++ Nothing in this License shall be construed as excluding or limiting
++any implied license or other defenses to infringement that may
++otherwise be available to you under applicable patent law.
++
++ 12. No Surrender of Others' Freedom.
++
++ If conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License. If you cannot convey a
++covered work so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you may
++not convey it at all. For example, if you agree to terms that obligate you
++to collect a royalty for further conveying from those to whom you convey
++the Program, the only way you could satisfy both those terms and this
++License would be to refrain entirely from conveying the Program.
++
++ 13. Use with the GNU Affero General Public License.
++
++ Notwithstanding any other provision of this License, you have
++permission to link or combine any covered work with a work licensed
++under version 3 of the GNU Affero General Public License into a single
++combined work, and to convey the resulting work. The terms of this
++License will continue to apply to the part which is the covered work,
++but the special requirements of the GNU Affero General Public License,
++section 13, concerning interaction through a network will apply to the
++combination as such.
++
++ 14. Revised Versions of this License.
++
++ The Free Software Foundation may publish revised and/or new versions of
++the GNU General Public License from time to time. Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++ Each version is given a distinguishing version number. If the
++Program specifies that a certain numbered version of the GNU General
++Public License "or any later version" applies to it, you have the
++option of following the terms and conditions either of that numbered
++version or of any later version published by the Free Software
++Foundation. If the Program does not specify a version number of the
++GNU General Public License, you may choose any version ever published
++by the Free Software Foundation.
++
++ If the Program specifies that a proxy can decide which future
++versions of the GNU General Public License can be used, that proxy's
++public statement of acceptance of a version permanently authorizes you
++to choose that version for the Program.
++
++ Later license versions may give you additional or different
++permissions. However, no additional obligations are imposed on any
++author or copyright holder as a result of your choosing to follow a
++later version.
++
++ 15. Disclaimer of Warranty.
++
++ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
++APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
++HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
++OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
++THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
++IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
++ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++ 16. Limitation of Liability.
++
++ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
++THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
++GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
++USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
++DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
++PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
++EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
++SUCH DAMAGES.
++
++ 17. Interpretation of Sections 15 and 16.
++
++ If the disclaimer of warranty and limitation of liability provided
++above cannot be given local legal effect according to their terms,
++reviewing courts shall apply local law that most closely approximates
++an absolute waiver of all civil liability in connection with the
++Program, unless a warranty or assumption of liability accompanies a
++copy of the Program in return for a fee.
++
++ END OF TERMS AND CONDITIONS
++
++ How to Apply These Terms to Your New Programs
++
++ If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++ To do so, attach the following notices to the program. It is safest
++to attach them to the start of each source file to most effectively
++state the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++
++ Copyright (C)
++
++ This program is free software: you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation, either version 3 of the License, or
++ (at your option) any later version.
++
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with this program. If not, see .
++
++Also add information on how to contact you by electronic and paper mail.
++
++ If the program does terminal interaction, make it output a short
++notice like this when it starts in an interactive mode:
++
++ Copyright (C)
++ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++ This is free software, and you are welcome to redistribute it
++ under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License. Of course, your program's commands
++might be different; for a GUI interface, you would use an "about box".
++
++ You should also get your employer (if you work as a programmer) or school,
++if any, to sign a "copyright disclaimer" for the program, if necessary.
++For more information on this, and how to apply and follow the GNU GPL, see
++.
++
++ The GNU General Public License does not permit incorporating your program
++into proprietary programs. If your program is a subroutine library, you
++may consider it more useful to permit linking proprietary applications with
++the library. If this is what you want to do, use the GNU Lesser General
++Public License instead of this License. But first, please read
++.
+
+Property changes on: ../trunk-jpl/src/java/COPYING
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/java/build.xml
+===================================================================
+--- ../trunk-jpl/src/java/build.xml (revision 0)
++++ ../trunk-jpl/src/java/build.xml (revision 17808)
+@@ -0,0 +1,126 @@
++
++
++ Build and run the inishell Application from the command line.
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ You can use the following targets:
++
++ help : (default) Prints this message
++ init : create necessary directories
++ clean : Deletes work directories
++ compile : Compiles into class files
++ dist : pack all necessary files into a JAR file
++ issm : create inishell GUI using issm.xml
++ snowpack : dist tailored for snowpack
++ meteoio : dist tailored for meteoio
++ run : run the previously compiled version
++ pack : pack all in a zip file for a release
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+Property changes on: ../trunk-jpl/src/java/build.xml
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp
+===================================================================
+--- ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17807)
++++ ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17808)
+@@ -88,8 +88,172 @@
+ }/*}}}*/
+ ElementMatrix* LevelsetAnalysis::CreateKMatrix(Element* element){/*{{{*/
+
+- _error_("NOT IMPLEMENTED YET");
++ if(!element->IsOnBase()) return NULL;
++ Element* basalelement = element->SpawnBasalElement();
+
++ /*Intermediaries */
++ int dim, domaintype;
++ int i, row, col;
++ IssmDouble kappa;
++ IssmDouble Jdet, dt, D_scalar;
++ IssmDouble h,hx,hy,hz;
++ IssmDouble vel, calvingrate;
++ IssmDouble norm_dlsf;
++ IssmDouble* xyz_list = NULL;
++
++ /*Get problem dimension*/
++ basalelement->FindParam(&domaintype,DomainTypeEnum);
++ switch(domaintype){
++ case Domain2DverticalEnum: dim = 1; break;
++ case Domain2DhorizontalEnum: dim = 2; break;
++ case Domain3DEnum: dim = 2; break;
++ default: _error_("mesh "<GetNumberOfNodes();
++
++ /*Initialize Element vector and other vectors*/
++ ElementMatrix* Ke = basalelement->NewElementMatrix();
++ IssmDouble* basis = xNew(numnodes);
++ IssmDouble* B = xNew(dim*numnodes);
++ IssmDouble* Bprime = xNew(dim*numnodes);
++ IssmDouble* D = xNew(dim*dim);
++ IssmDouble* v = xNew(dim);
++ IssmDouble* w = xNew(dim);
++ IssmDouble* c = xNew(dim);
++ IssmDouble* dlsf = xNew(dim);
++
++ /*Retrieve all inputs and parameters*/
++ basalelement->GetVerticesCoordinates(&xyz_list);
++ basalelement->FindParam(&dt,TimesteppingTimeStepEnum);
++ Input* vx_input=NULL;
++ Input* vy_input=NULL;
++ if(domaintype==Domain2DhorizontalEnum){
++ vx_input=basalelement->GetInput(VxEnum); _assert_(vx_input);
++ vy_input=basalelement->GetInput(VyEnum); _assert_(vy_input);
++ }
++ else{
++ if(dim==1){
++ vx_input=basalelement->GetInput(VxEnum); _assert_(vx_input);
++ }
++ if(dim==2){
++ vx_input=basalelement->GetInput(VxAverageEnum); _assert_(vx_input);
++ vy_input=basalelement->GetInput(VyAverageEnum); _assert_(vy_input);
++ }
++ }
++
++ Input* lsf_slopex_input = basalelement->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
++ Input* lsf_slopey_input = basalelement->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
++ Input* calvingrate_input = basalelement->GetInput(MasstransportCalvingrateEnum); _assert_(calvingrate_input);
++
++ /* Start looping on the number of gaussian points: */
++ Gauss* gauss=basalelement->NewGauss(2);
++ for(int ig=gauss->begin();igend();ig++){
++ gauss->GaussPoint(ig);
++
++ basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss);
++ D_scalar=gauss->weight*Jdet;
++
++ /* Transient */
++ if(dt!=0.){
++ basalelement->NodalFunctions(basis,gauss);
++ TripleMultiply(basis,numnodes,1,0,
++ &D_scalar,1,1,0,
++ basis,1,numnodes,0,
++ &Ke->values[0],1);
++ D_scalar*=dt;
++ }
++
++ /* Advection */
++ GetB(B,basalelement,xyz_list,gauss);
++ GetBprime(Bprime,basalelement,xyz_list,gauss);
++ vx_input->GetInputValue(&v[0],gauss); // in 3D case, add mesh velocity
++ vy_input->GetInputValue(&v[1],gauss);
++ lsf_slopex_input->GetInputValue(&dlsf[0],gauss);
++ lsf_slopey_input->GetInputValue(&dlsf[1],gauss);
++ calvingrate_input->GetInputValue(&calvingrate,gauss);
++
++ norm_dlsf=0.;
++ for(i=0;i1.e-10)
++ for(i=0;ivalues[0],1);
++
++ /* Stabilization */
++ int stabilization=2;
++ vel=0.;
++ for(i=0;iElementSizes(&hx,&hy,&hz);
++ h=sqrt( pow(hx*v[0]/vel,2) + pow(hy*v[1]/vel,2) );
++ kappa=h*vel/2.;
++ for(row=0;rowvalues[0],1);
++ break;
++ case 2:
++ /* Streamline Upwinding */
++ basalelement->ElementSizes(&hx,&hy,&hz);
++ h=sqrt( pow(hx*v[0]/vel,2) + pow(hy*v[1]/vel,2) );
++ for(row=0;rowvalues[0],1);
++ break;
++ default:
++ _error_("unknown type of stabilization in LevelsetAnalysis.cpp");
++ }
++ }
++
++ /*Clean up and return*/
++ xDelete(xyz_list);
++ xDelete(basis);
++ xDelete(B);
++ xDelete(D);
++ xDelete(Bprime);
++ xDelete(v);
++ xDelete(w);
++ xDelete(c);
++ xDelete(dlsf);
++ delete gauss;
++ if(domaintype!=Domain2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
++ return Ke;
+ }/*}}}*/
+ ElementVector* LevelsetAnalysis::CreatePVector(Element* element){/*{{{*/
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17810-17811.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17810-17811.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17810-17811.diff (revision 17986)
@@ -0,0 +1,62 @@
+Index: ../trunk-jpl/src/m/classes/model.py
+===================================================================
+--- ../trunk-jpl/src/m/classes/model.py (revision 17810)
++++ ../trunk-jpl/src/m/classes/model.py (revision 17811)
+@@ -802,26 +802,11 @@
+ mesh=mesh2d()
+ mesh.x=md.mesh.x2d
+ mesh.y=md.mesh.y2d
+- mesh.z=numpy.zeros_like(md.mesh.x2d)
+ mesh.numberofvertices=md.mesh.numberofvertices2d
+ mesh.numberofelements=md.mesh.numberofelements2d
+ mesh.elements=md.mesh.elements2d
+ md.mesh=mesh
+
+- #Keep a trace of lower and upper nodes
+- md.mesh.lowervertex=numpy.nan
+- md.mesh.uppervertex=numpy.nan
+- md.mesh.lowerelements=numpy.nan
+- md.mesh.upperelements=numpy.nan
+-
+- #Remove old mesh
+- md.mesh.x2d=numpy.nan
+- md.mesh.y2d=numpy.nan
+- md.mesh.elements2d=numpy.nan
+- md.mesh.numberofelements2d=md.mesh.numberofelements
+- md.mesh.numberofvertices2d=md.mesh.numberofvertices
+- md.mesh.numberoflayers=0
+-
+ return md
+
+ #}}}
+Index: ../trunk-jpl/src/m/classes/model.m
+===================================================================
+--- ../trunk-jpl/src/m/classes/model.m (revision 17810)
++++ ../trunk-jpl/src/m/classes/model.m (revision 17811)
+@@ -246,26 +246,11 @@
+ mesh=mesh2d();
+ mesh.x=md.mesh.x2d;
+ mesh.y=md.mesh.y2d;
+- mesh.z=zeros(size(md.mesh.x2d));
+ mesh.numberofvertices=md.mesh.numberofvertices2d;
+ mesh.numberofelements=md.mesh.numberofelements2d;
+ mesh.elements=md.mesh.elements2d;
+ md.mesh=mesh;
+
+- %Keep a trace of lower and upper nodes
+- md.mesh.lowervertex=NaN;
+- md.mesh.uppervertex=NaN;
+- md.mesh.lowerelements=NaN;
+- md.mesh.upperelements=NaN;
+-
+- %Remove old mesh
+- md.mesh.x2d=NaN;
+- md.mesh.y2d=NaN;
+- md.mesh.elements2d=NaN;
+- md.mesh.numberofelements2d=md.mesh.numberofelements;
+- md.mesh.numberofvertices2d=md.mesh.numberofvertices;
+- md.mesh.numberoflayers=0;
+-
+ end % }}}
+ function md2 = extract(md,area) % {{{
+ %extract - extract a model according to an Argus contour or flag list
Index: /issm/oecreview/Archive/17802-17983/ISSM-17811-17812.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17811-17812.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17811-17812.diff (revision 17986)
@@ -0,0 +1,110 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17811)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17812)
+@@ -203,7 +203,48 @@
+ /*}}}*/
+ /*FUNCTION Tria::ComputeStrainRate {{{*/
+ void Tria::ComputeStrainRate(Vector* eps){
+- _error_("Not Implemented yet");
++
++ IssmDouble xyz_list[NUMVERTICES][3];
++ IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/
++ IssmDouble eps_xx[NUMVERTICES];
++ IssmDouble eps_yy[NUMVERTICES];
++ IssmDouble eps_zz[NUMVERTICES]={0,0,0};
++ IssmDouble eps_xy[NUMVERTICES];
++ IssmDouble eps_xz[NUMVERTICES]={0,0,0};
++ IssmDouble eps_yz[NUMVERTICES]={0,0,0};
++ GaussPenta* gauss=NULL;
++
++ /* Get node coordinates and dof list: */
++ ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
++
++ /*Retrieve all inputs we will be needing: */
++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
++
++ /* Start looping on the number of vertices: */
++ gauss=new GaussPenta();
++ for (int iv=0;ivGaussVertex(iv);
++
++ /*Compute strain rate viscosity and pressure: */
++ this->StrainRateSSA(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input);
++
++ eps_xx[iv]=epsilon[0];
++ eps_yy[iv]=epsilon[1];
++ eps_xy[iv]=epsilon[2];
++ }
++
++ /*Add Stress tensor components into inputs*/
++ this->inputs->AddInput(new TriaInput(StrainRatexxEnum,&eps_xx[0],P1Enum));
++ this->inputs->AddInput(new TriaInput(StrainRatexyEnum,&eps_xy[0],P1Enum));
++ this->inputs->AddInput(new TriaInput(StrainRatexzEnum,&eps_xz[0],P1Enum));
++ this->inputs->AddInput(new TriaInput(StrainRateyyEnum,&eps_yy[0],P1Enum));
++ this->inputs->AddInput(new TriaInput(StrainRateyzEnum,&eps_yz[0],P1Enum));
++ this->inputs->AddInput(new TriaInput(StrainRatezzEnum,&eps_zz[0],P1Enum));
++
++ /*Clean up and return*/
++ delete gauss;
++
+ }
+ /*}}}*/
+ /*FUNCTION Tria::ComputeStressTensor {{{*/
+Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17811)
++++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17812)
+@@ -278,8 +278,50 @@
+ /*FUNCTION Penta::ComputeStrainRate {{{*/
+ void Penta::ComputeStrainRate(Vector* eps){
+
+- _error_("Not implemented yet");
++ IssmDouble xyz_list[NUMVERTICES][3];
++ IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/
++ IssmDouble eps_xx[NUMVERTICES];
++ IssmDouble eps_yy[NUMVERTICES];
++ IssmDouble eps_zz[NUMVERTICES];
++ IssmDouble eps_xy[NUMVERTICES];
++ IssmDouble eps_xz[NUMVERTICES];
++ IssmDouble eps_yz[NUMVERTICES];
++ GaussPenta* gauss=NULL;
+
++ /* Get node coordinates and dof list: */
++ ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
++
++ /*Retrieve all inputs we will be needing: */
++ Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input);
++ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
++ Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input);
++
++ /* Start looping on the number of vertices: */
++ gauss=new GaussPenta();
++ for (int iv=0;ivGaussVertex(iv);
++
++ /*Compute strain rate viscosity and pressure: */
++ this->StrainRateFS(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input);
++
++ eps_xx[iv]=epsilon[0];
++ eps_yy[iv]=epsilon[1];
++ eps_zz[iv]=epsilon[2];
++ eps_xy[iv]=epsilon[3];
++ eps_xz[iv]=epsilon[4];
++ eps_yz[iv]=epsilon[5];
++ }
++
++ /*Add Stress tensor components into inputs*/
++ this->inputs->AddInput(new PentaInput(StrainRatexxEnum,&eps_xx[0],P1Enum));
++ this->inputs->AddInput(new PentaInput(StrainRatexyEnum,&eps_xy[0],P1Enum));
++ this->inputs->AddInput(new PentaInput(StrainRatexzEnum,&eps_xz[0],P1Enum));
++ this->inputs->AddInput(new PentaInput(StrainRateyyEnum,&eps_yy[0],P1Enum));
++ this->inputs->AddInput(new PentaInput(StrainRateyzEnum,&eps_yz[0],P1Enum));
++ this->inputs->AddInput(new PentaInput(StrainRatezzEnum,&eps_zz[0],P1Enum));
++
++ /*Clean up and return*/
++ delete gauss;
+ }
+ /*}}}*/
+ /*FUNCTION Penta::ComputeStressTensor {{{*/
Index: /issm/oecreview/Archive/17802-17983/ISSM-17812-17813.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17812-17813.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17812-17813.diff (revision 17986)
@@ -0,0 +1,104 @@
+Index: ../trunk-jpl/test/NightlyRun/test511.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test511.py (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test511.py (revision 17813)
+@@ -38,7 +38,7 @@
+
+ #Fields and tolerances to track changes
+ field_names =['Gradient','Misfits','MaterialsRheologyB','Pressure','Vel','Vx','Vy']
+-field_tolerances=[1e-11,5e-12,1e-11,1e-09,2e-12,1e-11,1e-11]
++field_tolerances=[5e-11,5e-11,5e-11,1e-09,1e-11,5e-11,1e-11]
+ field_values=[\
+ md.results.StressbalanceSolution.Gradient1,\
+ md.results.StressbalanceSolution.J,\
+Index: ../trunk-jpl/test/NightlyRun/test404.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test404.py (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test404.py (revision 17813)
+@@ -18,7 +18,7 @@
+
+ #Fields and tolerances to track changes
+ field_names =['Vx','Vy','Vz','Vel','Pressure']
+-field_tolerances=[2e-07,2e-07,2e-06,1e-06,1e-07]
++field_tolerances=[2e-07,4e-07,2e-06,1e-06,1e-07]
+ field_values=[\
+ md.results.StressbalanceSolution.Vx,\
+ md.results.StressbalanceSolution.Vy,\
+Index: ../trunk-jpl/test/NightlyRun/test427.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test427.py (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test427.py (revision 17813)
+@@ -33,7 +33,7 @@
+ 'Bed3','Surface3','Thickness3','Floatingice3']
+ field_tolerances=[1e-13,1e-13,1e-13,1e-13,\
+ 5e-12,3e-12,7e-12,2e-11,\
+- 1e-10,1e-11,1e-10,1e-13]
++ 1e-10,5e-11,1e-10,7e-10]
+ field_values=[\
+ md.results.TransientSolution[0].Base,\
+ md.results.TransientSolution[0].Surface,\
+Index: ../trunk-jpl/test/NightlyRun/test315.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test315.py (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test315.py (revision 17813)
+@@ -21,7 +21,7 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
+ field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+ 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+- 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
++ 1e-10,2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
+ field_values=[\
+ md.results.TransientSolution[0].Vx,\
+ md.results.TransientSolution[0].Vy,\
+Index: ../trunk-jpl/test/NightlyRun/test427.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test427.m (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test427.m (revision 17813)
+@@ -23,7 +23,7 @@
+ 'Bed3','Surface3','Thickness3','Floatingice3'};
+ field_tolerances={1e-13,1e-13,1e-13,1e-13,...
+ 5e-12,3e-12,7e-12,2e-11,...
+- 1e-10,3e-11,1e-10,7e-11};
++ 1e-10,5e-11,1e-10,7e-10};
+ field_values={...
+ (md.results.TransientSolution(1).Base),...
+ (md.results.TransientSolution(1).Surface),...
+Index: ../trunk-jpl/test/NightlyRun/test404.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test404.m (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test404.m (revision 17813)
+@@ -8,7 +8,7 @@
+
+ %Fields and tolerances to track changes
+ field_names ={'Vx','Vy','Vz','Vel','Pressure'};
+-field_tolerances={2e-07,2e-07,2e-06,1e-06,1e-07};
++field_tolerances={2e-07,5e-07,2e-06,1e-06,1e-07};
+ field_values={...
+ (md.results.StressbalanceSolution.Vx),...
+ (md.results.StressbalanceSolution.Vy),...
+Index: ../trunk-jpl/test/NightlyRun/test511.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test511.m (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test511.m (revision 17813)
+@@ -27,7 +27,7 @@
+
+ %Fields and tolerances to track changes
+ field_names ={'Gradient','Misfits','MaterialsRheologyB','Pressure','Vel','Vx','Vy'};
+-field_tolerances={1e-11,5e-12,1e-11,1e-09,2e-12,1e-11,1e-11};
++field_tolerances={5e-11,5e-11,5e-11,1e-09,1e-11,5e-11,1e-11};
+ field_values={...
+ (md.results.StressbalanceSolution.Gradient1),...
+ (md.results.StressbalanceSolution.J),...
+Index: ../trunk-jpl/test/NightlyRun/test315.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test315.m (revision 17812)
++++ ../trunk-jpl/test/NightlyRun/test315.m (revision 17813)
+@@ -12,7 +12,7 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
+ field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
+ 1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
+- 1e-10,1.5e-13,1.5e-13,1.5e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
++ 1e-10,2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+ field_values={...
+ (md.results.TransientSolution(1).Vx),...
+ (md.results.TransientSolution(1).Vy),...
Index: /issm/oecreview/Archive/17802-17983/ISSM-17813-17814.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17813-17814.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17813-17814.diff (revision 17986)
@@ -0,0 +1,24 @@
+Index: ../trunk-jpl/jenkins/linux64_murdo_ad
+===================================================================
+--- ../trunk-jpl/jenkins/linux64_murdo_ad (revision 17813)
++++ ../trunk-jpl/jenkins/linux64_murdo_ad (revision 17814)
+@@ -15,6 +15,7 @@
+ --prefix=$ISSM_DIR \
+ --without-kriging \
+ --without-kml \
++ --without-Gia \
+ --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+ --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+ --with-matlab-dir=$MATLAB_DIR \
+Index: ../trunk-jpl/jenkins/linux64_murdo_ampi
+===================================================================
+--- ../trunk-jpl/jenkins/linux64_murdo_ampi (revision 17813)
++++ ../trunk-jpl/jenkins/linux64_murdo_ampi (revision 17814)
+@@ -15,6 +15,7 @@
+ ISSM_CONFIG='--prefix=$ISSM_DIR\
+ --without-kriging \
+ --without-kml \
++ --without-Gia \
+ --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+ --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+ --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
Index: /issm/oecreview/Archive/17802-17983/ISSM-17814-17815.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17814-17815.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17814-17815.diff (revision 17986)
@@ -0,0 +1,12 @@
+Index: ../trunk-jpl/jenkins/windows
+===================================================================
+--- ../trunk-jpl/jenkins/windows (revision 17814)
++++ ../trunk-jpl/jenkins/windows (revision 17815)
+@@ -14,6 +14,7 @@
+ #ISSM CONFIGURATION
+ ISSM_CONFIG='--prefix=$ISSM_DIR \
+ --disable-static \
++ --without-Gia \
+ --with-vendor=intel-win7-64 \
+ --with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \
+ --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
Index: /issm/oecreview/Archive/17802-17983/ISSM-17815-17816.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17815-17816.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17815-17816.diff (revision 17986)
@@ -0,0 +1,38 @@
+Index: ../trunk-jpl/src/c/shared/Elements/Arrhenius.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Elements/Arrhenius.cpp (revision 17815)
++++ ../trunk-jpl/src/c/shared/Elements/Arrhenius.cpp (revision 17816)
+@@ -33,6 +33,7 @@
+
+ /*convert temperature to absolute temperature*/
+ _assert_(depth>0);
++ printf("temperature = %g beta = %g depth = %g\n",temperature,beta,depth);
+ Tstar=temperature-beta*depth;
+ _assert_(Tstar>0);
+
+Index: ../trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp
+===================================================================
+--- ../trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp (revision 17815)
++++ ../trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp (revision 17816)
+@@ -67,7 +67,7 @@
+ uf=old_uf->Duplicate(); old_uf->Copy(uf);
+
+ /*Prepare next iteration using Newton's method*/
+- SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);delete df;
++ SystemMatricesx(&Kff,&Kfs,&pf,&df,&kmax,femmodel);delete df;
+ CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
+ Reduceloadx(pf,Kfs,ys);delete Kfs;
+
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17815)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17816)
+@@ -149,7 +149,7 @@
+ /*FUNCTION Tria::ComputeSigmaNN {{{*/
+ void Tria::ComputeSigmaNN(){
+
+- if(~IsOnBase()){
++ if(!IsOnBase()){
+ IssmDouble sigma_nn=0;
+ this->inputs->AddInput(new TriaInput(SigmaNNEnum,&sigma_nn,P0Enum));
+ return;
Index: /issm/oecreview/Archive/17802-17983/ISSM-17816-17817.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17816-17817.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17816-17817.diff (revision 17986)
@@ -0,0 +1,48 @@
+Index: ../trunk-jpl/src/m/classes/damage.py
+===================================================================
+--- ../trunk-jpl/src/m/classes/damage.py (revision 17816)
++++ ../trunk-jpl/src/m/classes/damage.py (revision 17817)
+@@ -23,12 +23,12 @@
+ self.max_damage = float('NaN')
+
+ #numerical
+- stabilization = float('NaN')
+- maxiter = float('NaN')
+- elementinterp = ''
+- penalty_threshold = float('NaN')
+- penalty_lock = float('NaN')
+- penalty_factor = float('NaN')
++ self.stabilization = float('NaN')
++ self.maxiter = float('NaN')
++ self.elementinterp = ''
++ self.penalty_threshold = float('NaN')
++ self.penalty_lock = float('NaN')
++ self.penalty_factor = float('NaN')
+
+ #general parameters for evolution law:
+ self.stress_threshold = float('NaN')
+@@ -58,7 +58,7 @@
+
+ s+="%s\n" % fielddisplay(self,"stabilization","0: no, 1: artificial_diffusivity, 2: SUPG")
+ s+="%s\n" % fielddisplay(self,"maxiter","maximum number of non linear iterations")
+- s+="%s\n" % fielddisplay(self,"elementinterp","interpolation scheme for finite elements {''P1'',''P2''}")
++ s+="%s\n" % fielddisplay(self,"elementinterp","interpolation scheme for finite elements [''P1'',''P2'']")
+ s+="%s\n" % fielddisplay(self,"penalty_lock","stabilize unstable damage constraints that keep zigzagging after n iteration (default is 0, no stabilization)")
+ s+="%s\n" % fielddisplay(self,"penalty_threshold","threshold to declare convergence of damage evolution solution (default is 0)")
+ s+="%s\n" % fielddisplay(self,"penalty_factor","scaling exponent (default is 3)")
+@@ -133,7 +133,6 @@
+ md = checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0)
+ md = checkfield(md,'fieldname','damage.law','values',['undamaged','pralong'])
+ md = checkfield(md,'fieldname','damage.spcdamage','forcing',1)
+-
+ md = checkfield(md,'fieldname','damage.stabilization','numel',[1],'values',[0,1,2])
+ md = checkfield(md,'fieldname','damage.maxiter','>=0',0)
+ md = checkfield(md,'fieldname','damage.elementinterp','values',['P1','P2'])
+@@ -165,7 +164,6 @@
+ WriteData(fid,'object',self,'fieldname','law','format','String')
+ WriteData(fid,'object',self,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
+ WriteData(fid,'object',self,'fieldname','max_damage','format','Double')
+-
+ WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
+ WriteData(fid,'object',self,'fieldname','elementinterp','format','String')
+ WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
Index: /issm/oecreview/Archive/17802-17983/ISSM-17817-17818.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17817-17818.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17817-17818.diff (revision 17986)
@@ -0,0 +1,14 @@
+Index: ../trunk-jpl/src/m/mech/mechanicalproperties.py
+===================================================================
+--- ../trunk-jpl/src/m/mech/mechanicalproperties.py (revision 17817)
++++ ../trunk-jpl/src/m/mech/mechanicalproperties.py (revision 17818)
+@@ -75,7 +75,8 @@
+ location=npy.nonzero(npy.logical_and(second_inv==0,power!=0))
+ nu[location]=10^18
+ elif 'matdamageice' in md.materials.__module__:
+- Zinv=npy.dot(md.materials.rheology_Z[index-1],summation/3.).reshape(-1,)
++ print 'computing damage-dependent properties!'
++ Zinv=npy.dot(1-md.damage.D[index-1],summation/3.).reshape(-1,)
+ location=npy.nonzero(second_inv)
+ nu[location]=Zinv[location]*B_bar[location]/npy.power(second_inv[location],power[location])
+ location=npy.nonzero(npy.logical_and(second_inv==0,power==0))
Index: /issm/oecreview/Archive/17802-17983/ISSM-17818-17819.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17818-17819.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17818-17819.diff (revision 17986)
@@ -0,0 +1,25 @@
+Index: ../trunk-jpl/src/m/plot/plotmodel.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/plotmodel.py (revision 17818)
++++ ../trunk-jpl/src/m/plot/plotmodel.py (revision 17819)
+@@ -41,8 +41,10 @@
+ ncols=options.list[0].getfieldvalue('ncols')
+ nc=True
+ else:
+- ncols=subplotwidth
++ ncols=int(subplotwidth)
+ nc=False
++ ncols=int(ncols)
++ nrows=int(nrows)
+
+ #check that nrows and ncols were given at the same time!
+ if not nr==nc:
+@@ -70,7 +72,7 @@
+ add_all=True,
+ share_all=True,
+ label_mode='all',
+- cbar_mode='single',
++ cbar_mode='each',
+ cbar_location='right',
+ cbar_size='5%',
+ cbar_pad=0.05
Index: /issm/oecreview/Archive/17802-17983/ISSM-17819-17820.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17819-17820.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17819-17820.diff (revision 17986)
@@ -0,0 +1,25 @@
+Index: ../trunk-jpl/src/m/plot/plot_manager.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/plot_manager.py (revision 17819)
++++ ../trunk-jpl/src/m/plot/plot_manager.py (revision 17820)
+@@ -59,6 +59,7 @@
+ return
+ elif data.lower()=='none':
+ print 'no data provided to plot (TODO: write plot_none.py)'
++ applyoptions(md,[],options,fig,ax)
+ return
+ else:
+ print "WARNING: '%s' is not implemented or is not a valid string for option 'data'" % data
+Index: ../trunk-jpl/src/m/plot/plotmodel.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/plotmodel.py (revision 17819)
++++ ../trunk-jpl/src/m/plot/plotmodel.py (revision 17820)
+@@ -64,7 +64,7 @@
+ fig=plt.figure(figurenumber,tight_layout=True)
+ fig.clf()
+
+- # options to pass: axes_pad, share_all, label_mode ("1","L","all"), cbar_mode (none,single,each), cbar_location(right,top)
++ # options to pass/construct: axes_pad, share_all, label_mode ("1","L","all"), cbar_mode (none,single,each), cbar_location(right,top)
+ axgrid=ImageGrid(fig, 111,
+ nrows_ncols=(nrows,ncols),
+ direction='row',
Index: /issm/oecreview/Archive/17802-17983/ISSM-17820-17821.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17820-17821.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17820-17821.diff (revision 17986)
@@ -0,0 +1,33 @@
+Index: ../trunk-jpl/externalpackages/latex2html/install.sh
+===================================================================
+--- ../trunk-jpl/externalpackages/latex2html/install.sh (revision 0)
++++ ../trunk-jpl/externalpackages/latex2html/install.sh (revision 17821)
+@@ -0,0 +1,21 @@
++#!/bin/bash
++set -eu
++
++#Some cleanup
++rm -rf install src latex2html-2008
++
++#Download from ISSM server
++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://www.latex2html.org/~latex2ht/current/latex2html-2008.tar.gz' 'latex2html-2008.tar.gz'
++
++#untar
++tar -zxvf latex2html-2008.tar.gz
++mv latex2html-2008 install
++
++#Configure
++cd install
++./configure --prefix "$ISSM_DIR/externalpackages/latex2html/install/"
++exit 0
++
++#Install
++make
++make install
+
+Property changes on: ../trunk-jpl/externalpackages/latex2html/install.sh
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
Index: /issm/oecreview/Archive/17802-17983/ISSM-17821-17822.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17821-17822.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17821-17822.diff (revision 17986)
@@ -0,0 +1,45 @@
+Index: ../trunk-jpl/src/m/plot/plotmodel.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/plotmodel.py (revision 17821)
++++ ../trunk-jpl/src/m/plot/plotmodel.py (revision 17822)
+@@ -63,19 +63,29 @@
+ else:
+ fig=plt.figure(figurenumber,tight_layout=True)
+ fig.clf()
+-
+- # options to pass/construct: axes_pad, share_all, label_mode ("1","L","all"), cbar_mode (none,single,each), cbar_location(right,top)
++
++ # options needed to define plot grid
++ direction=options.list[0].getfieldvalue('direction','row') # row,column
++ axes_pad=options.list[0].getfieldvalue('axes_pad',0.05)
++ add_all=options.list[0].getfieldvalue('add_all',True) # True,False
++ share_all=options.list[0].getfieldvalue('share_all',True) # True,False
++ label_mode=options.list[0].getfieldvalue('label_mode','1') # 1,L,all
++ cbar_mode=options.list[0].getfieldvalue('cbar_mode','each') # none,single,each
++ cbar_location=options.list[0].getfieldvalue('cbar_location','right') # right,top
++ cbar_size=options.list[0].getfieldvalue('cbar_size','5%')
++ cbar_pad=options.list[0].getfieldvalue('cbar_pad','5%') # None or %
++
+ axgrid=ImageGrid(fig, 111,
+ nrows_ncols=(nrows,ncols),
+- direction='row',
+- axes_pad=0.05,
+- add_all=True,
+- share_all=True,
+- label_mode='all',
+- cbar_mode='each',
+- cbar_location='right',
+- cbar_size='5%',
+- cbar_pad=0.05
++ direction=direction,
++ axes_pad=axes_pad,
++ add_all=add_all,
++ share_all=share_all,
++ label_mode=label_mode,
++ cbar_mode=cbar_mode,
++ cbar_location=cbar_location,
++ cbar_size=cbar_size,
++ cbar_pad=cbar_pad
+ )
+
+ for i in xrange(numberofplots):
Index: /issm/oecreview/Archive/17802-17983/ISSM-17822-17823.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17822-17823.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17822-17823.diff (revision 17986)
@@ -0,0 +1,78 @@
+Index: ../trunk-jpl/test/NightlyRun/test211.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.py (revision 17822)
++++ ../trunk-jpl/test/NightlyRun/test211.py (revision 17823)
+@@ -27,7 +27,7 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
+ field_tolerances=[\
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\
+- 5e-08,3e-08,1e-06,3e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,\
++ 5e-08,5e-08,1e-05,3e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,\
+ 1e-07,1e-07,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06]
+ field_values=[\
+ md.results.TransientSolution[0].Vx,\
+Index: ../trunk-jpl/test/NightlyRun/test274.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test274.py (revision 17822)
++++ ../trunk-jpl/test/NightlyRun/test274.py (revision 17823)
+@@ -26,7 +26,7 @@
+
+ #Fields and tolerances to track changes
+ field_names =['Vx','Vy','Vel','Pressure']
+-field_tolerances=[4.5e-8,1.35e-8,1.55e-8,1e-11]
++field_tolerances=[7e-8,3e-8,3e-8,1e-11]
+ field_values=[\
+ md.results.StressbalanceSolution.Vx,\
+ md.results.StressbalanceSolution.Vy,\
+Index: ../trunk-jpl/test/NightlyRun/test274.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test274.m (revision 17822)
++++ ../trunk-jpl/test/NightlyRun/test274.m (revision 17823)
+@@ -13,7 +13,7 @@
+
+ %Fields and tolerances to track changes
+ field_names ={'Vx','Vy','Vel','Pressure'};
+-field_tolerances={5.0e-8,2.0e-8,2.0e-8,1e-11};
++field_tolerances={7e-8,3e-8,3e-8,1e-11};
+ field_values={...
+ (md.results.StressbalanceSolution.Vx),...
+ (md.results.StressbalanceSolution.Vy),...
+Index: ../trunk-jpl/test/NightlyRun/test285.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test285.m (revision 17822)
++++ ../trunk-jpl/test/NightlyRun/test285.m (revision 17823)
+@@ -12,7 +12,7 @@
+ md.flowequation.fe_HO=i{1};
+ md=solve(md,StressbalanceSolutionEnum());
+ field_names ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vz' i{1}],['Vel' i{1}],['Pressure' i{1}]};
+- field_tolerances={field_tolerances{:},6e-08,4e-08,2e-08,4e-08,1e-13};
++ field_tolerances={field_tolerances{:},6e-08,5e-08,2e-08,5e-08,1e-13};
+ field_values={field_values{:},...
+ (md.results.StressbalanceSolution.Vx),...
+ (md.results.StressbalanceSolution.Vy),...
+Index: ../trunk-jpl/test/NightlyRun/test285.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test285.py (revision 17822)
++++ ../trunk-jpl/test/NightlyRun/test285.py (revision 17823)
+@@ -22,7 +22,7 @@
+ md.flowequation.fe_HO=i
+ md=solve(md,StressbalanceSolutionEnum())
+ field_names =field_names+['Vx'+i,'Vy'+i,'Vz'+i,'Vel'+i,'Pressure'+i]
+- field_tolerances=field_tolerances+[6e-08,4e-08,2e-08,4e-08,1e-13]
++ field_tolerances=field_tolerances+[6e-08,5e-08,2e-08,5e-08,1e-13]
+ field_values=field_values+[\
+ md.results.StressbalanceSolution.Vx,\
+ md.results.StressbalanceSolution.Vy,\
+Index: ../trunk-jpl/test/NightlyRun/test211.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.m (revision 17822)
++++ ../trunk-jpl/test/NightlyRun/test211.m (revision 17823)
+@@ -14,7 +14,7 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
+ field_tolerances={...
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,...
+- 5e-08,3e-08,1e-06,3e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,...
++ 5e-08,5e-08,1e-05,3e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,...
+ 1e-07,1e-07,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06};
+ field_values={...
+ (md.results.TransientSolution(1).Vx),...
Index: /issm/oecreview/Archive/17802-17983/ISSM-17823-17824.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17823-17824.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17823-17824.diff (revision 17986)
@@ -0,0 +1,12 @@
+Index: ../trunk-jpl/src/c/shared/Elements/Arrhenius.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Elements/Arrhenius.cpp (revision 17823)
++++ ../trunk-jpl/src/c/shared/Elements/Arrhenius.cpp (revision 17824)
+@@ -33,7 +33,6 @@
+
+ /*convert temperature to absolute temperature*/
+ _assert_(depth>0);
+- printf("temperature = %g beta = %g depth = %g\n",temperature,beta,depth);
+ Tstar=temperature-beta*depth;
+ _assert_(Tstar>0);
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17824-17825.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17824-17825.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17824-17825.diff (revision 17986)
@@ -0,0 +1,26 @@
+Index: ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp
+===================================================================
+--- ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17824)
++++ ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17825)
+@@ -424,17 +424,15 @@
+
+ /*Get inputs*/
+ if(converged){
+- IssmDouble penalty_factor,kmax,kappa,h_max;
+- IssmDouble rho_freshwater,rho_ice;
+- IssmDouble g;
++ IssmDouble penalty_factor,kmax,kappa,h_max;
+ IssmDouble* thickness = xNew(numnodes);
+ IssmDouble* base = xNew(numnodes);
+
+ basalelement->FindParam(&kmax,HydrologySedimentKmaxEnum);
+ basalelement->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum);
+- basalelement->GetMaterialParameter(MaterialsRhoFreshwaterEnum);
+- basalelement->GetMaterialParameter(MaterialsRhoIceEnum);
+- basalelement->GetMaterialParameter(ConstantsGEnum);
++ IssmDouble rho_freshwater = basalelement->GetMaterialParameter(MaterialsRhoFreshwaterEnum);
++ IssmDouble rho_ice = basalelement->GetMaterialParameter(MaterialsRhoIceEnum);
++ IssmDouble g = basalelement->GetMaterialParameter(ConstantsGEnum);
+
+ basalelement->GetInputListOnVertices(thickness,ThicknessEnum);
+ basalelement->GetInputListOnVertices(base,BaseEnum);
Index: /issm/oecreview/Archive/17802-17983/ISSM-17825-17826.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17825-17826.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17825-17826.diff (revision 17986)
@@ -0,0 +1,26 @@
+Index: ../trunk-jpl/test/NightlyRun/test211.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.py (revision 17825)
++++ ../trunk-jpl/test/NightlyRun/test211.py (revision 17826)
+@@ -27,7 +27,7 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
+ field_tolerances=[\
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\
+- 5e-08,5e-08,1e-05,3e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,\
++ 5e-08,5e-08,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,\
+ 1e-07,1e-07,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06]
+ field_values=[\
+ md.results.TransientSolution[0].Vx,\
+Index: ../trunk-jpl/test/NightlyRun/test211.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.m (revision 17825)
++++ ../trunk-jpl/test/NightlyRun/test211.m (revision 17826)
+@@ -14,7 +14,7 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
+ field_tolerances={...
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,...
+- 5e-08,5e-08,1e-05,3e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,...
++ 5e-08,5e-08,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,...
+ 1e-07,1e-07,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06};
+ field_values={...
+ (md.results.TransientSolution(1).Vx),...
Index: /issm/oecreview/Archive/17802-17983/ISSM-17826-17827.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17826-17827.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17826-17827.diff (revision 17986)
@@ -0,0 +1,110 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Element.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17827)
+@@ -201,6 +201,7 @@
+ virtual void InputDepthAverageAtBase(int enum_type,int average_enum_type)=0;
+ virtual void ComputeSigmaNN(void)=0;
+ virtual void ComputeBasalStress(Vector* sigma_b)=0;
++ virtual void ComputeStrainRate()=0;
+ virtual void ComputeStrainRate(Vector* eps)=0;
+ virtual void ComputeStressTensor(void)=0;
+ virtual void ComputeDeviatoricStressTensor(void)=0;
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17827)
+@@ -202,7 +202,7 @@
+ }
+ /*}}}*/
+ /*FUNCTION Tria::ComputeStrainRate {{{*/
+-void Tria::ComputeStrainRate(Vector* eps){
++void Tria::ComputeStrainRate(){
+
+ IssmDouble xyz_list[NUMVERTICES][3];
+ IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17827)
+@@ -52,7 +52,8 @@
+ IssmDouble CharacteristicLength(void);
+ void ComputeBasalStress(Vector* sigma_b);
+ void ComputeSigmaNN();
+- void ComputeStrainRate(Vector* eps);
++ void ComputeStrainRate();
++ void ComputeStrainRate(Vector* eps){_error_("not implemented yet");};
+ void ComputeStressTensor();
+ void ComputeDeviatoricStressTensor();
+ void ComputeSurfaceNormalVelocity();
+Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17827)
+@@ -276,7 +276,7 @@
+ }
+ /*}}}*/
+ /*FUNCTION Penta::ComputeStrainRate {{{*/
+-void Penta::ComputeStrainRate(Vector* eps){
++void Penta::ComputeStrainRate(){
+
+ IssmDouble xyz_list[NUMVERTICES][3];
+ IssmDouble epsilon[6]; /* epsilon=[exx,eyy,exy];*/
+Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17827)
+@@ -54,7 +54,8 @@
+ void BasalFrictionCreateInput(void);
+ IssmDouble CharacteristicLength(void){_error_("not implemented yet");};
+ void ComputeBasalStress(Vector* sigma_b);
+- void ComputeStrainRate(Vector* eps);
++ void ComputeStrainRate();
++ void ComputeStrainRate(Vector* eps){_error_("not implemented yet");};
+ void ComputeSigmaNN(){_error_("not implemented yet");};
+ void ComputeStressTensor();
+ void ComputeDeviatoricStressTensor();
+Index: ../trunk-jpl/src/c/classes/Elements/Seg.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17827)
+@@ -54,6 +54,7 @@
+ IssmDouble CharacteristicLength(void);
+ void ComputeBasalStress(Vector* sigma_b){_error_("not implemented yet");};
+ void ComputeSigmaNN(){_error_("not implemented yet");};
++ void ComputeStrainRate(){_error_("not implemented yet");};
+ void ComputeStrainRate(Vector* eps){_error_("not implemented yet");};
+ void ComputeStressTensor(){_error_("not implemented yet");};
+ void ComputeDeviatoricStressTensor(){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Tetra.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17827)
+@@ -54,6 +54,7 @@
+ IssmDouble CharacteristicLength(void){_error_("not implemented yet");};
+ void ComputeBasalStress(Vector* sigma_b){_error_("not implemented yet");};
+ void ComputeSigmaNN(){_error_("not implemented yet");};
++ void ComputeStrainRate(){_error_("not implemented yet");};
+ void ComputeStrainRate(Vector* eps){_error_("not implemented yet");};
+ void ComputeStressTensor(){_error_("not implemented yet");};
+ void ComputeDeviatoricStressTensor(){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17826)
++++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17827)
+@@ -817,6 +817,15 @@
+ this->ComputeStressTensor();
+ input=this->inputs->GetInput(output_enum);
+ break;
++ case StrainRatexxEnum:
++ case StrainRatexyEnum:
++ case StrainRatexzEnum:
++ case StrainRateyyEnum:
++ case StrainRateyzEnum:
++ case StrainRatezzEnum:
++ this->ComputeStrainRate();
++ input=this->inputs->GetInput(output_enum);
++ break;
+ case DeviatoricStressxxEnum:
+ case DeviatoricStressxyEnum:
+ case DeviatoricStressxzEnum:
Index: /issm/oecreview/Archive/17802-17983/ISSM-17827-17828.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17827-17828.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17827-17828.diff (revision 17986)
@@ -0,0 +1,32 @@
+Index: ../trunk-jpl/test/NightlyRun/test3001.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test3001.m (revision 17827)
++++ ../trunk-jpl/test/NightlyRun/test3001.m (revision 17828)
+@@ -3,7 +3,7 @@
+ md=parameterize(md,'../Par/SquareShelfConstrained.par');
+ md=setflowequation(md,'SSA','all');
+ md.cluster=generic('name',oshostname(),'np',1);
+-md.stressbalance.requested_outputs={'default','StressTensorxx','StressTensoryy','StressTensorxy'};
++md.stressbalance.requested_outputs={'default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'};
+ md.autodiff.isautodiff=true;
+ md.toolkits.DefaultAnalysis=issmgslsolver();
+
+@@ -19,7 +19,7 @@
+ (md.results.StressbalanceSolution.Vy),...
+ (md.results.StressbalanceSolution.Vel),...
+ (md.results.StressbalanceSolution.Pressure),...
+- (md.results.StressbalanceSolution.StressTensorxx),...
+- (md.results.StressbalanceSolution.StressTensoryy),...
+- (md.results.StressbalanceSolution.StressTensorxy),...
++ (md.results.StressbalanceSolution.DeviatoricStressxx),...
++ (md.results.StressbalanceSolution.DeviatoricStressyy),...
++ (md.results.StressbalanceSolution.DeviatoricStressxy),...
+ };
+Index: ../trunk-jpl/test/Archives/Archive3001.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive3004.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: /issm/oecreview/Archive/17802-17983/ISSM-17828-17829.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17828-17829.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17828-17829.diff (revision 17986)
@@ -0,0 +1,39 @@
+Index: ../trunk-jpl/test/NightlyRun/test804.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test804.py (revision 17828)
++++ ../trunk-jpl/test/NightlyRun/test804.py (revision 17829)
+@@ -31,7 +31,7 @@
+ 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',\
+ 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3']
+ 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,\
++ 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,\
+ 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13]
+ field_values=[\
+ md.results.TransientSolution[0].Vx,\
+Index: ../trunk-jpl/test/NightlyRun/test804.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test804.m (revision 17828)
++++ ../trunk-jpl/test/NightlyRun/test804.m (revision 17829)
+@@ -21,7 +21,7 @@
+ 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',...
+ 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'};
+ 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,...
++ 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,...
+ 2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13};
+ field_values={...
+ md.results.TransientSolution(1).Vx,...
+Index: ../trunk-jpl/jenkins/windows
+===================================================================
+--- ../trunk-jpl/jenkins/windows (revision 17828)
++++ ../trunk-jpl/jenkins/windows (revision 17829)
+@@ -100,7 +100,7 @@
+ #ex: "'id',[101 102 103]"
+
+ #In Windows, we don't yet have MUMPS, can't do full stokes, so exclude all FS runs. Also exclude all runs with Dakota. And exclude higher order runs that have penalties.
+-MATLAB_NROPTIONS="'exclude',[104, 124, 204, 211, 215, 220, 221, 285, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 701, 702, 703, 218, 234, 235, 412, 413, 414, 417, 418, 420, 205, 274, 331, 405, 409, 455, 612, 514, 435]"
++MATLAB_NROPTIONS="'exclude',[104, 124, 204, 211, 215, 220, 221, 285, 290, 308, 322, 404, 421, 422, 503, 507, 510, 511, 701, 702, 703, 218, 234, 235, 412, 413, 414, 417, 418, 420, 205, 274, 331, 405, 409, 455, 612, 514, 435 280]"
+ PYTHON_NROPTIONS=""
+
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17829-17830.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17829-17830.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17829-17830.diff (revision 17986)
@@ -0,0 +1,118 @@
+Index: ../trunk-jpl/test/NightlyRun/test3001.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test3001.m (revision 17829)
++++ ../trunk-jpl/test/NightlyRun/test3001.m (revision 17830)
+@@ -11,7 +11,7 @@
+
+ %Fields and tolerances to track changes
+ field_names ={'Vx','Vy','Vel','Pressure',...
+- 'StressTensorxx','StressTensoryy','StressTensorxy'};
++ 'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'};
+ field_tolerances={1e-13,1e-13,1e-13,1e-13,...
+ 1e-13,1e-13,1e-13};
+ field_values={...
+Index: ../trunk-jpl/test/NightlyRun/test3101.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test3101.m (revision 17829)
++++ ../trunk-jpl/test/NightlyRun/test3101.m (revision 17830)
+@@ -3,7 +3,7 @@
+ md=parameterize(md,'../Par/SquareShelfConstrained.par');
+ md=setflowequation(md,'SSA','all');
+ md.cluster=generic('name',oshostname(),'np',3);
+-md.stressbalance.requested_outputs={'default','StressTensorxx','StressTensoryy','StressTensorxy'};
++md.stressbalance.requested_outputs={'default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'};
+ md.autodiff.isautodiff=true;
+ md.toolkits.DefaultAnalysis=issmmumpssolver();
+
+@@ -11,7 +11,7 @@
+
+ %Fields and tolerances to track changes
+ field_names ={'Vx','Vy','Vel','Pressure',...
+- 'StressTensorxx','StressTensoryy','StressTensorxy'};
++ 'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'};
+ field_tolerances={1e-13,1e-13,1e-13,1e-13,...
+ 1e-13,1e-13,1e-13};
+ field_values={...
+@@ -19,7 +19,7 @@
+ (md.results.StressbalanceSolution.Vy),...
+ (md.results.StressbalanceSolution.Vel),...
+ (md.results.StressbalanceSolution.Pressure),...
+- (md.results.StressbalanceSolution.StressTensorxx),...
+- (md.results.StressbalanceSolution.StressTensoryy),...
+- (md.results.StressbalanceSolution.StressTensorxy),...
++ (md.results.StressbalanceSolution.DeviatoricStressxx),...
++ (md.results.StressbalanceSolution.DeviatoricStressyy),...
++ (md.results.StressbalanceSolution.DeviatoricStressxy),...
+ };
+Index: ../trunk-jpl/test/NightlyRun/test3001.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test3001.py (revision 17829)
++++ ../trunk-jpl/test/NightlyRun/test3001.py (revision 17830)
+@@ -12,14 +12,14 @@
+ md=parameterize(md,'../Par/SquareShelfConstrained.py')
+ md=setflowequation(md,'SSA','all')
+ md.cluster=generic('name',oshostname(),'np',1)
+-md.stressbalance.requested_outputs=['default','StressTensorxx','StressTensoryy','StressTensorxy']
++md.stressbalance.requested_outputs=['default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy']
+ md.toolkits.DefaultAnalysis=issmgslsolver()
+ md.autodiff.isautodiff=True
+ md=solve(md,StressbalanceSolutionEnum())
+
+ #Fields and tolerances to track changes
+ field_names =['Vx','Vy','Vel','Pressure',\
+- 'StressTensorxx','StressTensoryy','StressTensorxy']
++ 'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy']
+ field_tolerances=[1e-13,1e-13,1e-13,1e-13,\
+ 1e-13,1e-13,1e-13]
+ field_values=[\
+@@ -27,7 +27,7 @@
+ md.results.StressbalanceSolution.Vy,\
+ md.results.StressbalanceSolution.Vel,\
+ md.results.StressbalanceSolution.Pressure,\
+- md.results.StressbalanceSolution.StressTensorxx,\
+- md.results.StressbalanceSolution.StressTensoryy,\
+- md.results.StressbalanceSolution.StressTensorxy,\
++ md.results.StressbalanceSolution.DeviatoricStressxx,\
++ md.results.StressbalanceSolution.DeviatoricStressyy,\
++ md.results.StressbalanceSolution.DeviatoricStressxy,\
+ ]
+Index: ../trunk-jpl/test/NightlyRun/test3101.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test3101.py (revision 17829)
++++ ../trunk-jpl/test/NightlyRun/test3101.py (revision 17830)
+@@ -12,14 +12,14 @@
+ md=parameterize(md,'../Par/SquareShelfConstrained.py')
+ md=setflowequation(md,'SSA','all')
+ md.cluster=generic('name',oshostname(),'np',3)
+-md.stressbalance.requested_outputs=['StressTensor']
++md.stressbalance.requested_outputs=['default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy']
+ md.toolkits.DefaultAnalysis=issmmumpssolver()
+ md.autodiff.isautodiff=True
+ md=solve(md,StressbalanceSolutionEnum())
+
+ #Fields and tolerances to track changes
+ field_names =['Vx','Vy','Vel','Pressure',\
+- 'StressTensorxx','StressTensoryy','StressTensorxy']
++ 'DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy']
+ field_tolerances=[1e-13,1e-13,1e-13,1e-13,\
+ 1e-13,1e-13,1e-13]
+ field_values=[\
+@@ -27,7 +27,7 @@
+ md.results.StressbalanceSolution.Vy,\
+ md.results.StressbalanceSolution.Vel,\
+ md.results.StressbalanceSolution.Pressure,\
+- md.results.StressbalanceSolution.StressTensorxx,\
+- md.results.StressbalanceSolution.StressTensoryy,\
+- md.results.StressbalanceSolution.StressTensorxy,\
++ md.results.StressbalanceSolution.DeviatoricStressxx,\
++ md.results.StressbalanceSolution.DeviatoricStressyy,\
++ md.results.StressbalanceSolution.DeviatoricStressxy,\
+ ]
+Index: ../trunk-jpl/test/Archives/Archive3101.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive3104.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: /issm/oecreview/Archive/17802-17983/ISSM-17830-17831.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17830-17831.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17830-17831.diff (revision 17986)
@@ -0,0 +1,887 @@
+Index: ../trunk-jpl/src/c/analyses/EnumToAnalysis.cpp
+===================================================================
+--- ../trunk-jpl/src/c/analyses/EnumToAnalysis.cpp (revision 17830)
++++ ../trunk-jpl/src/c/analyses/EnumToAnalysis.cpp (revision 17831)
+@@ -22,6 +22,9 @@
+ #ifdef _HAVE_BALANCETHICKNESS_
+ case BalancethicknessAnalysisEnum : return new BalancethicknessAnalysis();
+ #endif
++ #ifdef _HAVE_BALANCETHICKNESS2_
++ case Balancethickness2AnalysisEnum : return new Balancethickness2Analysis();
++ #endif
+ #ifdef _HAVE_BALANCETHICKNESSSOFT_
+ case BalancethicknessSoftAnalysisEnum : return new BalancethicknessSoftAnalysis();
+ #endif
+Index: ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.h
+===================================================================
+--- ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.h (revision 0)
++++ ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.h (revision 17831)
+@@ -0,0 +1,35 @@
++/*! \file Balancethickness2Analysis.h
++ * \brief: header file for generic external result object
++ */
++
++#ifndef _Balancethickness2Analysis_
++#define _Balancethickness2Analysis_
++
++/*Headers*/
++#include "./Analysis.h"
++
++class Balancethickness2Analysis: public Analysis{
++
++ public:
++ /*Model processing*/
++ int DofsPerNode(int** doflist,int domaintype,int approximation);
++ void UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum);
++ void UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type);
++ void CreateNodes(Nodes* nodes,IoModel* iomodel);
++ void CreateConstraints(Constraints* constraints,IoModel* iomodel);
++ void CreateLoads(Loads* loads, IoModel* iomodel);
++
++ /*Finite element Analysis*/
++ void Core(FemModel* femmodel);
++ ElementVector* CreateDVector(Element* element);
++ ElementMatrix* CreateJacobianMatrix(Element* element);
++ ElementMatrix* CreateKMatrix(Element* element);
++ ElementVector* CreatePVector(Element* element);
++ ElementVector* CreatePVectorVolume(Element* element);
++ ElementVector* CreatePVectorBoundary(Element* element);
++ void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss);
++ void GetSolutionFromInputs(Vector* solution,Element* element);
++ void InputUpdateFromSolution(IssmDouble* solution,Element* element);
++ void UpdateConstraints(FemModel* femmodel);
++};
++#endif
+Index: ../trunk-jpl/src/c/analyses/analyses.h
+===================================================================
+--- ../trunk-jpl/src/c/analyses/analyses.h (revision 17830)
++++ ../trunk-jpl/src/c/analyses/analyses.h (revision 17831)
+@@ -10,6 +10,7 @@
+ #include "./AdjointBalancethicknessAnalysis.h"
+ #include "./AdjointHorizAnalysis.h"
+ #include "./BalancethicknessAnalysis.h"
++#include "./Balancethickness2Analysis.h"
+ #include "./BalancethicknessSoftAnalysis.h"
+ #include "./BalancevelocityAnalysis.h"
+ #include "./DamageEvolutionAnalysis.h"
+Index: ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp
+===================================================================
+--- ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 0)
++++ ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 17831)
+@@ -0,0 +1,304 @@
++#include "./Balancethickness2Analysis.h"
++#include "../toolkits/toolkits.h"
++#include "../classes/classes.h"
++#include "../shared/shared.h"
++#include "../modules/modules.h"
++
++/*Model processing*/
++int Balancethickness2Analysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/
++ return 1;
++}/*}}}*/
++void Balancethickness2Analysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
++}/*}}}*/
++void Balancethickness2Analysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
++
++ /*Finite element type*/
++ int finiteelement = P1Enum;
++
++ /*Update elements: */
++ int counter=0;
++ for(int i=0;inumberofelements;i++){
++ if(iomodel->my_elements[i]){
++ Element* element=(Element*)elements->GetObjectByOffset(counter);
++ element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement);
++ counter++;
++ }
++ }
++
++ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
++ iomodel->FetchDataToInput(elements,VxEnum);
++ iomodel->FetchDataToInput(elements,VyEnum);
++ iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
++ iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
++ iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum);
++ iomodel->FetchDataToInput(elements,MeshVertexonboundaryEnum);
++ iomodel->FetchDataToInput(elements,ThicknessEnum);
++}/*}}}*/
++void Balancethickness2Analysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
++
++ int finiteelement = P1Enum;
++ ::CreateNodes(nodes,iomodel,Balancethickness2AnalysisEnum,finiteelement);
++}/*}}}*/
++void Balancethickness2Analysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
++
++ /*Do not add constraints in DG*/
++ IoModelToConstraintsx(constraints,iomodel,BalancethicknessSpcthicknessEnum,Balancethickness2AnalysisEnum,P1Enum);
++
++}/*}}}*/
++void Balancethickness2Analysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
++
++}/*}}}*/
++
++/*Finite Element Analysis*/
++void Balancethickness2Analysis::Core(FemModel* femmodel){/*{{{*/
++ _error_("not implemented yet");
++}/*}}}*/
++ElementVector* Balancethickness2Analysis::CreateDVector(Element* element){/*{{{*/
++ /*Default, return NULL*/
++ return NULL;
++}/*}}}*/
++ElementMatrix* Balancethickness2Analysis::CreateJacobianMatrix(Element* element){/*{{{*/
++_error_("Not implemented");
++}/*}}}*/
++ElementMatrix* Balancethickness2Analysis::CreateKMatrix(Element* element){/*{{{*/
++
++ /*Intermediaries */
++ IssmDouble Jdet,D_scalar;
++ IssmDouble* xyz_list = NULL;
++
++ /*Fetch number of nodes and dof for this finite element*/
++ int numnodes = element->GetNumberOfNodes();
++
++ /*Initialize Element vector and other vectors*/
++ ElementMatrix* Ke = element->NewElementMatrix();
++ IssmDouble* B = xNew(2*numnodes);
++ IssmDouble D[2][2];
++
++ /*Retrieve all inputs and parameters*/
++ element->GetVerticesCoordinates(&xyz_list);
++
++ /* Start looping on the number of gaussian points: */
++ Gauss* gauss=element->NewGauss(2);
++ for(int ig=gauss->begin();igend();ig++){
++ gauss->GaussPoint(ig);
++
++ element->JacobianDeterminant(&Jdet,xyz_list,gauss);
++
++ IssmDouble* dbasis=xNew(2*numnodes);
++ element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
++
++ for(int i=0;ivalues[i*numnodes+j] += gauss->weight*Jdet*(dbasis[0*numnodes+i]*dbasis[0*numnodes+j] + dbasis[1*numnodes+i]*dbasis[1*numnodes+j]);
++ }
++ }
++ //GetB(B,element,xyz_list,gauss);
++
++ //D_scalar=gauss->weight*Jdet;
++
++ //D[0][0]=D_scalar;
++ //D[0][1]=0.;
++ //D[1][0]=0.;
++ //D[1][1]=D_scalar;
++ //TripleMultiply(B,2,numnodes,1,
++ // &D[0][0],2,2,0,
++ // B,2,numnodes,0,
++ // &Ke->values[0],1);
++ }
++
++ /*Clean up and return*/
++ xDelete(xyz_list);
++ xDelete(B);
++ delete gauss;
++ return Ke;
++}/*}}}*/
++ElementVector* Balancethickness2Analysis::CreatePVector(Element* element){/*{{{*/
++
++ /*compute all load vectors for this element*/
++ ElementVector* pe1=CreatePVectorVolume(element);
++ ElementVector* pe2=CreatePVectorBoundary(element);
++ ElementVector* pe =new ElementVector(pe1,pe2);
++
++ /*clean-up and return*/
++ delete pe1;
++ delete pe2;
++ return pe;
++}/*}}}*/
++ElementVector* Balancethickness2Analysis::CreatePVectorVolume(Element* element){/*{{{*/
++
++ /*Intermediaries */
++ IssmDouble dhdt,mb,ms,Jdet;
++ IssmDouble* xyz_list = NULL;
++
++ /*Fetch number of nodes and dof for this finite element*/
++ int numnodes = element->GetNumberOfNodes();
++
++ /*Initialize Element vector and other vectors*/
++ ElementVector* pe = element->NewElementVector();
++ IssmDouble* basis = xNew(numnodes);
++
++ /*Retrieve all inputs and parameters*/
++ element->GetVerticesCoordinates(&xyz_list);
++ Input* mb_input = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input);
++ Input* ms_input = element->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input);
++ Input* dhdt_input = element->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input);
++
++ /*Initialize mb_correction to 0, do not forget!:*/
++ /* Start looping on the number of gaussian points: */
++ Gauss* gauss=element->NewGauss(2);
++ for(int ig=gauss->begin();igend();ig++){
++ gauss->GaussPoint(ig);
++
++ element->JacobianDeterminant(&Jdet,xyz_list,gauss);
++ element->NodalFunctions(basis,gauss);
++
++ ms_input->GetInputValue(&ms,gauss);
++ mb_input->GetInputValue(&mb,gauss);
++ dhdt_input->GetInputValue(&dhdt,gauss);
++
++ for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms-mb-dhdt)*basis[i];
++ }
++
++ /*Clean up and return*/
++ xDelete(xyz_list);
++ xDelete(basis);
++ delete gauss;
++ return pe;
++}/*}}}*/
++ElementVector* Balancethickness2Analysis::CreatePVectorBoundary(Element* element){/*{{{*/
++
++ /*If no front, return NULL*/
++ if(!element->IsFaceOnBoundary()) return NULL;
++
++ /*Intermediaries*/
++ IssmDouble Jdet,thickness,vx,vy;
++ IssmDouble *xyz_list = NULL;
++ IssmDouble *xyz_list_front = NULL;
++ IssmDouble normal[2];
++
++ /*Fetch number of nodes for this finite element*/
++ int numnodes = element->GetNumberOfNodes();
++
++ /*Initialize Element vector and other vectors*/
++ ElementVector* pe = element->NewElementVector();
++ IssmDouble* basis = xNew(numnodes);
++
++ /*Retrieve all inputs and parameters*/
++ Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input);
++ Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input);
++ Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input);
++
++ element->GetVerticesCoordinates(&xyz_list);
++ element->GetIcefrontCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum);
++ element->NormalSection(&normal[0],xyz_list_front);
++
++ /*Start looping on Gaussian points*/
++ Gauss* gauss=element->NewGauss(xyz_list,xyz_list_front,3);
++ for(int ig=gauss->begin();igend();ig++){
++
++ gauss->GaussPoint(ig);
++ thickness_input->GetInputValue(&thickness,gauss);
++ vx_input->GetInputValue(&vx,gauss);
++ vy_input->GetInputValue(&vy,gauss);
++ element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss);
++ element->NodalFunctions(basis,gauss);
++
++ for(int i=0;ivalues[i] += Jdet*gauss->weight*thickness*(vx*normal[0] + vy*normal[1])*basis[i];
++ }
++
++ /*Clean up and return*/
++ xDelete(xyz_list);
++ xDelete(xyz_list_front);
++ xDelete(basis);
++ delete gauss;
++ return pe;
++}/*}}}*/
++void Balancethickness2Analysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
++ /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2.
++ * For node i, Bi can be expressed in the actual coordinate system
++ * by:
++ * Bi=[ dN/dx ]
++ * [ dN/dy ]
++ * where N is the finiteelement function for node i.
++ *
++ * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes)
++ */
++
++ /*Fetch number of nodes for this finite element*/
++ int numnodes = element->GetNumberOfNodes();
++
++ /*Get nodal functions derivatives*/
++ IssmDouble* dbasis=xNew(2*numnodes);
++ element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
++
++ /*Build B': */
++ for(int i=0;i(dbasis);
++
++}/*}}}*/
++void Balancethickness2Analysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/
++ _error_("not implemented yet");
++}/*}}}*/
++void Balancethickness2Analysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
++
++ /*Intermediaries */
++ IssmDouble vx,vy,vel,h,normdphi,dphi[2];
++ IssmDouble* xyz_list = NULL;
++ int * doflist = NULL;
++
++ /*Fetch number of nodes and dof for this finite element*/
++ int numnodes = element->GetNumberOfNodes();
++ int numvertices = element->GetNumberOfVertices();
++
++ /*Fetch dof list and allocate solution vector*/
++ element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
++ IssmDouble* thickness = xNew(numvertices);
++ IssmDouble* values = xNew(numnodes);
++
++ /*Use the dof list to index into the solution vector: */
++ for(int i=0;i(values[i])) _error_("NaN found in solution vector");
++ }
++
++ element->AddInput(EnthalpyEnum,values,element->GetElementType());//FIXME
++
++ /*Retrieve all inputs and parameters*/
++ element->GetVerticesCoordinates(&xyz_list);
++ Input* potential_input = element->GetInput(EnthalpyEnum); _assert_(potential_input);
++ Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input);
++ Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input);
++
++ Gauss* gauss=element->NewGauss();
++ for (int iv=0;ivGaussVertex(iv);
++
++ vx_input->GetInputValue(&vx,gauss);
++ vy_input->GetInputValue(&vy,gauss);
++ potential_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss);
++
++ vel = sqrt(vx*vx + vy*vy) + 1.e-10;
++ normdphi = sqrt(dphi[0]*dphi[0] + dphi[1]*dphi[1]);
++
++ thickness[iv] = normdphi/vel;
++ }
++ element->AddInput(ThicknessEnum,thickness,P1Enum);
++
++ /*Clean up and return*/
++ delete gauss;
++ xDelete(doflist);
++ xDelete(xyz_list);
++ xDelete(values);
++ xDelete(thickness);
++}/*}}}*/
++void Balancethickness2Analysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
++ /*Default, do nothing*/
++ return;
++}/*}}}*/
+Index: ../trunk-jpl/src/c/shared/Enum/Synchronize.sh
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 17830)
++++ ../trunk-jpl/src/c/shared/Enum/Synchronize.sh (revision 17831)
+@@ -34,7 +34,7 @@
+ switch(analysis_enum){
+ END
+ #core
+-cat temp | grep [a-zA-Z]Analysis | \
++cat temp | grep [a-zA-Z0-9]Analysis | \
+ grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \
+ awk '{print "\t\t#ifdef _HAVE_"toupper(substr($1,1,length($1)-12))"_\n\t\t" "case " $1" : return new " substr($1,1,length($1)-4) "();\n\t\t#endif"}' \
+ >> $ISSM_DIR/src/c/analyses/EnumToAnalysis.cpp
+@@ -62,7 +62,7 @@
+
+ END
+ #core
+-cat temp | grep [a-zA-Z]Analysis | \
++cat temp | grep [a-zA-Z0-9]Analysis | \
+ grep -v DefaultAnalysis | grep -v FlaimAnalysis | grep -v SurfaceSlopeAnalysis | grep -v BedSlopeAnalysis | \
+ sed -e "s/AnalysisEnum//g" | \
+ awk '{print "dnl with-" $1"{{{\n\
+Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17830)
++++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17831)
+@@ -211,6 +211,7 @@
+ MeshUpperelementsEnum,
+ MeshVertexonbaseEnum,
+ MeshVertexonsurfaceEnum,
++ MeshVertexonboundaryEnum,
+ MeshXEnum,
+ MeshYEnum,
+ MeshZEnum,
+@@ -323,6 +324,8 @@
+ DefaultAnalysisEnum,
+ BalancethicknessAnalysisEnum,
+ BalancethicknessSolutionEnum,
++ Balancethickness2AnalysisEnum,
++ Balancethickness2SolutionEnum,
+ BalancethicknessSoftAnalysisEnum,
+ BalancethicknessSoftSolutionEnum,
+ BalancevelocityAnalysisEnum,
+Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17830)
++++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17831)
+@@ -219,6 +219,7 @@
+ case MeshUpperelementsEnum : return "MeshUpperelements";
+ case MeshVertexonbaseEnum : return "MeshVertexonbase";
+ case MeshVertexonsurfaceEnum : return "MeshVertexonsurface";
++ case MeshVertexonboundaryEnum : return "MeshVertexonboundary";
+ case MeshXEnum : return "MeshX";
+ case MeshYEnum : return "MeshY";
+ case MeshZEnum : return "MeshZ";
+@@ -324,6 +325,8 @@
+ case DefaultAnalysisEnum : return "DefaultAnalysis";
+ case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis";
+ case BalancethicknessSolutionEnum : return "BalancethicknessSolution";
++ case Balancethickness2AnalysisEnum : return "Balancethickness2Analysis";
++ case Balancethickness2SolutionEnum : return "Balancethickness2Solution";
+ case BalancethicknessSoftAnalysisEnum : return "BalancethicknessSoftAnalysis";
+ case BalancethicknessSoftSolutionEnum : return "BalancethicknessSoftSolution";
+ case BalancevelocityAnalysisEnum : return "BalancevelocityAnalysis";
+Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17830)
++++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17831)
+@@ -222,6 +222,7 @@
+ else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum;
+ else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum;
+ else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
++ else if (strcmp(name,"MeshVertexonboundary")==0) return MeshVertexonboundaryEnum;
+ else if (strcmp(name,"MeshX")==0) return MeshXEnum;
+ else if (strcmp(name,"MeshY")==0) return MeshYEnum;
+ else if (strcmp(name,"MeshZ")==0) return MeshZEnum;
+@@ -258,11 +259,11 @@
+ else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
+ else if (strcmp(name,"SettingsLowmem")==0) return SettingsLowmemEnum;
+ else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
+- else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
+ else stage=3;
+ }
+ if(stage==3){
+- if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
++ if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
++ else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
+ else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
+ else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum;
+ else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;
+@@ -330,6 +331,8 @@
+ else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum;
+ else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
+ else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
++ else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
++ else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
+ else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
+ else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
+ else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum;
+@@ -379,13 +382,13 @@
+ else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
+ else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
+ else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
+- else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
+- else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
+- else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
+ else stage=4;
+ }
+ if(stage==4){
+- if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
++ if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
++ else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
++ else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
++ else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
+ else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum;
+ else if (strcmp(name,"FSpressure")==0) return FSpressureEnum;
+ else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
+@@ -502,13 +505,13 @@
+ else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
+ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
+ else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
+- else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
+- else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
+- else if (strcmp(name,"Vel")==0) return VelEnum;
+ else stage=5;
+ }
+ if(stage==5){
+- if (strcmp(name,"Velocity")==0) return VelocityEnum;
++ if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
++ else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
++ else if (strcmp(name,"Vel")==0) return VelEnum;
++ else if (strcmp(name,"Velocity")==0) return VelocityEnum;
+ else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
+ else if (strcmp(name,"Vx")==0) return VxEnum;
+ else if (strcmp(name,"VxPicard")==0) return VxPicardEnum;
+@@ -625,13 +628,13 @@
+ else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
+ else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
+ else if (strcmp(name,"None")==0) return NoneEnum;
+- else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
+- else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
+- else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
+ else stage=6;
+ }
+ if(stage==6){
+- if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
++ if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
++ else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
++ else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
++ else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
+ else if (strcmp(name,"Contact")==0) return ContactEnum;
+ else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum;
+ else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum;
+Index: ../trunk-jpl/src/c/Makefile.am
+===================================================================
+--- ../trunk-jpl/src/c/Makefile.am (revision 17830)
++++ ../trunk-jpl/src/c/Makefile.am (revision 17831)
+@@ -429,6 +429,7 @@
+ ./cores/stressbalance_core.cpp\
+ ./solutionsequences/solutionsequence_stokescoupling_nonlinear.cpp\
+ ./cores/balancethickness_core.cpp \
++ ./cores/balancethickness2_core.cpp \
+ ./cores/balancevelocity_core.cpp \
+ ./cores/dummy_core.cpp\
+ ./cores/surfaceslope_core.cpp\
+@@ -521,6 +522,9 @@
+ if BALANCETHICKNESS
+ issm_sources += ./analyses/BalancethicknessAnalysis.cpp
+ endif
++if BALANCETHICKNESS2
++issm_sources += ./analyses/Balancethickness2Analysis.cpp
++endif
+ if BALANCETHICKNESSSOFT
+ issm_sources += ./analyses/BalancethicknessSoftAnalysis.cpp
+ endif
+@@ -865,7 +869,7 @@
+ libISSM_la_LIBADD = libISSMCore.la libISSMOverload.la
+
+ libISSMCore_la_SOURCES = $(issm_sources)
+-libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
++libISSMCore_la_LIBADD = $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(ADOLCLIB) $(AMPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
+ libISSMCore_la_FFLAGS = $(AM_FFLAGS)
+ endif
+
+@@ -912,10 +916,10 @@
+ LDADD = ./libISSMCore.a ./libISSMOverload.a
+
+ #External packages
+-LDADD += $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
++LDADD += $(PETSCLIB) $(TAOLIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB)
+
+ if FORTRAN
+-LDADD += $(FLIBS)
++LDADD += $(FLIBS) $(FORTRANLIB)
+ endif
+
+ issm_SOURCES = main/issm.h main/globals.h main/issm.cpp
+Index: ../trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp
+===================================================================
+--- ../trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 17830)
++++ ../trunk-jpl/src/c/cores/CorePointerFromSolutionEnum.cpp (revision 17831)
+@@ -34,6 +34,9 @@
+ case BalancethicknessSolutionEnum:
+ solutioncore=&balancethickness_core;
+ break;
++ case Balancethickness2SolutionEnum:
++ solutioncore=&balancethickness2_core;
++ break;
+ case BalancethicknessSoftSolutionEnum:
+ solutioncore=&dummy_core;
+ break;
+Index: ../trunk-jpl/src/c/cores/AnalysisConfiguration.cpp
+===================================================================
+--- ../trunk-jpl/src/c/cores/AnalysisConfiguration.cpp (revision 17830)
++++ ../trunk-jpl/src/c/cores/AnalysisConfiguration.cpp (revision 17831)
+@@ -77,6 +77,12 @@
+ analyses[0]=BalancethicknessAnalysisEnum;
+ break;
+
++ case Balancethickness2SolutionEnum:
++ numanalyses=1;
++ analyses=xNew(numanalyses);
++ analyses[0]=Balancethickness2AnalysisEnum;
++ break;
++
+ case BalancethicknessSoftSolutionEnum:
+ numanalyses=1;
+ analyses=xNew(numanalyses);
+Index: ../trunk-jpl/src/c/cores/cores.h
+===================================================================
+--- ../trunk-jpl/src/c/cores/cores.h (revision 17830)
++++ ../trunk-jpl/src/c/cores/cores.h (revision 17831)
+@@ -33,6 +33,7 @@
+ void extrudefrombase_core(FemModel* femmodel);
+ void extrudefromtop_core(FemModel* femmodel);
+ void balancethickness_core(FemModel* femmodel);
++void balancethickness2_core(FemModel* femmodel);
+ void balancevelocity_core(FemModel* femmodel);
+ void slopecompute_core(FemModel* femmodel);
+ void steadystate_core(FemModel* femmodel);
+Index: ../trunk-jpl/src/c/cores/balancethickness2_core.cpp
+===================================================================
+--- ../trunk-jpl/src/c/cores/balancethickness2_core.cpp (revision 0)
++++ ../trunk-jpl/src/c/cores/balancethickness2_core.cpp (revision 17831)
+@@ -0,0 +1,32 @@
++/*!\file: balancethickness_core.cpp
++ * \brief: core of the balancethickness solution
++ */
++
++#include "./cores.h"
++#include "../toolkits/toolkits.h"
++#include "../classes/classes.h"
++#include "../shared/shared.h"
++#include "../modules/modules.h"
++#include "../solutionsequences/solutionsequences.h"
++
++void balancethickness2_core(FemModel* femmodel){
++
++ /*parameters: */
++ bool save_results;
++
++ /*activate formulation: */
++ femmodel->SetCurrentConfiguration(Balancethickness2AnalysisEnum);
++
++ /*recover parameters: */
++ femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
++
++ if(VerboseSolution()) _printf0_("call computational core:\n");
++ solutionsequence_linear(femmodel);
++
++ if(save_results){
++ if(VerboseSolution()) _printf0_(" saving results\n");
++ int outputs[2] = {ThicknessEnum,EnthalpyEnum};
++ femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);
++ }
++
++}
+Index: ../trunk-jpl/src/c/classes/Materials/Matice.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 17830)
++++ ../trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 17831)
+@@ -30,7 +30,6 @@
+ Matice::Matice(){
+ this->helement=NULL;
+ this->element=NULL;
+- this->isdamaged=NULL;
+ return;
+ }
+ /*}}}*/
+Index: ../trunk-jpl/src/c/classes/Elements/Element.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17830)
++++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17831)
+@@ -242,6 +242,7 @@
+ virtual int PressureInterpolation()=0;
+ virtual bool IsZeroLevelset(int levelset_enum)=0;
+ virtual bool IsIcefront(void)=0;
++ virtual bool IsFaceOnBoundary(void)=0;
+ virtual void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum)=0;
+ virtual void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum)=0;
+ virtual void GetNormalFromLSF(IssmDouble *pnormal)=0;
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17830)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17831)
+@@ -2256,6 +2256,26 @@
+ }
+ return isicefront;
+ }/*}}}*/
++bool Tria::IsFaceOnBoundary(void){/*{{{*/
++
++ IssmDouble values[NUMVERTICES];
++ IssmDouble sum;
++
++ /*Retrieve all inputs and parameters*/
++ GetInputListOnVertices(&values[0],MeshVertexonboundaryEnum);
++ sum = values[0]+values[1]+values[2];
++
++ _assert_(sum==0. || sum==1. || sum==2.);
++
++ if(sum==3.) _error_("Two edges on boundary not supported yet...");
++
++ if(sum>1.){
++ return true;
++ }
++ else{
++ return false;
++ }
++}/*}}}*/
+ /*FUNCTION Tria::AverageOntoPartition {{{*/
+ void Tria::AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
+
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17830)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17831)
+@@ -111,6 +111,7 @@
+ void GetNormalFromLSF(IssmDouble *pnormal);
+ bool IsZeroLevelset(int levelset_enum);
+ bool IsIcefront(void);
++ bool IsFaceOnBoundary(void);
+
+ void AverageOntoPartition(Vector* partition_contributions,Vector* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
+ IssmDouble IceVolume(void);
+Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17830)
++++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17831)
+@@ -94,6 +94,7 @@
+ int PressureInterpolation();
+ bool IsZeroLevelset(int levelset_enum);
+ bool IsIcefront(void);
++ bool IsFaceOnBoundary(void){_error_("not implemented yet");};
+ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum);
+ void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");};
+ void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Seg.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17830)
++++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17831)
+@@ -125,6 +125,7 @@
+ void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");};
+ bool IsZeroLevelset(int levelset_enum){_error_("not implemented");};
+ bool IsIcefront(void);
++ bool IsFaceOnBoundary(void){_error_("not implemented yet");};
+ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented");};
+ void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum);
+ void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Tetra.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17830)
++++ ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17831)
+@@ -130,6 +130,7 @@
+ void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");};
+ bool IsZeroLevelset(int levelset_enum){_error_("not implemented");};
+ bool IsIcefront(void);
++ bool IsFaceOnBoundary(void){_error_("not implemented yet");};
+ void ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum);
+ void GetIcefrontCoordinates(IssmDouble** pxyz_front,IssmDouble* xyz_list,int levelsetenum){_error_("not implemented yet");};
+ void GetNormalFromLSF(IssmDouble *pnormal){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m
+===================================================================
+--- ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 17830)
++++ ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 17831)
+@@ -60,6 +60,9 @@
+ case BalancethicknessSolutionEnum(),
+ analyses=[BalancethicknessAnalysisEnum()];
+
++ case Balancethickness2SolutionEnum(),
++ analyses=[Balancethickness2AnalysisEnum()];
++
+ case BalancethicknessSoftSolutionEnum(),
+ analyses=[BalancethicknessAnalysisEnum()];
+
+Index: ../trunk-jpl/src/m/classes/mesh2d.m
+===================================================================
+--- ../trunk-jpl/src/m/classes/mesh2d.m (revision 17830)
++++ ../trunk-jpl/src/m/classes/mesh2d.m (revision 17831)
+@@ -189,6 +189,7 @@
+ WriteData(fid,'object',obj,'class','mesh','fieldname','numberofelements','format','Integer');
+ WriteData(fid,'object',obj,'class','mesh','fieldname','numberofvertices','format','Integer');
+ WriteData(fid,'object',obj,'class','mesh','fieldname','average_vertex_connectivity','format','Integer');
++ WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonboundary','format','DoubleMat','mattype',1);
+ end % }}}
+ function t = domaintype(obj) % {{{
+ t = '2Dhorizontal';
+Index: ../trunk-jpl/src/m/contrib/dassflow/importgmsh.m
+===================================================================
+--- ../trunk-jpl/src/m/contrib/dassflow/importgmsh.m (revision 17830)
++++ ../trunk-jpl/src/m/contrib/dassflow/importgmsh.m (revision 17831)
+@@ -96,6 +96,8 @@
+ else
+ error('not supported');
+ end
++ case 15, %point
++ continue;
+ otherwise,
+ error(['Type ' num2str(ty) ' not supported']);
+ end
+Index: ../trunk-jpl/src/m/enum/Balancethickness2SolutionEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/Balancethickness2SolutionEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/Balancethickness2SolutionEnum.m (revision 17831)
+@@ -0,0 +1,11 @@
++function macro=Balancethickness2SolutionEnum()
++%BALANCETHICKNESS2SOLUTIONENUM - Enum of Balancethickness2Solution
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=Balancethickness2SolutionEnum()
++
++macro=StringToEnum('Balancethickness2Solution');
+Index: ../trunk-jpl/src/m/enum/Balancethickness2AnalysisEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/Balancethickness2AnalysisEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/Balancethickness2AnalysisEnum.m (revision 17831)
+@@ -0,0 +1,11 @@
++function macro=Balancethickness2AnalysisEnum()
++%BALANCETHICKNESS2ANALYSISENUM - Enum of Balancethickness2Analysis
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=Balancethickness2AnalysisEnum()
++
++macro=StringToEnum('Balancethickness2Analysis');
+Index: ../trunk-jpl/src/m/enum/MeshVertexonboundaryEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/MeshVertexonboundaryEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/MeshVertexonboundaryEnum.m (revision 17831)
+@@ -0,0 +1,11 @@
++function macro=MeshVertexonboundaryEnum()
++%MESHVERTEXONBOUNDARYENUM - Enum of MeshVertexonboundary
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=MeshVertexonboundaryEnum()
++
++macro=StringToEnum('MeshVertexonboundary');
+Index: ../trunk-jpl/src/m/enum/EnumDefinitions.py
+===================================================================
+--- ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17830)
++++ ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17831)
+@@ -211,6 +211,7 @@
+ def MeshUpperelementsEnum(): return StringToEnum("MeshUpperelements")[0]
+ def MeshVertexonbaseEnum(): return StringToEnum("MeshVertexonbase")[0]
+ def MeshVertexonsurfaceEnum(): return StringToEnum("MeshVertexonsurface")[0]
++def MeshVertexonboundaryEnum(): return StringToEnum("MeshVertexonboundary")[0]
+ def MeshXEnum(): return StringToEnum("MeshX")[0]
+ def MeshYEnum(): return StringToEnum("MeshY")[0]
+ def MeshZEnum(): return StringToEnum("MeshZ")[0]
+@@ -316,6 +317,8 @@
+ def DefaultAnalysisEnum(): return StringToEnum("DefaultAnalysis")[0]
+ def BalancethicknessAnalysisEnum(): return StringToEnum("BalancethicknessAnalysis")[0]
+ def BalancethicknessSolutionEnum(): return StringToEnum("BalancethicknessSolution")[0]
++def Balancethickness2AnalysisEnum(): return StringToEnum("Balancethickness2Analysis")[0]
++def Balancethickness2SolutionEnum(): return StringToEnum("Balancethickness2Solution")[0]
+ def BalancethicknessSoftAnalysisEnum(): return StringToEnum("BalancethicknessSoftAnalysis")[0]
+ def BalancethicknessSoftSolutionEnum(): return StringToEnum("BalancethicknessSoftSolution")[0]
+ def BalancevelocityAnalysisEnum(): return StringToEnum("BalancevelocityAnalysis")[0]
+@@ -519,6 +522,7 @@
+ def QmuTemperatureEnum(): return StringToEnum("QmuTemperature")[0]
+ def HydrologyWaterVxEnum(): return StringToEnum("HydrologyWaterVx")[0]
+ def HydrologyWaterVyEnum(): return StringToEnum("HydrologyWaterVy")[0]
++def SigmaNNEnum(): return StringToEnum("SigmaNN")[0]
+ def StressTensorEnum(): return StringToEnum("StressTensor")[0]
+ def StressTensorxxEnum(): return StringToEnum("StressTensorxx")[0]
+ def StressTensorxyEnum(): return StringToEnum("StressTensorxy")[0]
+Index: ../trunk-jpl/src/m/enum/SigmaNNEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/SigmaNNEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/SigmaNNEnum.m (revision 17831)
+@@ -0,0 +1,11 @@
++function macro=SigmaNNEnum()
++%SIGMANNENUM - Enum of SigmaNN
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=SigmaNNEnum()
++
++macro=StringToEnum('SigmaNN');
Index: /issm/oecreview/Archive/17802-17983/ISSM-17831-17832.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17831-17832.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17831-17832.diff (revision 17986)
@@ -0,0 +1,815 @@
+Index: ../trunk-jpl/m4/analyses.m4
+===================================================================
+--- ../trunk-jpl/m4/analyses.m4 (revision 17831)
++++ ../trunk-jpl/m4/analyses.m4 (revision 17832)
+@@ -10,424 +10,810 @@
+ [
+
+ dnl with-AdjointBalancethickness{{{
++
+ AC_ARG_WITH([AdjointBalancethickness],
++
+ AS_HELP_STRING([--with-AdjointBalancethickness = YES], [compile with AdjointBalancethickness capabilities (default is yes)]),
++
+ [ADJOINTBALANCETHICKNESS=$withval],[ADJOINTBALANCETHICKNESS=yes])
++
+ AC_MSG_CHECKING(for AdjointBalancethickness capability compilation)
+
++
+ HAVE_ADJOINTBALANCETHICKNESS=no
++
+ if test "x$ADJOINTBALANCETHICKNESS" = "xyes"; then
++
+ HAVE_ADJOINTBALANCETHICKNESS=yes
++
+ AC_DEFINE([_HAVE_ADJOINTBALANCETHICKNESS_],[1],[with AdjointBalancethicknesscapability])
++
+ fi
++
+ AM_CONDITIONAL([ADJOINTBALANCETHICKNESS], [test x$HAVE_ADJOINTBALANCETHICKNESS = xyes])
++
+ AC_MSG_RESULT($HAVE_ADJOINTBALANCETHICKNESS)
++
+ dnl }}}
+ dnl with-AdjointHoriz{{{
++
+ AC_ARG_WITH([AdjointHoriz],
++
+ AS_HELP_STRING([--with-AdjointHoriz = YES], [compile with AdjointHoriz capabilities (default is yes)]),
++
+ [ADJOINTHORIZ=$withval],[ADJOINTHORIZ=yes])
++
+ AC_MSG_CHECKING(for AdjointHoriz capability compilation)
+
++
+ HAVE_ADJOINTHORIZ=no
++
+ if test "x$ADJOINTHORIZ" = "xyes"; then
++
+ HAVE_ADJOINTHORIZ=yes
++
+ AC_DEFINE([_HAVE_ADJOINTHORIZ_],[1],[with AdjointHorizcapability])
++
+ fi
++
+ AM_CONDITIONAL([ADJOINTHORIZ], [test x$HAVE_ADJOINTHORIZ = xyes])
++
+ AC_MSG_RESULT($HAVE_ADJOINTHORIZ)
++
+ dnl }}}
+ dnl with-Balancethickness{{{
++
+ AC_ARG_WITH([Balancethickness],
++
+ AS_HELP_STRING([--with-Balancethickness = YES], [compile with Balancethickness capabilities (default is yes)]),
++
+ [BALANCETHICKNESS=$withval],[BALANCETHICKNESS=yes])
++
+ AC_MSG_CHECKING(for Balancethickness capability compilation)
+
++
+ HAVE_BALANCETHICKNESS=no
++
+ if test "x$BALANCETHICKNESS" = "xyes"; then
++
+ HAVE_BALANCETHICKNESS=yes
++
+ AC_DEFINE([_HAVE_BALANCETHICKNESS_],[1],[with Balancethicknesscapability])
++
+ fi
++
+ AM_CONDITIONAL([BALANCETHICKNESS], [test x$HAVE_BALANCETHICKNESS = xyes])
++
+ AC_MSG_RESULT($HAVE_BALANCETHICKNESS)
++
+ dnl }}}
++dnl with-Balancethickness2{{{
++
++AC_ARG_WITH([Balancethickness2],
++
++ AS_HELP_STRING([--with-Balancethickness2 = YES], [compile with Balancethickness2 capabilities (default is yes)]),
++
++ [BALANCETHICKNESS2=$withval],[BALANCETHICKNESS2=yes])
++
++AC_MSG_CHECKING(for Balancethickness2 capability compilation)
++
++
++HAVE_BALANCETHICKNESS2=no
++
++if test "x$BALANCETHICKNESS2" = "xyes"; then
++
++ HAVE_BALANCETHICKNESS2=yes
++
++ AC_DEFINE([_HAVE_BALANCETHICKNESS2_],[1],[with Balancethickness2capability])
++
++fi
++
++AM_CONDITIONAL([BALANCETHICKNESS2], [test x$HAVE_BALANCETHICKNESS2 = xyes])
++
++AC_MSG_RESULT($HAVE_BALANCETHICKNESS2)
++
++dnl }}}
+ dnl with-BalancethicknessSoft{{{
++
+ AC_ARG_WITH([BalancethicknessSoft],
++
+ AS_HELP_STRING([--with-BalancethicknessSoft = YES], [compile with BalancethicknessSoft capabilities (default is yes)]),
++
+ [BALANCETHICKNESSSOFT=$withval],[BALANCETHICKNESSSOFT=yes])
++
+ AC_MSG_CHECKING(for BalancethicknessSoft capability compilation)
+
++
+ HAVE_BALANCETHICKNESSSOFT=no
++
+ if test "x$BALANCETHICKNESSSOFT" = "xyes"; then
++
+ HAVE_BALANCETHICKNESSSOFT=yes
++
+ AC_DEFINE([_HAVE_BALANCETHICKNESSSOFT_],[1],[with BalancethicknessSoftcapability])
++
+ fi
++
+ AM_CONDITIONAL([BALANCETHICKNESSSOFT], [test x$HAVE_BALANCETHICKNESSSOFT = xyes])
++
+ AC_MSG_RESULT($HAVE_BALANCETHICKNESSSOFT)
++
+ dnl }}}
+ dnl with-Balancevelocity{{{
++
+ AC_ARG_WITH([Balancevelocity],
++
+ AS_HELP_STRING([--with-Balancevelocity = YES], [compile with Balancevelocity capabilities (default is yes)]),
++
+ [BALANCEVELOCITY=$withval],[BALANCEVELOCITY=yes])
++
+ AC_MSG_CHECKING(for Balancevelocity capability compilation)
+
++
+ HAVE_BALANCEVELOCITY=no
++
+ if test "x$BALANCEVELOCITY" = "xyes"; then
++
+ HAVE_BALANCEVELOCITY=yes
++
+ AC_DEFINE([_HAVE_BALANCEVELOCITY_],[1],[with Balancevelocitycapability])
++
+ fi
++
+ AM_CONDITIONAL([BALANCEVELOCITY], [test x$HAVE_BALANCEVELOCITY = xyes])
++
+ AC_MSG_RESULT($HAVE_BALANCEVELOCITY)
++
+ dnl }}}
+ dnl with-L2ProjectionEPL{{{
++
+ AC_ARG_WITH([L2ProjectionEPL],
++
+ AS_HELP_STRING([--with-L2ProjectionEPL = YES], [compile with L2ProjectionEPL capabilities (default is yes)]),
++
+ [L2PROJECTIONEPL=$withval],[L2PROJECTIONEPL=yes])
++
+ AC_MSG_CHECKING(for L2ProjectionEPL capability compilation)
+
++
+ HAVE_L2PROJECTIONEPL=no
++
+ if test "x$L2PROJECTIONEPL" = "xyes"; then
++
+ HAVE_L2PROJECTIONEPL=yes
++
+ AC_DEFINE([_HAVE_L2PROJECTIONEPL_],[1],[with L2ProjectionEPLcapability])
++
+ fi
++
+ AM_CONDITIONAL([L2PROJECTIONEPL], [test x$HAVE_L2PROJECTIONEPL = xyes])
++
+ AC_MSG_RESULT($HAVE_L2PROJECTIONEPL)
++
+ dnl }}}
+ dnl with-L2ProjectionBase{{{
++
+ AC_ARG_WITH([L2ProjectionBase],
++
+ AS_HELP_STRING([--with-L2ProjectionBase = YES], [compile with L2ProjectionBase capabilities (default is yes)]),
++
+ [L2PROJECTIONBASE=$withval],[L2PROJECTIONBASE=yes])
++
+ AC_MSG_CHECKING(for L2ProjectionBase capability compilation)
+
++
+ HAVE_L2PROJECTIONBASE=no
++
+ if test "x$L2PROJECTIONBASE" = "xyes"; then
++
+ HAVE_L2PROJECTIONBASE=yes
++
+ AC_DEFINE([_HAVE_L2PROJECTIONBASE_],[1],[with L2ProjectionBasecapability])
++
+ fi
++
+ AM_CONDITIONAL([L2PROJECTIONBASE], [test x$HAVE_L2PROJECTIONBASE = xyes])
++
+ AC_MSG_RESULT($HAVE_L2PROJECTIONBASE)
++
+ dnl }}}
+ dnl with-DamageEvolution{{{
++
+ AC_ARG_WITH([DamageEvolution],
++
+ AS_HELP_STRING([--with-DamageEvolution = YES], [compile with DamageEvolution capabilities (default is yes)]),
++
+ [DAMAGEEVOLUTION=$withval],[DAMAGEEVOLUTION=yes])
++
+ AC_MSG_CHECKING(for DamageEvolution capability compilation)
+
++
+ HAVE_DAMAGEEVOLUTION=no
++
+ if test "x$DAMAGEEVOLUTION" = "xyes"; then
++
+ HAVE_DAMAGEEVOLUTION=yes
++
+ AC_DEFINE([_HAVE_DAMAGEEVOLUTION_],[1],[with DamageEvolutioncapability])
++
+ fi
++
+ AM_CONDITIONAL([DAMAGEEVOLUTION], [test x$HAVE_DAMAGEEVOLUTION = xyes])
++
+ AC_MSG_RESULT($HAVE_DAMAGEEVOLUTION)
++
+ dnl }}}
+ dnl with-Stressbalance{{{
++
+ AC_ARG_WITH([Stressbalance],
++
+ AS_HELP_STRING([--with-Stressbalance = YES], [compile with Stressbalance capabilities (default is yes)]),
++
+ [STRESSBALANCE=$withval],[STRESSBALANCE=yes])
++
+ AC_MSG_CHECKING(for Stressbalance capability compilation)
+
++
+ HAVE_STRESSBALANCE=no
++
+ if test "x$STRESSBALANCE" = "xyes"; then
++
+ HAVE_STRESSBALANCE=yes
++
+ AC_DEFINE([_HAVE_STRESSBALANCE_],[1],[with Stressbalancecapability])
++
+ fi
++
+ AM_CONDITIONAL([STRESSBALANCE], [test x$HAVE_STRESSBALANCE = xyes])
++
+ AC_MSG_RESULT($HAVE_STRESSBALANCE)
++
+ dnl }}}
+ dnl with-StressbalanceSIA{{{
++
+ AC_ARG_WITH([StressbalanceSIA],
++
+ AS_HELP_STRING([--with-StressbalanceSIA = YES], [compile with StressbalanceSIA capabilities (default is yes)]),
++
+ [STRESSBALANCESIA=$withval],[STRESSBALANCESIA=yes])
++
+ AC_MSG_CHECKING(for StressbalanceSIA capability compilation)
+
++
+ HAVE_STRESSBALANCESIA=no
++
+ if test "x$STRESSBALANCESIA" = "xyes"; then
++
+ HAVE_STRESSBALANCESIA=yes
++
+ AC_DEFINE([_HAVE_STRESSBALANCESIA_],[1],[with StressbalanceSIAcapability])
++
+ fi
++
+ AM_CONDITIONAL([STRESSBALANCESIA], [test x$HAVE_STRESSBALANCESIA = xyes])
++
+ AC_MSG_RESULT($HAVE_STRESSBALANCESIA)
++
+ dnl }}}
+ dnl with-StressbalanceVertical{{{
++
+ AC_ARG_WITH([StressbalanceVertical],
++
+ AS_HELP_STRING([--with-StressbalanceVertical = YES], [compile with StressbalanceVertical capabilities (default is yes)]),
++
+ [STRESSBALANCEVERTICAL=$withval],[STRESSBALANCEVERTICAL=yes])
++
+ AC_MSG_CHECKING(for StressbalanceVertical capability compilation)
+
++
+ HAVE_STRESSBALANCEVERTICAL=no
++
+ if test "x$STRESSBALANCEVERTICAL" = "xyes"; then
++
+ HAVE_STRESSBALANCEVERTICAL=yes
++
+ AC_DEFINE([_HAVE_STRESSBALANCEVERTICAL_],[1],[with StressbalanceVerticalcapability])
++
+ fi
++
+ AM_CONDITIONAL([STRESSBALANCEVERTICAL], [test x$HAVE_STRESSBALANCEVERTICAL = xyes])
++
+ AC_MSG_RESULT($HAVE_STRESSBALANCEVERTICAL)
++
+ dnl }}}
+ dnl with-Enthalpy{{{
++
+ AC_ARG_WITH([Enthalpy],
++
+ AS_HELP_STRING([--with-Enthalpy = YES], [compile with Enthalpy capabilities (default is yes)]),
++
+ [ENTHALPY=$withval],[ENTHALPY=yes])
++
+ AC_MSG_CHECKING(for Enthalpy capability compilation)
+
++
+ HAVE_ENTHALPY=no
++
+ if test "x$ENTHALPY" = "xyes"; then
++
+ HAVE_ENTHALPY=yes
++
+ AC_DEFINE([_HAVE_ENTHALPY_],[1],[with Enthalpycapability])
++
+ fi
++
+ AM_CONDITIONAL([ENTHALPY], [test x$HAVE_ENTHALPY = xyes])
++
+ AC_MSG_RESULT($HAVE_ENTHALPY)
++
+ dnl }}}
+ dnl with-HydrologyShreve{{{
++
+ AC_ARG_WITH([HydrologyShreve],
++
+ AS_HELP_STRING([--with-HydrologyShreve = YES], [compile with HydrologyShreve capabilities (default is yes)]),
++
+ [HYDROLOGYSHREVE=$withval],[HYDROLOGYSHREVE=yes])
++
+ AC_MSG_CHECKING(for HydrologyShreve capability compilation)
+
++
+ HAVE_HYDROLOGYSHREVE=no
++
+ if test "x$HYDROLOGYSHREVE" = "xyes"; then
++
+ HAVE_HYDROLOGYSHREVE=yes
++
+ AC_DEFINE([_HAVE_HYDROLOGYSHREVE_],[1],[with HydrologyShrevecapability])
++
+ fi
++
+ AM_CONDITIONAL([HYDROLOGYSHREVE], [test x$HAVE_HYDROLOGYSHREVE = xyes])
++
+ AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE)
++
+ dnl }}}
+ dnl with-HydrologyDCInefficient{{{
++
+ AC_ARG_WITH([HydrologyDCInefficient],
++
+ AS_HELP_STRING([--with-HydrologyDCInefficient = YES], [compile with HydrologyDCInefficient capabilities (default is yes)]),
++
+ [HYDROLOGYDCINEFFICIENT=$withval],[HYDROLOGYDCINEFFICIENT=yes])
++
+ AC_MSG_CHECKING(for HydrologyDCInefficient capability compilation)
+
++
+ HAVE_HYDROLOGYDCINEFFICIENT=no
++
+ if test "x$HYDROLOGYDCINEFFICIENT" = "xyes"; then
++
+ HAVE_HYDROLOGYDCINEFFICIENT=yes
++
+ AC_DEFINE([_HAVE_HYDROLOGYDCINEFFICIENT_],[1],[with HydrologyDCInefficientcapability])
++
+ fi
++
+ AM_CONDITIONAL([HYDROLOGYDCINEFFICIENT], [test x$HAVE_HYDROLOGYDCINEFFICIENT = xyes])
++
+ AC_MSG_RESULT($HAVE_HYDROLOGYDCINEFFICIENT)
++
+ dnl }}}
+ dnl with-HydrologyDCEfficient{{{
++
+ AC_ARG_WITH([HydrologyDCEfficient],
++
+ AS_HELP_STRING([--with-HydrologyDCEfficient = YES], [compile with HydrologyDCEfficient capabilities (default is yes)]),
++
+ [HYDROLOGYDCEFFICIENT=$withval],[HYDROLOGYDCEFFICIENT=yes])
++
+ AC_MSG_CHECKING(for HydrologyDCEfficient capability compilation)
+
++
+ HAVE_HYDROLOGYDCEFFICIENT=no
++
+ if test "x$HYDROLOGYDCEFFICIENT" = "xyes"; then
++
+ HAVE_HYDROLOGYDCEFFICIENT=yes
++
+ AC_DEFINE([_HAVE_HYDROLOGYDCEFFICIENT_],[1],[with HydrologyDCEfficientcapability])
++
+ fi
++
+ AM_CONDITIONAL([HYDROLOGYDCEFFICIENT], [test x$HAVE_HYDROLOGYDCEFFICIENT = xyes])
++
+ AC_MSG_RESULT($HAVE_HYDROLOGYDCEFFICIENT)
++
+ dnl }}}
+ dnl with-Melting{{{
++
+ AC_ARG_WITH([Melting],
++
+ AS_HELP_STRING([--with-Melting = YES], [compile with Melting capabilities (default is yes)]),
++
+ [MELTING=$withval],[MELTING=yes])
++
+ AC_MSG_CHECKING(for Melting capability compilation)
+
++
+ HAVE_MELTING=no
++
+ if test "x$MELTING" = "xyes"; then
++
+ HAVE_MELTING=yes
++
+ AC_DEFINE([_HAVE_MELTING_],[1],[with Meltingcapability])
++
+ fi
++
+ AM_CONDITIONAL([MELTING], [test x$HAVE_MELTING = xyes])
++
+ AC_MSG_RESULT($HAVE_MELTING)
++
+ dnl }}}
+ dnl with-Masstransport{{{
++
+ AC_ARG_WITH([Masstransport],
++
+ AS_HELP_STRING([--with-Masstransport = YES], [compile with Masstransport capabilities (default is yes)]),
++
+ [MASSTRANSPORT=$withval],[MASSTRANSPORT=yes])
++
+ AC_MSG_CHECKING(for Masstransport capability compilation)
+
++
+ HAVE_MASSTRANSPORT=no
++
+ if test "x$MASSTRANSPORT" = "xyes"; then
++
+ HAVE_MASSTRANSPORT=yes
++
+ AC_DEFINE([_HAVE_MASSTRANSPORT_],[1],[with Masstransportcapability])
++
+ fi
++
+ AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes])
++
+ AC_MSG_RESULT($HAVE_MASSTRANSPORT)
++
+ dnl }}}
+ dnl with-FreeSurfaceBase{{{
++
+ AC_ARG_WITH([FreeSurfaceBase],
++
+ AS_HELP_STRING([--with-FreeSurfaceBase = YES], [compile with FreeSurfaceBase capabilities (default is yes)]),
++
+ [FREESURFACEBASE=$withval],[FREESURFACEBASE=yes])
++
+ AC_MSG_CHECKING(for FreeSurfaceBase capability compilation)
+
++
+ HAVE_FREESURFACEBASE=no
++
+ if test "x$FREESURFACEBASE" = "xyes"; then
++
+ HAVE_FREESURFACEBASE=yes
++
+ AC_DEFINE([_HAVE_FREESURFACEBASE_],[1],[with FreeSurfaceBasecapability])
++
+ fi
++
+ AM_CONDITIONAL([FREESURFACEBASE], [test x$HAVE_FREESURFACEBASE = xyes])
++
+ AC_MSG_RESULT($HAVE_FREESURFACEBASE)
++
+ dnl }}}
+ dnl with-FreeSurfaceTop{{{
++
+ AC_ARG_WITH([FreeSurfaceTop],
++
+ AS_HELP_STRING([--with-FreeSurfaceTop = YES], [compile with FreeSurfaceTop capabilities (default is yes)]),
++
+ [FREESURFACETOP=$withval],[FREESURFACETOP=yes])
++
+ AC_MSG_CHECKING(for FreeSurfaceTop capability compilation)
+
++
+ HAVE_FREESURFACETOP=no
++
+ if test "x$FREESURFACETOP" = "xyes"; then
++
+ HAVE_FREESURFACETOP=yes
++
+ AC_DEFINE([_HAVE_FREESURFACETOP_],[1],[with FreeSurfaceTopcapability])
++
+ fi
++
+ AM_CONDITIONAL([FREESURFACETOP], [test x$HAVE_FREESURFACETOP = xyes])
++
+ AC_MSG_RESULT($HAVE_FREESURFACETOP)
++
+ dnl }}}
+ dnl with-ExtrudeFromBase{{{
++
+ AC_ARG_WITH([ExtrudeFromBase],
++
+ AS_HELP_STRING([--with-ExtrudeFromBase = YES], [compile with ExtrudeFromBase capabilities (default is yes)]),
++
+ [EXTRUDEFROMBASE=$withval],[EXTRUDEFROMBASE=yes])
++
+ AC_MSG_CHECKING(for ExtrudeFromBase capability compilation)
+
++
+ HAVE_EXTRUDEFROMBASE=no
++
+ if test "x$EXTRUDEFROMBASE" = "xyes"; then
++
+ HAVE_EXTRUDEFROMBASE=yes
++
+ AC_DEFINE([_HAVE_EXTRUDEFROMBASE_],[1],[with ExtrudeFromBasecapability])
++
+ fi
++
+ AM_CONDITIONAL([EXTRUDEFROMBASE], [test x$HAVE_EXTRUDEFROMBASE = xyes])
++
+ AC_MSG_RESULT($HAVE_EXTRUDEFROMBASE)
++
+ dnl }}}
+ dnl with-ExtrudeFromTop{{{
++
+ AC_ARG_WITH([ExtrudeFromTop],
++
+ AS_HELP_STRING([--with-ExtrudeFromTop = YES], [compile with ExtrudeFromTop capabilities (default is yes)]),
++
+ [EXTRUDEFROMTOP=$withval],[EXTRUDEFROMTOP=yes])
++
+ AC_MSG_CHECKING(for ExtrudeFromTop capability compilation)
+
++
+ HAVE_EXTRUDEFROMTOP=no
++
+ if test "x$EXTRUDEFROMTOP" = "xyes"; then
++
+ HAVE_EXTRUDEFROMTOP=yes
++
+ AC_DEFINE([_HAVE_EXTRUDEFROMTOP_],[1],[with ExtrudeFromTopcapability])
++
+ fi
++
+ AM_CONDITIONAL([EXTRUDEFROMTOP], [test x$HAVE_EXTRUDEFROMTOP = xyes])
++
+ AC_MSG_RESULT($HAVE_EXTRUDEFROMTOP)
++
+ dnl }}}
+ dnl with-DepthAverage{{{
++
+ AC_ARG_WITH([DepthAverage],
++
+ AS_HELP_STRING([--with-DepthAverage = YES], [compile with DepthAverage capabilities (default is yes)]),
++
+ [DEPTHAVERAGE=$withval],[DEPTHAVERAGE=yes])
++
+ AC_MSG_CHECKING(for DepthAverage capability compilation)
+
++
+ HAVE_DEPTHAVERAGE=no
++
+ if test "x$DEPTHAVERAGE" = "xyes"; then
++
+ HAVE_DEPTHAVERAGE=yes
++
+ AC_DEFINE([_HAVE_DEPTHAVERAGE_],[1],[with DepthAveragecapability])
++
+ fi
++
+ AM_CONDITIONAL([DEPTHAVERAGE], [test x$HAVE_DEPTHAVERAGE = xyes])
++
+ AC_MSG_RESULT($HAVE_DEPTHAVERAGE)
++
+ dnl }}}
+ dnl with-SmoothedSurfaceSlopeX{{{
++
+ AC_ARG_WITH([SmoothedSurfaceSlopeX],
++
+ AS_HELP_STRING([--with-SmoothedSurfaceSlopeX = YES], [compile with SmoothedSurfaceSlopeX capabilities (default is yes)]),
++
+ [SMOOTHEDSURFACESLOPEX=$withval],[SMOOTHEDSURFACESLOPEX=yes])
++
+ AC_MSG_CHECKING(for SmoothedSurfaceSlopeX capability compilation)
+
++
+ HAVE_SMOOTHEDSURFACESLOPEX=no
++
+ if test "x$SMOOTHEDSURFACESLOPEX" = "xyes"; then
++
+ HAVE_SMOOTHEDSURFACESLOPEX=yes
++
+ AC_DEFINE([_HAVE_SMOOTHEDSURFACESLOPEX_],[1],[with SmoothedSurfaceSlopeXcapability])
++
+ fi
++
+ AM_CONDITIONAL([SMOOTHEDSURFACESLOPEX], [test x$HAVE_SMOOTHEDSURFACESLOPEX = xyes])
++
+ AC_MSG_RESULT($HAVE_SMOOTHEDSURFACESLOPEX)
++
+ dnl }}}
+ dnl with-SmoothedSurfaceSlopeY{{{
++
+ AC_ARG_WITH([SmoothedSurfaceSlopeY],
++
+ AS_HELP_STRING([--with-SmoothedSurfaceSlopeY = YES], [compile with SmoothedSurfaceSlopeY capabilities (default is yes)]),
++
+ [SMOOTHEDSURFACESLOPEY=$withval],[SMOOTHEDSURFACESLOPEY=yes])
++
+ AC_MSG_CHECKING(for SmoothedSurfaceSlopeY capability compilation)
+
++
+ HAVE_SMOOTHEDSURFACESLOPEY=no
++
+ if test "x$SMOOTHEDSURFACESLOPEY" = "xyes"; then
++
+ HAVE_SMOOTHEDSURFACESLOPEY=yes
++
+ AC_DEFINE([_HAVE_SMOOTHEDSURFACESLOPEY_],[1],[with SmoothedSurfaceSlopeYcapability])
++
+ fi
++
+ AM_CONDITIONAL([SMOOTHEDSURFACESLOPEY], [test x$HAVE_SMOOTHEDSURFACESLOPEY = xyes])
++
+ AC_MSG_RESULT($HAVE_SMOOTHEDSURFACESLOPEY)
++
+ dnl }}}
+ dnl with-Thermal{{{
++
+ AC_ARG_WITH([Thermal],
++
+ AS_HELP_STRING([--with-Thermal = YES], [compile with Thermal capabilities (default is yes)]),
++
+ [THERMAL=$withval],[THERMAL=yes])
++
+ AC_MSG_CHECKING(for Thermal capability compilation)
+
++
+ HAVE_THERMAL=no
++
+ if test "x$THERMAL" = "xyes"; then
++
+ HAVE_THERMAL=yes
++
+ AC_DEFINE([_HAVE_THERMAL_],[1],[with Thermalcapability])
++
+ fi
++
+ AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes])
++
+ AC_MSG_RESULT($HAVE_THERMAL)
++
+ dnl }}}
+ dnl with-Gia{{{
++
+ AC_ARG_WITH([Gia],
++
+ AS_HELP_STRING([--with-Gia = YES], [compile with Gia capabilities (default is yes)]),
++
+ [GIA=$withval],[GIA=yes])
++
+ AC_MSG_CHECKING(for Gia capability compilation)
+
++
+ HAVE_GIA=no
++
+ if test "x$GIA" = "xyes"; then
++
+ HAVE_GIA=yes
++
+ AC_DEFINE([_HAVE_GIA_],[1],[with Giacapability])
++
+ fi
++
+ AM_CONDITIONAL([GIA], [test x$HAVE_GIA = xyes])
++
+ AC_MSG_RESULT($HAVE_GIA)
++
+ dnl }}}
+ dnl with-Meshdeformation{{{
++
+ AC_ARG_WITH([Meshdeformation],
++
+ AS_HELP_STRING([--with-Meshdeformation = YES], [compile with Meshdeformation capabilities (default is yes)]),
++
+ [MESHDEFORMATION=$withval],[MESHDEFORMATION=yes])
++
+ AC_MSG_CHECKING(for Meshdeformation capability compilation)
+
++
+ HAVE_MESHDEFORMATION=no
++
+ if test "x$MESHDEFORMATION" = "xyes"; then
++
+ HAVE_MESHDEFORMATION=yes
++
+ AC_DEFINE([_HAVE_MESHDEFORMATION_],[1],[with Meshdeformationcapability])
++
+ fi
++
+ AM_CONDITIONAL([MESHDEFORMATION], [test x$HAVE_MESHDEFORMATION = xyes])
++
+ AC_MSG_RESULT($HAVE_MESHDEFORMATION)
++
+ dnl }}}
+ dnl with-Levelset{{{
++
+ AC_ARG_WITH([Levelset],
++
+ AS_HELP_STRING([--with-Levelset = YES], [compile with Levelset capabilities (default is yes)]),
++
+ [LEVELSET=$withval],[LEVELSET=yes])
++
+ AC_MSG_CHECKING(for Levelset capability compilation)
+
++
+ HAVE_LEVELSET=no
++
+ if test "x$LEVELSET" = "xyes"; then
++
+ HAVE_LEVELSET=yes
++
+ AC_DEFINE([_HAVE_LEVELSET_],[1],[with Levelsetcapability])
++
+ fi
++
+ AM_CONDITIONAL([LEVELSET], [test x$HAVE_LEVELSET = xyes])
++
+ AC_MSG_RESULT($HAVE_LEVELSET)
++
+ dnl }}}
+ dnl with-Extrapolation{{{
++
+ AC_ARG_WITH([Extrapolation],
++
+ AS_HELP_STRING([--with-Extrapolation = YES], [compile with Extrapolation capabilities (default is yes)]),
++
+ [EXTRAPOLATION=$withval],[EXTRAPOLATION=yes])
++
+ AC_MSG_CHECKING(for Extrapolation capability compilation)
+
++
+ HAVE_EXTRAPOLATION=no
++
+ if test "x$EXTRAPOLATION" = "xyes"; then
++
+ HAVE_EXTRAPOLATION=yes
++
+ AC_DEFINE([_HAVE_EXTRAPOLATION_],[1],[with Extrapolationcapability])
++
+ fi
++
+ AM_CONDITIONAL([EXTRAPOLATION], [test x$HAVE_EXTRAPOLATION = xyes])
++
+ AC_MSG_RESULT($HAVE_EXTRAPOLATION)
++
+ dnl }}}
+ dnl with-LsfReinitialization{{{
++
+ AC_ARG_WITH([LsfReinitialization],
++
+ AS_HELP_STRING([--with-LsfReinitialization = YES], [compile with LsfReinitialization capabilities (default is yes)]),
++
+ [LSFREINITIALIZATION=$withval],[LSFREINITIALIZATION=yes])
++
+ AC_MSG_CHECKING(for LsfReinitialization capability compilation)
+
++
+ HAVE_LSFREINITIALIZATION=no
++
+ if test "x$LSFREINITIALIZATION" = "xyes"; then
++
+ HAVE_LSFREINITIALIZATION=yes
++
+ AC_DEFINE([_HAVE_LSFREINITIALIZATION_],[1],[with LsfReinitializationcapability])
++
+ fi
++
+ AM_CONDITIONAL([LSFREINITIALIZATION], [test x$HAVE_LSFREINITIALIZATION = xyes])
++
+ AC_MSG_RESULT($HAVE_LSFREINITIALIZATION)
++
+ dnl }}}
+
+ ])
Index: /issm/oecreview/Archive/17802-17983/ISSM-17832-17833.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17832-17833.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17832-17833.diff (revision 17986)
@@ -0,0 +1,20 @@
+Index: ../trunk-jpl/src/c/classes/Materials/Matice.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 17832)
++++ ../trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 17833)
+@@ -107,6 +107,7 @@
+ matice->mid=this->mid;
+ matice->helement=(Hook*)this->helement->copy();
+ matice->element =(Element*)this->helement->delivers();
++ matice->isdamaged = this->isdamaged;
+
+ return matice;
+ }
+@@ -124,6 +125,7 @@
+ matice->mid=this->mid;
+ matice->helement=(Hook*)this->helement->copy();
+ matice->element =element_in;
++ matice->isdamaged = this->isdamaged;
+
+ return matice;
+ }
Index: /issm/oecreview/Archive/17802-17983/ISSM-17833-17834.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17833-17834.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17833-17834.diff (revision 17986)
@@ -0,0 +1,22 @@
+Index: ../trunk-jpl/src/m/interp/SectionValues.py
+===================================================================
+--- ../trunk-jpl/src/m/interp/SectionValues.py (revision 17833)
++++ ../trunk-jpl/src/m/interp/SectionValues.py (revision 17834)
+@@ -4,7 +4,7 @@
+ from project2d import project2d
+ #from InterpFromMesh2d import InterpFromMesh2d
+ from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
+-#from InterpFromMeshToMesh3d import InterpFromMeshToMesh3d
++from InterpFromMeshToMesh3d import InterpFromMeshToMesh3d
+
+ def SectionValues(md,data,infile,resolution):
+ '''
+@@ -127,7 +127,7 @@
+ index3[(i-1)*elementsperlayer:i*elementsperlayer,:]=ids
+
+ #Interpolation of data on specified points
+- # TODO data_interp=InterpFromMeshToMesh3d(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,data,X3,Y3,Z3,npy.nan)
++ data_interp=InterpFromMeshToMesh3d(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,data,X3,Y3,Z3,npy.nan)
+
+ #build outputs
+ X=X3
Index: /issm/oecreview/Archive/17802-17983/ISSM-17834-17835.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17834-17835.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17834-17835.diff (revision 17986)
@@ -0,0 +1,26 @@
+Index: ../trunk-jpl/externalpackages/latex2html/install.sh
+===================================================================
+--- ../trunk-jpl/externalpackages/latex2html/install.sh (revision 17834)
++++ ../trunk-jpl/externalpackages/latex2html/install.sh (revision 17835)
+@@ -1,21 +0,0 @@
+-#!/bin/bash
+-set -eu
+-
+-#Some cleanup
+-rm -rf install src latex2html-2008
+-
+-#Download from ISSM server
+-$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://www.latex2html.org/~latex2ht/current/latex2html-2008.tar.gz' 'latex2html-2008.tar.gz'
+-
+-#untar
+-tar -zxvf latex2html-2008.tar.gz
+-mv latex2html-2008 install
+-
+-#Configure
+-cd install
+-./configure --prefix "$ISSM_DIR/externalpackages/latex2html/install/"
+-exit 0
+-
+-#Install
+-make
+-make install
Index: /issm/oecreview/Archive/17802-17983/ISSM-17835-17836.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17835-17836.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17835-17836.diff (revision 17986)
@@ -0,0 +1,13 @@
+Index: ../trunk-jpl/src/m/mech/robintemperature.py
+===================================================================
+--- ../trunk-jpl/src/m/mech/robintemperature.py (revision 17835)
++++ ../trunk-jpl/src/m/mech/robintemperature.py (revision 17836)
+@@ -36,6 +36,7 @@
+ zstar=npy.sqrt(2.*alphaT*thickness/accumrate)
+
+ tprofile=surftemp+npy.sqrt(2.*thickness*npy.pi/accumrate/alphaT)*(-heatflux)/2./rho/c*(erf(z/zstar)-erf(thickness/zstar))
+-
++
++ return tprofile
+ # difference between surface and base temperature for check (Cuffey2010 p412):
+ # print tprofile-surftemp
Index: /issm/oecreview/Archive/17802-17983/ISSM-17836-17837.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17836-17837.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17836-17837.diff (revision 17986)
@@ -0,0 +1,11 @@
+Index: ../trunk-jpl/externalpackages/ssh/README
+===================================================================
+--- ../trunk-jpl/externalpackages/ssh/README (revision 17836)
++++ ../trunk-jpl/externalpackages/ssh/README (revision 17837)
+@@ -1,6 +0,0 @@
+-These two command line tools are taken from the Putty web page:
+-http://www.chiark.greenend.org.uk/~sgtatham/putty
+-
+-These two tools are used instead of ssh and scp (the ones that ship with cygwin),
+-because ssh and scp do not work when called directly from matlab using the 'system'
+-command.
Index: /issm/oecreview/Archive/17802-17983/ISSM-17837-17838.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17837-17838.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17837-17838.diff (revision 17986)
@@ -0,0 +1,45 @@
+Index: ../trunk-jpl/src/m/plot/plot_overlay.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/plot_overlay.py (revision 17837)
++++ ../trunk-jpl/src/m/plot/plot_overlay.py (revision 17838)
+@@ -100,4 +100,7 @@
+
+ norm=mpl.colors.Normalize(vmin=overlaylims[0],vmax=overlaylims[1])
+
+- ax.pcolormesh(xgmap, ygmap, npy.flipud(arr), cmap=mpl.cm.Greys, norm=norm)
++ pc=ax.pcolormesh(xgmap, ygmap, npy.flipud(arr), cmap=mpl.cm.Greys, norm=norm)
++ #rasterization?
++ if options.getfieldvalue('rasterized',0):
++ pc.set_rasterized(True)
+Index: ../trunk-jpl/src/m/plot/applyoptions.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/applyoptions.py (revision 17837)
++++ ../trunk-jpl/src/m/plot/applyoptions.py (revision 17838)
+@@ -108,16 +108,13 @@
+ #xticklabels,yticklabels,zticklabels {{{
+ if options.exist('xticklabels'):
+ xticklabels=options.getfieldvalue('xticklabels')
+- xtickloc=p.xticks()[0]
+- ax.set_xticks(xtickloc,xticklabels)
++ ax.set_xticklabels(xticklabels)
+ if options.exist('yticklabels'):
+ yticklabels=options.getfieldvalue('yticklabels')
+- ytickloc=p.yticks()[0]
+- ax.set_yticks(ytickloc,yticklabels)
++ ax.set_yticklabels(yticklabels)
+ if options.exist('zticklabels'):
+ zticklabels=options.getfieldvalue('zticklabels')
+- ztickloc=p.zticks()[0]
+- ax.set_zticks(ztickloc,zticklabels)
++ ax.set_zticklabels(zticklabels)
+ #}}}
+
+ #ticklabel notation {{{
+@@ -170,6 +167,7 @@
+ options.addfielddefault('clim',lims)
+ else:
+ if len(data)>0: lims=[data.min(),data.max()]
++ else: lims=[0,1]
+ #}}}
+
+ #shading
Index: /issm/oecreview/Archive/17802-17983/ISSM-17838-17839.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17838-17839.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17838-17839.diff (revision 17986)
@@ -0,0 +1,267 @@
+Index: ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp
+===================================================================
+--- ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 17838)
++++ ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 17839)
+@@ -257,8 +257,10 @@
+
+ /*Fetch dof list and allocate solution vector*/
+ element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
+- IssmDouble* thickness = xNew(numvertices);
+- IssmDouble* values = xNew(numnodes);
++ IssmDouble* values = xNew(numnodes);
++ IssmDouble* thickness_list = xNew(numvertices);
++ IssmDouble* vx_list = xNew(numvertices);
++ IssmDouble* vy_list = xNew(numvertices);
+
+ /*Use the dof list to index into the solution vector: */
+ for(int i=0;iAddInput(ThicknessEnum,thickness,P1Enum);
++ element->AddInput(ThicknessEnum,thickness_list,P1Enum);
++ element->AddInput(VxEnum,vx_list,P1Enum);
++ element->AddInput(VyEnum,vy_list,P1Enum);
+
+ /*Clean up and return*/
+ delete gauss;
+ xDelete(doflist);
+ xDelete(xyz_list);
+ xDelete(values);
+- xDelete(thickness);
++ xDelete(thickness_list);
++ xDelete(vx_list);
++ xDelete(vy_list);
+ }/*}}}*/
+ void Balancethickness2Analysis::UpdateConstraints(FemModel* femmodel){/*{{{*/
+ /*Default, do nothing*/
+Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17838)
++++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17839)
+@@ -100,7 +100,7 @@
+ EffectivePressureEnum,
+ EplHeadEnum,
+ EplHeadOldEnum,
+- EplHeadSlopeXEnum,
++ EplHeadSlopeXEnum,
+ EplHeadSlopeYEnum,
+ HydrologydcMaxIterEnum,
+ HydrologydcRelTolEnum,
+@@ -249,7 +249,6 @@
+ SettingsLowmemEnum,
+ SettingsOutputFrequencyEnum,
+ SettingsWaitonlockEnum,
+-
+ DebugProfilingEnum,
+ ProfilingCurrentMemEnum,
+ ProfilingCurrentFlopsEnum,
+@@ -260,7 +259,6 @@
+ SteadystateReltolEnum,
+ SteadystateRequestedOutputsEnum,
+ SurfaceEnum,
+-
+ ThermalIsenthalpyEnum,
+ ThermalIsdynamicbasalspcEnum,
+ ThermalMaxiterEnum,
+@@ -288,6 +286,10 @@
+ TransientIshydrologyEnum,
+ TransientNumRequestedOutputsEnum,
+ TransientRequestedOutputsEnum,
++ PotentialEnum,
++ Balancethickness2MisfitEnum,
++ NuXEnum,
++ NuYEnum,
+ /*}}}*/
+ /*Surfaceforcings{{{*/
+ SurfaceforcingsEnum,
+Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17838)
++++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17839)
+@@ -294,6 +294,10 @@
+ case TransientIshydrologyEnum : return "TransientIshydrology";
+ case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
+ case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
++ case PotentialEnum : return "Potential";
++ case Balancethickness2MisfitEnum : return "Balancethickness2Misfit";
++ case NuXEnum : return "NuX";
++ case NuYEnum : return "NuY";
+ case SurfaceforcingsEnum : return "Surfaceforcings";
+ case SMBEnum : return "SMB";
+ case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance";
+Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17838)
++++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17839)
+@@ -300,6 +300,10 @@
+ else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum;
+ else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
+ else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
++ else if (strcmp(name,"Potential")==0) return PotentialEnum;
++ else if (strcmp(name,"Balancethickness2Misfit")==0) return Balancethickness2MisfitEnum;
++ else if (strcmp(name,"NuX")==0) return NuXEnum;
++ else if (strcmp(name,"NuY")==0) return NuYEnum;
+ else if (strcmp(name,"Surfaceforcings")==0) return SurfaceforcingsEnum;
+ else if (strcmp(name,"SMB")==0) return SMBEnum;
+ else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
+@@ -378,14 +382,14 @@
+ else if (strcmp(name,"LsfReinitializationAnalysis")==0) return LsfReinitializationAnalysisEnum;
+ else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
+ else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
+- else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
++ else stage=4;
++ }
++ if(stage==4){
++ if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
+ else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
+ else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
+ else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
+- else stage=4;
+- }
+- if(stage==4){
+- if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
++ else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum;
+ else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum;
+ else if (strcmp(name,"HOFSApproximation")==0) return HOFSApproximationEnum;
+ else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
+@@ -501,14 +505,14 @@
+ else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
+ else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
+ else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
+- else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
++ else stage=5;
++ }
++ if(stage==5){
++ if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
+ else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
+ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
+ else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
+- else stage=5;
+- }
+- if(stage==5){
+- if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
++ else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
+ else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
+ else if (strcmp(name,"Vel")==0) return VelEnum;
+ else if (strcmp(name,"Velocity")==0) return VelocityEnum;
+@@ -624,14 +628,14 @@
+ else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
+ else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
+ else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
+- else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
++ else stage=6;
++ }
++ if(stage==6){
++ if (strcmp(name,"Incremental")==0) return IncrementalEnum;
+ else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
+ else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
+ else if (strcmp(name,"None")==0) return NoneEnum;
+- else stage=6;
+- }
+- if(stage==6){
+- if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
++ else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum;
+ else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum;
+ else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
+ else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum;
+Index: ../trunk-jpl/src/c/cores/balancethickness2_core.cpp
+===================================================================
+--- ../trunk-jpl/src/c/cores/balancethickness2_core.cpp (revision 17838)
++++ ../trunk-jpl/src/c/cores/balancethickness2_core.cpp (revision 17839)
+@@ -25,8 +25,8 @@
+
+ if(save_results){
+ if(VerboseSolution()) _printf0_(" saving results\n");
+- int outputs[2] = {ThicknessEnum,EnthalpyEnum};
+- femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);
++ int outputs[4] = {ThicknessEnum,EnthalpyEnum,VxEnum,VyEnum};
++ femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],4);
+ }
+
+ }
+Index: ../trunk-jpl/src/m/enum/NuXEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/NuXEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/NuXEnum.m (revision 17839)
+@@ -0,0 +1,11 @@
++function macro=NuXEnum()
++%NUXENUM - Enum of NuX
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=NuXEnum()
++
++macro=StringToEnum('NuX');
+Index: ../trunk-jpl/src/m/enum/PotentialEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/PotentialEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/PotentialEnum.m (revision 17839)
+@@ -0,0 +1,11 @@
++function macro=PotentialEnum()
++%POTENTIALENUM - Enum of Potential
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=PotentialEnum()
++
++macro=StringToEnum('Potential');
+Index: ../trunk-jpl/src/m/enum/NuYEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/NuYEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/NuYEnum.m (revision 17839)
+@@ -0,0 +1,11 @@
++function macro=NuYEnum()
++%NUYENUM - Enum of NuY
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=NuYEnum()
++
++macro=StringToEnum('NuY');
+Index: ../trunk-jpl/src/m/enum/Balancethickness2MisfitEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/Balancethickness2MisfitEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/Balancethickness2MisfitEnum.m (revision 17839)
+@@ -0,0 +1,11 @@
++function macro=Balancethickness2MisfitEnum()
++%BALANCETHICKNESS2MISFITENUM - Enum of Balancethickness2Misfit
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=Balancethickness2MisfitEnum()
++
++macro=StringToEnum('Balancethickness2Misfit');
+Index: ../trunk-jpl/src/m/enum/EnumDefinitions.py
+===================================================================
+--- ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17838)
++++ ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17839)
+@@ -286,6 +286,10 @@
+ def TransientIshydrologyEnum(): return StringToEnum("TransientIshydrology")[0]
+ def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0]
+ def TransientRequestedOutputsEnum(): return StringToEnum("TransientRequestedOutputs")[0]
++def PotentialEnum(): return StringToEnum("Potential")[0]
++def Balancethickness2MisfitEnum(): return StringToEnum("Balancethickness2Misfit")[0]
++def NuXEnum(): return StringToEnum("NuX")[0]
++def NuYEnum(): return StringToEnum("NuY")[0]
+ def SurfaceforcingsEnum(): return StringToEnum("Surfaceforcings")[0]
+ def SMBEnum(): return StringToEnum("SMB")[0]
+ def SurfaceforcingsMassBalanceEnum(): return StringToEnum("SurfaceforcingsMassBalance")[0]
Index: /issm/oecreview/Archive/17802-17983/ISSM-17839-17840.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17839-17840.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17839-17840.diff (revision 17986)
@@ -0,0 +1,17 @@
+Index: ../trunk-jpl/src/m/extrusion/project2d.py
+===================================================================
+--- ../trunk-jpl/src/m/extrusion/project2d.py (revision 17839)
++++ ../trunk-jpl/src/m/extrusion/project2d.py (revision 17840)
+@@ -33,10 +33,10 @@
+ value=npy.array(value)
+
+ vec2d=False
+- if value.ndim==2:
++ if value.ndim==2 and value.shape[1]==1:
+ value=value.reshape(-1,)
+ vec2d=True
+-
++
+ if value.size==1:
+ projection_value=value[(layer-1)*md3d.mesh.numberofelements2d:layer*md3d.mesh.numberofelements2d]
+ elif value.shape[0]==md3d.mesh.numberofvertices:
Index: /issm/oecreview/Archive/17802-17983/ISSM-17840-17841.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17840-17841.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17840-17841.diff (revision 17986)
@@ -0,0 +1,40 @@
+Index: ../trunk-jpl/src/m/plot/plotmodel.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/plotmodel.py (revision 17840)
++++ ../trunk-jpl/src/m/plot/plotmodel.py (revision 17841)
+@@ -59,7 +59,7 @@
+ #if figsize specified
+ if options.list[0].exist('figsize'):
+ figsize=options.list[0].getfieldvalue('figsize')
+- fig=plt.figure(figurenumber,figsize=figsize,tight_layout=True)
++ fig=plt.figure(figurenumber,figsize=(figsize[0],figsize[1]),tight_layout=True)
+ else:
+ fig=plt.figure(figurenumber,tight_layout=True)
+ fig.clf()
+@@ -88,9 +88,12 @@
+ cbar_pad=cbar_pad
+ )
+
++ if cbar_mode=='none':
++ for ax in axgrid.cbar_axes: fig._axstack.remove(ax)
++
+ for i in xrange(numberofplots):
+ plot_manager(options.list[i].getfieldvalue('model',md),options.list[i],fig,axgrid[i])
+
+- plt.show()
++ fig.show()
+ else:
+ raise StandardError('plotmodel error message: no output data found.')
+Index: ../trunk-jpl/src/m/plot/plot_unit.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/plot_unit.py (revision 17840)
++++ ../trunk-jpl/src/m/plot/plot_unit.py (revision 17841)
+@@ -54,7 +54,7 @@
+ elif datatype==2:
+ #node plot
+ if is2d:
+- tri=ax.tricontourf(x,y,elements,data,colorlevels,cmap=cmap,norm=norm,alpha=alpha)
++ tri=ax.tricontourf(x,y,elements,data,colorlevels,cmap=cmap,norm=norm,alpha=alpha,extend='both')
+ if edgecolor != 'None':
+ ax.triplot(x,y,elements,color=edgecolor)
+ else:
Index: /issm/oecreview/Archive/17802-17983/ISSM-17841-17842.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17841-17842.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17841-17842.diff (revision 17986)
@@ -0,0 +1,467 @@
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateFaces.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateFaces.cpp (revision 17841)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateFaces.cpp (revision 17842)
+@@ -125,49 +125,53 @@
+
+ /*Intermediaries*/
+ bool exist;
+- int i,j,k,v0,cols;
+- int maxnbf,nbf,elementnbf,elementnbv,facemaxnbv;
++ int i,j,k,v0,cols,facescols;
++ int maxnbf,nbf,elementnbf,elementnbv,facenbv,facemaxnbv;
+ int *elementfaces = NULL;
+ int *elementfaces_markers = NULL;
+
+- /*Maximum number of faces*/
+- maxnbf = 5*iomodel->numberofelements;
++ /*Mesh specific face indexing per element*/
++ switch(iomodel->meshelementtype){
++ case PentaEnum:
++ elementnbv = 6; /*Number of vertices per element*/
++ elementnbf = 5; /*Number of faces per element*/
++ facemaxnbv = 4; /*Maximum number of vertices per face*/
++ cols = facemaxnbv + 1;
++ elementfaces = xNew(elementnbf*cols);
++ elementfaces_markers = xNew(elementnbf);
++ /*2 triangles*/
++ elementfaces_markers[0] = 1;
++ elementfaces_markers[1] = 1;
++ elementfaces[cols*0+0] = 3; elementfaces[cols*0+1] = 0; elementfaces[cols*0+2] = 1; elementfaces[cols*0+3] = 2;
++ elementfaces[cols*1+0] = 3; elementfaces[cols*1+1] = 3; elementfaces[cols*1+2] = 4; elementfaces[cols*1+3] = 5;
++ /*3 quads*/
++ elementfaces_markers[2] = 2;
++ elementfaces_markers[3] = 2;
++ elementfaces_markers[4] = 2;
++ elementfaces[cols*2+0] = 4; elementfaces[cols*2+1] = 1; elementfaces[cols*2+2] = 2; elementfaces[cols*2+3] = 5; elementfaces[cols*2+4] = 4;
++ elementfaces[cols*3+0] = 4; elementfaces[cols*3+1] = 2; elementfaces[cols*3+2] = 0; elementfaces[cols*3+3] = 3; elementfaces[cols*3+4] = 5;
++ elementfaces[cols*4+0] = 4; elementfaces[cols*4+1] = 0; elementfaces[cols*4+2] = 1; elementfaces[cols*4+3] = 4; elementfaces[cols*4+4] = 3;
++ break;
++ default:
++ _error_("mesh "<< EnumToStringx(iomodel->meshelementtype) <<" not supported");
++ }
+
++ /*Allocate connectivity*/
++ int *element_face_connectivity = xNew(iomodel->numberofelements*elementnbf); /*format: [face1 face2 ...] */
++
++ /*Maximum number of faces for initial allocation*/
++ maxnbf = elementnbf*iomodel->numberofelements;
++ facescols = 4+facemaxnbv; _assert_(facescols>6);
++
+ /*Initialize intermediaries*/
+- int* facestemp = xNew(maxnbf*6); /*format: [vertex1 vertex2 vertex3 element1 element2 marker] */
+- for(i=0;i(maxnbf*facescols); /*format: [element1 element2 marker nbv vertex1 vertex2 vertex3 ...] */
++ for(i=0;i(iomodel->numberofvertices);
+ int* next_face = xNew(maxnbf);
+ for(i=0;inumberofvertices;i++) head_minv[i]=-1;
+
+- /*Mesh specific face indexing per element*/
+- if(iomodel->meshelementtype==PentaEnum){
+- elementnbv = 6; /*Number of vertices per element*/
+- elementnbf = 5; /*Number of faces per element*/
+- facemaxnbv = 4; /*Maximum number of vertices per face*/
+- cols = facemaxnbv + 1;
+- elementfaces = xNew(elementnbf*cols);
+- elementfaces_markers = xNew(elementnbf);
+- /*2 triangles*/
+- elementfaces_markers[0] = 1;
+- elementfaces_markers[1] = 1;
+- elementfaces[cols*0+0] = 3; elementfaces[cols*0+1] = 0; elementfaces[cols*0+2] = 1; elementfaces[cols*0+3] = 2;
+- elementfaces[cols*1+0] = 3; elementfaces[cols*1+1] = 3; elementfaces[cols*1+2] = 4; elementfaces[cols*1+3] = 5;
+- /*3 quads*/
+- elementfaces_markers[2] = 2;
+- elementfaces_markers[3] = 2;
+- elementfaces_markers[4] = 2;
+- elementfaces[cols*2+0] = 4; elementfaces[cols*2+1] = 1; elementfaces[cols*2+2] = 2; elementfaces[cols*2+3] = 5; elementfaces[cols*2+4] = 4;
+- elementfaces[cols*3+0] = 4; elementfaces[cols*3+1] = 2; elementfaces[cols*3+2] = 0; elementfaces[cols*3+3] = 3; elementfaces[cols*3+4] = 5;
+- elementfaces[cols*4+0] = 4; elementfaces[cols*4+1] = 0; elementfaces[cols*4+2] = 1; elementfaces[cols*4+3] = 4; elementfaces[cols*4+4] = 3;
+- }
+- else{
+- _error_("mesh dimension not supported yet");
+- }
+- int *element_face_connectivity = xNew(iomodel->numberofelements*elementnbf); /*format: [face1 face2 ...] */
+-
+ /*Initialize number of faces and list of vertex indices*/
+ nbf = 0;
+ int* v = xNew(facemaxnbv);
+@@ -176,24 +180,24 @@
+ for(j=0;jelements[i*elementnbv + elementfaces[cols*j+k+1]] - 1;
+ }
+
+ /*Sort list of vertices*/
+ HeapSort(v,elementfaces[cols*j+0]);
+- v0 = v[0];
++ v0 = v[0]; _assert_(v0>=0 && v0numberofvertices);
+
+ /*This face a priori has not been processed yet*/
+ exist = false;
+
+- /*Go through all processed faces connected to v1 and check whether we have seen this edge yet*/
+- _assert_(v0>=0 && v0numberofvertices);
+- for(int e=head_minv[v0]; e!=-1; e=next_face[e]){
+- if(facestemp[e*6+1]==v[1]+1 && facestemp[e*6+2]==v[2]+1){
++ /*Go through all processed faces connected to v0 and check whether we have seen this face yet*/
++ for(int f=head_minv[v0]; f!=-1; f=next_face[f]){
++ if(facestemp[f*facescols+5]==v[1]+1 && facestemp[f*facescols+6]==v[2]+1){
+ exist = true;
+- facestemp[e*6+4]=i+1;
+- element_face_connectivity[i*elementnbf+j]=e;
++ facestemp[f*facescols+1]=i+1;
++ element_face_connectivity[i*elementnbf+j]=f;
+ break;
+ }
+ }
+@@ -203,11 +207,10 @@
+ _assert_(nbf(elementfaces_markers);
+
+ /*Create final faces (now that we have the correct size)*/
+- int* faces = xNew(nbf*6); /*vertex1 vertex2 vertex3 element1 element2 marker*/
+- xMemCpy(faces,facestemp,nbf*6);
++ int* faces = xNew(nbf*facescols);
++ xMemCpy(faces,facestemp,nbf*facescols);
+ xDelete(facestemp);
+
+ /*Assign output pointers*/
+ iomodel->faces = faces;
+ iomodel->numberoffaces = nbf;
++ iomodel->facescols = facescols;
+ iomodel->elementtofaceconnectivity = element_face_connectivity;
+ }/*}}}*/
+-void FaceGetVertexIndices(IoModel* iomodel,int* pnumvertices,int** pverticesid,int facenumber){/*{{{*/
+-
+- int numbervertices;
+- if(iomodel->domaintype==Domain3DEnum){
+- if((iomodel->faces[6*facenumber+5])==1){
+- numbervertices=3;
+- }
+- else if((iomodel->faces[6*facenumber+5])==2){
+- numbervertices=4;
+- }
+- else _error_("face marker not supported yet ");
+- }
+- else _error_("mesh type not supported yet");
+-
+- int* facevertices = xNew(numbervertices);
+- if(numbervertices==3){
+- for(int i=0;i<3;i++) facevertices[i]=iomodel->faces[6*facenumber+i]-1;
+- }
+- else if(numbervertices==4){
+- int i,j,k,cols,faceid;
+- int maxnbf,nbf,elementnbf,elementnbv,facemaxnbv;
+- int *elementfaces = NULL;
+- int *elementfaces_markers = NULL;
+- int elementid=iomodel->faces[6*facenumber+3];
+- int counter=0;
+-
+- /*Recreate element properties*/
+- elementnbv = 6; /*Number of vertices per element*/
+- elementnbf = 5; /*Number of faces per element*/
+- facemaxnbv = 4; /*Maximum number of vertices per face*/
+- cols = facemaxnbv + 1;
+- elementfaces = xNew(elementnbf*cols);
+- elementfaces_markers = xNew(elementnbf);
+- /*2 triangles*/
+- elementfaces_markers[0] = 1;
+- elementfaces_markers[1] = 1;
+- elementfaces[cols*0+0] = 3; elementfaces[cols*0+1] = 0; elementfaces[cols*0+2] = 1; elementfaces[cols*0+3] = 2;
+- elementfaces[cols*1+0] = 3; elementfaces[cols*1+1] = 3; elementfaces[cols*1+2] = 4; elementfaces[cols*1+3] = 5;
+- /*3 quads*/
+- elementfaces_markers[2] = 2;
+- elementfaces_markers[3] = 2;
+- elementfaces_markers[4] = 2;
+- elementfaces[cols*2+0] = 4; elementfaces[cols*2+1] = 1; elementfaces[cols*2+2] = 2; elementfaces[cols*2+3] = 5; elementfaces[cols*2+4] = 4;
+- elementfaces[cols*3+0] = 4; elementfaces[cols*3+1] = 2; elementfaces[cols*3+2] = 0; elementfaces[cols*3+3] = 3; elementfaces[cols*3+4] = 5;
+- elementfaces[cols*4+0] = 4; elementfaces[cols*4+1] = 0; elementfaces[cols*4+2] = 1; elementfaces[cols*4+3] = 4; elementfaces[cols*4+4] = 3;
+-
+- for(faceid=2;faceid<5;faceid++){
+- counter=0;
+- for(j=0;j<3;j++){
+- for(k=1;k<5;k++){
+- if(iomodel->elements[(elementid-1)*6+elementfaces[cols*faceid+k]] == iomodel->faces[6*facenumber+j]) counter++;
+- }
+- }
+- if(counter==3) break;
+- }
+- if(counter!=3) _error_("face not found in element");
+-
+- for(j=0;j<4;j++){
+- facevertices[j]=iomodel->elements[(elementid-1)*6+elementfaces[cols*faceid+j+1]];
+- }
+-
+- /*Delete*/
+- xDelete(elementfaces);
+- xDelete(elementfaces_markers);
+- }
+-
+- /*Output results*/
+- *pverticesid=facevertices;
+- *pnumvertices=numbervertices;
+-}/*}}}*/
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17841)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17842)
+@@ -4,8 +4,9 @@
+
+ #include "../../classes/classes.h"
+ #include "../../shared/shared.h"
++#include "./ModelProcessorx.h"
+
+-void CreateEdges(IoModel* iomodel){
++void CreateEdges(IoModel* iomodel){/*{{{*/
+
+ /*If edges are already present, exit*/
+ if(iomodel->edges) return;
+@@ -141,4 +142,25 @@
+ iomodel->edges = edges;
+ iomodel->elementtoedgeconnectivity = element_edge_connectivity;
+ iomodel->numberofedges = nbe;
++}/*}}}*/
++void EdgeOnBoundaryFlags(IoModel* iomodel,bool** pflags){
++
++ /*Get faces and edges*/
++ if(!iomodel->edges) CreateEdges(iomodel);
++ if(!iomodel->faces) CreateFaces(iomodel);
++
++ /*Allocate output*/
++ bool* flags = xNew(iomodel->numberofedges);
++
++ /*Now, loop over the faces, whenever it is not connected to a second element, all edges are on boundary*/
++ for(int i=0;inumberoffaces;i++){
++
++ if(iomodel->faces[i*iomodel->facescols+4]==-1){
++
++ /*Get all edges for this face*/
++ }
++ }
++
++ /*Clean up and return*/
++ *pflags = flags;
+ }
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateNodes.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateNodes.cpp (revision 17841)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateNodes.cpp (revision 17842)
+@@ -146,13 +146,13 @@
+ if(iomodel->meshelementtype==PentaEnum){
+ FacesPartitioning(&my_faces,iomodel);
+ for(i=0;inumberoffaces;i++){
+- if(iomodel->faces[i*6+5]==2){/*Vertical quads*/
++ if(iomodel->faces[i*iomodel->facescols+2]==2){/*Vertical quads*/
+ if(my_faces[i]){
+ node = new Node(id0+i+1,iomodel->numberofvertices+iomodel->numberofedges+i,lid++,0,iomodel,analysis,approximation);
+ nodes->AddObject(node);
+ }
+ }
+- else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/
++ else if(iomodel->faces[i*iomodel->facescols+2]==1){/*Triangular base/top*/
+ /*Nothing*/
+ }
+ else{
+@@ -195,7 +195,7 @@
+ }
+ id0 = id0+iomodel->numberofvertices+3*iomodel->numberofedges;
+ for(i=0;inumberoffaces;i++){
+- if(iomodel->faces[i*6+5]==2){/*Vertical quads*/
++ if(iomodel->faces[i*iomodel->facescols+2]==2){/*Vertical quads*/
+ if(my_faces[i]){
+ node = new Node(id0+3*i+1,counter+1,lid++,0,iomodel,analysis,approximation);
+ nodes->AddObject(node);
+@@ -206,7 +206,7 @@
+ }
+ counter=counter+3;
+ }
+- else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/
++ else if(iomodel->faces[i*iomodel->facescols+2]==1){/*Triangular base/top*/
+ /*Nothing*/
+ }
+ else{
+@@ -311,13 +311,13 @@
+ if(iomodel->meshelementtype==PentaEnum){
+ FacesPartitioning(&my_faces,iomodel);
+ for(i=0;inumberoffaces;i++){
+- if(iomodel->faces[i*6+5]==2){/*Vertical quads*/
++ if(iomodel->faces[i*iomodel->facescols+2]==2){/*Vertical quads*/
+ if(my_faces[i]){
+ node = new Node(id0+i+1,iomodel->numberofvertices+iomodel->numberofedges+i,lid++,0,iomodel,analysis,FSvelocityEnum);
+ nodes->AddObject(node);
+ }
+ }
+- else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/
++ else if(iomodel->faces[i*iomodel->facescols+2]==1){/*Triangular base/top*/
+ /*Nothing*/
+ }
+ else{
+@@ -376,7 +376,7 @@
+ }
+ id0 = id0+iomodel->numberofvertices+3*iomodel->numberofedges;
+ for(i=0;inumberoffaces;i++){
+- if(iomodel->faces[i*6+5]==2){/*Vertical quads*/
++ if(iomodel->faces[i*iomodel->facescols+2]==2){/*Vertical quads*/
+ if(my_faces[i]){
+ node = new Node(id0+3*i+1,counter+1,lid++,0,iomodel,analysis,FSvelocityEnum);
+ nodes->AddObject(node);
+@@ -387,7 +387,7 @@
+ }
+ counter=counter+3;
+ }
+- else if(iomodel->faces[i*6+5]==1){/*Triangular base/top*/
++ else if(iomodel->faces[i*iomodel->facescols+2]==1){/*Triangular base/top*/
+ /*Nothing*/
+ }
+ else{
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 17841)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 17842)
+@@ -32,7 +32,7 @@
+ void CreateEdges(IoModel* iomodel);
+ void CreateFaces(IoModel* iomodel);
+ void CreateFaces3d(IoModel* iomodel);
+-void FaceGetVertexIndices(IoModel* iomodel,int* pnumvertices,int** pverticesid,int facenumber);
++void EdgeOnBoundaryFlags(IoModel* iomodel,bool** pflags);
+
+ /*Connectivity*/
+ void CreateSingleNodeToElementConnectivity(IoModel* iomodel);
+Index: ../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17841)
++++ ../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17842)
+@@ -34,7 +34,6 @@
+ /*intermediary: */
+ bool isnan;
+ int i,j,count,elementnbv,numfacevertices;
+- int* faceverticesid = NULL;
+ IssmDouble value;
+ IssmDouble *times = NULL;
+ IssmDouble *values = NULL;
+@@ -118,23 +117,20 @@
+ }
+ if(iomodel->meshelementtype==PentaEnum){
+ for(i=0;inumberoffaces;i++){
+- if(iomodel->faces[i*6+5]==2){/*Vertical quads*/
++ if(iomodel->faces[i*iomodel->facescols+2]==2){/*Vertical quads*/
+ if(my_faces[i]){
+- FaceGetVertexIndices(iomodel,&numfacevertices,&faceverticesid,i);
+- isnan=0;
++ numfacevertices = iomodel->faces[i*iomodel->facescols+3];
++ value=0.;
+ for(j=0;j(spcdata[faceverticesid[j]-1])) isnan=1;
++ value += spcdata[iomodel->faces[i*iomodel->facescols+4+j] -1];
+ }
+- if(isnan==0){
+- value=0;
+- for(j=0;jAddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+i+1,
++ value = value/reCast(numfacevertices);
++ if(!xIsNan(value)){
++ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,
++ iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+i+1,
+ dof,value,analysis_type));
+ count++;
+ }
+- xDelete(faceverticesid);
+ }
+ }
+ }
+@@ -178,27 +174,26 @@
+ }
+ }
+ for(i=0;inumberoffaces;i++){
+- if(iomodel->faces[i*6+5]==2){/*Vertical quads*/
++ if(iomodel->faces[i*iomodel->facescols+2]==2){/*Vertical quads*/
+ if(my_faces[i]){
+- FaceGetVertexIndices(iomodel,&numfacevertices,&faceverticesid,i);
+- isnan=0;
++ numfacevertices = iomodel->faces[i*iomodel->facescols+3];
++ value=0.;
+ for(j=0;j(spcdata[faceverticesid[j]-1])) isnan=1;
++ value += spcdata[iomodel->faces[i*iomodel->facescols+4+j] -1];
+ }
+- if(isnan==0){
+- value=0;
+- for(j=0;jAddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+1,
++ value = value/reCast(numfacevertices);
++ if(!xIsNan(value)){
++ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,
++ iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+1,
+ dof,value,analysis_type));
+- constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+2,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+2,
++ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+2,
++ iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+2,
+ dof,value,analysis_type));
+- constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+3,iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+3,
++ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+3,
++ iomodel->nodecounter+iomodel->numberofvertices+3*iomodel->numberofedges+3*i+3,
+ dof,value,analysis_type));
+ count=count+3;
+ }
+- xDelete(faceverticesid);
+ }
+ }
+ }
+Index: ../trunk-jpl/src/c/classes/IoModel.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/IoModel.h (revision 17841)
++++ ../trunk-jpl/src/c/classes/IoModel.h (revision 17842)
+@@ -37,6 +37,7 @@
+ int numberofelements;
+ int numberoffaces;
+ int numberofedges;
++ int facescols;
+ int *elements;
+ int *faces;
+ int *edges;
+Index: ../trunk-jpl/src/c/classes/IoModel.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/IoModel.cpp (revision 17841)
++++ ../trunk-jpl/src/c/classes/IoModel.cpp (revision 17842)
+@@ -36,6 +36,7 @@
+ this->numberofelements=-1;
+ this->numberoffaces=-1;
+ this->numberofedges=-1;
++ this->facescols=-1;
+ this->elements=NULL;
+ this->faces=NULL;
+ this->edges=NULL;
+@@ -82,6 +83,7 @@
+ FetchData(&this->numberofvertices,MeshNumberofverticesEnum);
+ FetchData(&this->numberofelements,MeshNumberofelementsEnum);
+ FetchData(&this->elements,NULL,NULL,MeshElementsEnum);
++ this->facescols = -1;
+ this->faces = NULL;
+ this->edges = NULL;
+ this->elementtofaceconnectivity = NULL;
Index: /issm/oecreview/Archive/17802-17983/ISSM-17842-17843.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17842-17843.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17842-17843.diff (revision 17986)
@@ -0,0 +1,22 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17842)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17843)
+@@ -212,7 +212,7 @@
+ IssmDouble eps_xy[NUMVERTICES];
+ IssmDouble eps_xz[NUMVERTICES]={0,0,0};
+ IssmDouble eps_yz[NUMVERTICES]={0,0,0};
+- GaussPenta* gauss=NULL;
++ GaussTria* gauss=NULL;
+
+ /* Get node coordinates and dof list: */
+ ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
+@@ -222,7 +222,7 @@
+ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input);
+
+ /* Start looping on the number of vertices: */
+- gauss=new GaussPenta();
++ gauss=new GaussTria();
+ for (int iv=0;ivGaussVertex(iv);
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17843-17844.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17843-17844.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17843-17844.diff (revision 17986)
@@ -0,0 +1,155 @@
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17843)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17844)
+@@ -143,24 +143,92 @@
+ iomodel->elementtoedgeconnectivity = element_edge_connectivity;
+ iomodel->numberofedges = nbe;
+ }/*}}}*/
+-void EdgeOnBoundaryFlags(IoModel* iomodel,bool** pflags){
++void EdgeOnBoundaryFlags(bool** pflags,IoModel* iomodel){/*{{{*/
+
+- /*Get faces and edges*/
++ /*Intermediaries*/
++ bool isv1,isv2;
++ int facenbv,v1,v2;
++ int id_edge,id_element,id_face;
++ int elementnbe;
++
++ /*Mesh dependent variables*/
++ switch(iomodel->meshelementtype){
++ case TriaEnum: elementnbe = 3; break;
++ case TetraEnum: elementnbe = 6; break;
++ case PentaEnum: elementnbe = 9; break;
++ default: _error_("mesh dimension not supported yet");
++ }
++
++ /*Get edges and allocate output*/
+ if(!iomodel->edges) CreateEdges(iomodel);
+- if(!iomodel->faces) CreateFaces(iomodel);
++ bool* flags = xNewZeroInit(iomodel->numberofedges);
+
+- /*Allocate output*/
+- bool* flags = xNew(iomodel->numberofedges);
++ if(iomodel->domaindim==2){
+
+- /*Now, loop over the faces, whenever it is not connected to a second element, all edges are on boundary*/
+- for(int i=0;inumberoffaces;i++){
++ /*Count how many times an edge is found in elementtoedgeconnectivity*/
++ int* counter = xNewZeroInit(iomodel->numberofedges);
++ for(int i=0;inumberofelements;i++){
++ for(int j=0;jelementtoedgeconnectivity[elementnbe*i+j]] += 1;
++ }
++ }
+
+- if(iomodel->faces[i*iomodel->facescols+4]==-1){
++ /*Now, loop over the egdes, whenever it is not connected to a second element, the edge is on boundary*/
++ for(int i=0;inumberofedges;i++){
++ if(counter[i]==1) flags[i]=true;
++ }
+
+- /*Get all edges for this face*/
++ /*Clean up*/
++ xDelete(counter);
++ }
++ else if(iomodel->domaindim==3){
++
++ /*Get faces*/
++ if(!iomodel->faces) CreateFaces(iomodel);
++
++ /*Now, loop over the faces, whenever it is not connected to a second element, all edges are on boundary*/
++ for(int id_face=0;id_facenumberoffaces;id_face++){
++
++ if(iomodel->faces[id_face*iomodel->facescols+1]==-1){
++
++ /*The face is connected to the element e only*/
++ id_element = iomodel->faces[id_face*iomodel->facescols+0]-1;
++ facenbv = iomodel->faces[id_face*iomodel->facescols+3];
++
++ /*Get all edges for this element*/
++ for(int edge = 0; edgeelementtoedgeconnectivity[elementnbe*id_element+edge];
++ v1 = iomodel->edges[id_edge*3+0];
++ v2 = iomodel->edges[id_edge*3+1];
++
++ /*Test if v1 is in the face*/
++ isv1=false;
++ for(int i=0;ifaces[id_face*iomodel->facescols+4+i] == v1){
++ isv1 = true; break;
++ }
++ }
++ if(!isv1) continue;
++
++ /*test if v2 is in the face*/
++ isv2=false;
++ for(int i=0;ifaces[id_face*iomodel->facescols+4+i] == v2){
++ isv2 = true; break;
++ }
++ }
++
++ /*If v1 and v2 are found, this edge is on boundary*/
++ if(isv2) flags[id_edge] = true;
++ }
++ }
+ }
+ }
++ else{
++ _error_("dimension not supported");
++ }
+
+ /*Clean up and return*/
+ *pflags = flags;
+-}
++}/*}}}*/
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 17843)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 17844)
+@@ -32,7 +32,7 @@
+ void CreateEdges(IoModel* iomodel);
+ void CreateFaces(IoModel* iomodel);
+ void CreateFaces3d(IoModel* iomodel);
+-void EdgeOnBoundaryFlags(IoModel* iomodel,bool** pflags);
++void EdgeOnBoundaryFlags(bool** pflags,IoModel* iomodel);
+
+ /*Connectivity*/
+ void CreateSingleNodeToElementConnectivity(IoModel* iomodel);
+Index: ../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17843)
++++ ../trunk-jpl/src/c/modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (revision 17844)
+@@ -43,6 +43,7 @@
+ int v1,v2,v3,v4;
+ bool *my_edges = NULL;
+ bool *my_faces = NULL;
++ bool *boundaryedge = NULL;
+
+ switch(finite_element){
+ case P1Enum:
+@@ -73,6 +74,7 @@
+ if(iomodel->meshelementtype==PentaEnum){
+ FacesPartitioning(&my_faces,iomodel);
+ }
++ EdgeOnBoundaryFlags(&boundaryedge,iomodel);
+ break;
+ case P2xP4Enum:
+ EdgesPartitioning(&my_edges,iomodel);
+@@ -105,7 +107,7 @@
+ }
+ }
+ for(i=0;inumberofedges;i++){
+- if(my_edges[i]){
++ if(my_edges[i] && boundaryedge[i]){
+ v1 = iomodel->edges[3*i+0]-1;
+ v2 = iomodel->edges[3*i+1]-1;
+ if(!xIsNan(spcdata[v1]) && !xIsNan(spcdata[v2])){
+@@ -465,4 +467,5 @@
+ xDelete(values);
+ xDelete(my_edges);
+ xDelete(my_faces);
++ xDelete(boundaryedge);
+ }
Index: /issm/oecreview/Archive/17802-17983/ISSM-17844-17845.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17844-17845.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17844-17845.diff (revision 17986)
@@ -0,0 +1,13 @@
+Index: ../trunk-jpl/src/m/dev/issmversion.m
+===================================================================
+--- ../trunk-jpl/src/m/dev/issmversion.m (revision 17844)
++++ ../trunk-jpl/src/m/dev/issmversion.m (revision 17845)
+@@ -14,7 +14,7 @@
+ disp(['(website: ' IssmConfig('PACKAGE_URL') ' contact:' IssmConfig('PACKAGE_BUGREPORT') ')']);
+ disp([' ']);
+ disp(['Build date: ' IssmConfig('PACKAGE_BUILD_DATE')]);
+-disp(['Copyright (c) 2009-2013 California Institute of Technology']);
++disp(['Copyright (c) 2009-2014 California Institute of Technology']);
+ disp([' ']);
+ disp([' to get started type: issmdoc']);
+ disp([' ']);
Index: /issm/oecreview/Archive/17802-17983/ISSM-17845-17846.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17845-17846.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17845-17846.diff (revision 17986)
@@ -0,0 +1,27 @@
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateFaces.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateFaces.cpp (revision 17845)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateFaces.cpp (revision 17846)
+@@ -152,6 +152,22 @@
+ elementfaces[cols*3+0] = 4; elementfaces[cols*3+1] = 2; elementfaces[cols*3+2] = 0; elementfaces[cols*3+3] = 3; elementfaces[cols*3+4] = 5;
+ elementfaces[cols*4+0] = 4; elementfaces[cols*4+1] = 0; elementfaces[cols*4+2] = 1; elementfaces[cols*4+3] = 4; elementfaces[cols*4+4] = 3;
+ break;
++ case TetraEnum:
++ elementnbv = 4; /*Number of vertices per element*/
++ elementnbf = 4; /*Number of faces per element*/
++ facemaxnbv = 3; /*Maximum number of vertices per face*/
++ cols = facemaxnbv + 1;
++ elementfaces = xNew(elementnbf*cols);
++ elementfaces_markers = xNew(elementnbf);
++ /*4 triangles*/
++ elementfaces_markers[0] = 1;
++ elementfaces_markers[1] = 1;
++ elementfaces_markers[2] = 1;
++ elementfaces[cols*0+0] = 3; elementfaces[cols*0+1] = 0; elementfaces[cols*0+2] = 1; elementfaces[cols*0+3] = 2;
++ elementfaces[cols*1+0] = 3; elementfaces[cols*1+1] = 0; elementfaces[cols*1+2] = 3; elementfaces[cols*1+3] = 1;
++ elementfaces[cols*2+0] = 3; elementfaces[cols*2+1] = 1; elementfaces[cols*2+2] = 3; elementfaces[cols*2+3] = 2;
++ elementfaces[cols*3+0] = 3; elementfaces[cols*3+1] = 0; elementfaces[cols*3+2] = 2; elementfaces[cols*3+3] = 3;
++ break;
+ default:
+ _error_("mesh "<< EnumToStringx(iomodel->meshelementtype) <<" not supported");
+ }
Index: /issm/oecreview/Archive/17802-17983/ISSM-17846-17847.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17846-17847.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17846-17847.diff (revision 17986)
@@ -0,0 +1,53 @@
+Index: ../trunk-jpl/src/m/contrib/bamg/gmsh.m
+===================================================================
+--- ../trunk-jpl/src/m/contrib/bamg/gmsh.m (revision 0)
++++ ../trunk-jpl/src/m/contrib/bamg/gmsh.m (revision 17847)
+@@ -0,0 +1,48 @@
++function md=gmsh(md,domainfile,h),
++
++%Read domain
++domain=expread(domainfile);
++x = domain.x(1:end-1);
++y = domain.y(1:end-1);
++nbv = numel(x);
++
++%write files
++t1=clock; fprintf('%s',' writing initial mesh files...');
++fid=fopen('model.geo','w');
++fprintf(fid,['// Gmsh input file, created by ISSM on ' date '\n']);
++for i=1:nbv,
++ fprintf(fid,'Point(%i) = {%8g, %8g, %8g};\n',i,x(i),y(i),0.);
++end
++for i=1:nbv-1
++ fprintf(fid,'Line(%i) = {%i, %i};\n',i,i,i+1);
++end
++fprintf(fid,'Line(%i) = {%i, %i};\n',nbv,nbv,1);
++fprintf(fid,'Line Loop(5) = {');
++for i=1:nbv-1
++ fprintf(fid,'%i,',i);
++end
++fprintf(fid,'%i};\n',nbv);
++fprintf(fid,'Plane Surface(6) = {5};\n');
++
++%Physical lines and surfaces
++fprintf(fid,'Physical Line(2) = {1};\n');
++fprintf(fid,'Physical Line(4) = {2};\n');
++fprintf(fid,'Physical Line(5) = {3};\n');
++fprintf(fid,'Physical Line(1) = {4};\n');
++fprintf(fid,'Physical Surface(7) = {6};\n');
++
++%resolution
++fprintf(fid,'Mesh.CharacteristicLengthMax = %g;',h);
++
++%fprintf(fid,'Plane Surface(7) = {6, 2};\n');
++fclose(fid);
++
++t2=clock;fprintf('%s\n',[' done (' num2str(etime(t2,t1)) ' seconds)']);
++
++%call gmsh
++fprintf('%s\n',' call gmsh...');
++system([issmdir() '/externalpackages/gmsh/install/gmsh -2 model.geo']);
++
++%plug new mesh
++t1=clock; fprintf('\n%s',' reading final mesh files...');
++md=importgmsh('model.msh',2);
Index: /issm/oecreview/Archive/17802-17983/ISSM-17847-17848.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17847-17848.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17847-17848.diff (revision 17986)
@@ -0,0 +1,352 @@
+Index: ../trunk-jpl/test/NightlyRun/test1104.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1104.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1104.m (revision 17848)
+@@ -1,7 +1,8 @@
+ %This test is a test from the ISMP-HOM Intercomparison project.
+ %Pattyn and Payne 2006
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+
+ for i=1:length(L_list),
+@@ -55,23 +56,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-08,1e-08,1e-08,...
+- 1e-08,1e-08,1e-08,...
+- 1e-08,1e-08,1e-08,...
+- 1e-08,1e-08,1e-08,...
+ 1e-08,1e-07,1e-08,...
+- 1e-07,1e-07,1e-07,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/NightlyRun/test1105.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1105.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1105.m (revision 17848)
+@@ -2,7 +2,8 @@
+ %Pattyn and Payne 2006
+ printingflag=false;
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+ minvx=[];
+ maxvx=[];
+@@ -134,23 +135,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-08,1e-07,1e-07,...
+- 1e-09,1e-07,1e-07,...
+- 1e-09,1e-09,1e-07,...
+- 1e-09,1e-09,1e-08,...
+ 1e-09,1e-08,1e-08,...
+- 1e-08,1e-08,1e-08,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/NightlyRun/test1106.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1106.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1106.m (revision 17848)
+@@ -1,7 +1,8 @@
+ %This test is a test from the ISMP-HOM Intercomparison project.
+ %Pattyn and Payne 2006
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+
+ for i=1:length(L_list),
+@@ -53,23 +54,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-12,1e-12,1e-11,...
+- 1e-12,2e-12,2e-12,...
+- 1e-12,1e-12,1e-12,...
+- 1e-12,2e-12,2e-12,...
+ 1e-11,2e-12,3e-12,...
+- 1e-11,2e-11,2e-12,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/NightlyRun/test1107.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1107.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1107.m (revision 17848)
+@@ -2,7 +2,8 @@
+ %Pattyn and Payne 2006
+ printingflag=false;
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+ minvx=[];
+ maxvx=[];
+@@ -123,23 +124,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-07,1e-08,1e-06,...
+- 1e-08,1e-08,1e-06,...
+ 1e-08,1e-08,1e-07,...
+- 1e-08,1e-08,1e-07,...
+- 1e-08,1e-08,1e-07,...
+- 1e-07,1e-08,1e-06,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/NightlyRun/test1108.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1108.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1108.m (revision 17848)
+@@ -1,7 +1,8 @@
+ %This test is a test from the ISMP-HOM Intercomparison project.
+ %Pattyn and Payne 2006
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+
+ for i=1:length(L_list),
+@@ -62,23 +63,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-07,1e-07,1e-07,...
+- 1e-08,2e-08,1e-08,...
+ 1e-08,1e-07,1e-07,...
+- 1e-08,1e-08,2e-08,...
+- 1e-08,1e-07,1e-07,...
+- 1e-07,1e-06,1e-07,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/NightlyRun/test1101.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1101.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1101.m (revision 17848)
+@@ -2,7 +2,8 @@
+ %Pattyn and Payne 2006
+ printingflag=false;
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+ minvx=[];
+ maxvx=[];
+@@ -111,23 +112,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-09,1e-09,1e-09,...
+- 1e-10,1e-10,1e-09,...
+- 1e-09,1e-09,1e-09,...
+- 1e-09,1e-08,1e-08,...
+ 1e-08,1e-08,1e-08,...
+- 1e-08,1e-07,1e-08,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/NightlyRun/test1102.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1102.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1102.m (revision 17848)
+@@ -2,7 +2,8 @@
+ %Pattyn and Payne 2006
+ printingflag=false;
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+ minvx=[];
+ maxvx=[];
+@@ -121,23 +122,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-12,1e-12,1e-12,...
+- 1e-12,1e-12,1e-12,...
+ 1e-12,1e-11,1e-12,...
+- 1e-12,1e-11,1e-12,...
+- 1e-12,1e-11,1e-12,...
+- 1e-12,1e-11,1e-12,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/NightlyRun/test1103.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test1103.m (revision 17847)
++++ ../trunk-jpl/test/NightlyRun/test1103.m (revision 17848)
+@@ -2,7 +2,8 @@
+ %Pattyn and Payne 2006
+ printingflag=false;
+
+-L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++%L_list={5000.,10000.,20000.,40000.,80000.,160000.};
++L_list={80000.};
+ results={};
+ minvx=[];
+ maxvx=[];
+@@ -104,23 +105,13 @@
+
+ %Fields and tolerances to track changes
+ field_names ={...
+- 'Vx5km','Vy5km','Vz5km',...
+- 'Vx10km','Vy10km','Vz10km',...
+- 'Vx20km','Vy20km','Vz20km',...
+- 'Vx40km','Vy40km','Vz40km',...
+- 'Vx80km','Vy80km','Vz80km',...
+- 'Vx160km','Vy160km','Vz160km'
++ 'Vx80km','Vy80km','Vz80km'
+ };
+ field_tolerances={...
+- 1e-09,1e-09,1e-09,...
+- 1e-09,1e-09,1e-09,...
+- 1e-09,1e-09,1e-09,...
+- 1e-08,1e-08,1e-08,...
+ 1e-08,1e-07,1e-07,...
+- 1e-07,1e-06,1e-07,...
+ };
+ field_values={};
+-for i=1:6,
++for i=1:1,
+ result=results{i};
+ field_values={field_values{:},...
+ (result.Vx),...
+Index: ../trunk-jpl/test/Archives/Archive1107.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive1102.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive1105.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive1108.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive1103.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive1106.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive1101.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+Index: ../trunk-jpl/test/Archives/Archive1104.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: /issm/oecreview/Archive/17802-17983/ISSM-17848-17849.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17848-17849.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17848-17849.diff (revision 17986)
@@ -0,0 +1,4 @@
+Index: ../trunk-jpl/test/Archives/Archive455.nc
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
Index: /issm/oecreview/Archive/17802-17983/ISSM-17849-17850.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17849-17850.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17849-17850.diff (revision 17986)
@@ -0,0 +1,637 @@
+Index: ../trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp
+===================================================================
+--- ../trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17849)
++++ ../trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17850)
+@@ -9,6 +9,7 @@
+ return 1;
+ }/*}}}*/
+ void BalancethicknessAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
++ parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum));
+ }/*}}}*/
+ void BalancethicknessAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+
+Index: ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.h
+===================================================================
+--- ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.h (revision 17849)
++++ ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.h (revision 17850)
+@@ -27,7 +27,6 @@
+ ElementVector* CreatePVector(Element* element);
+ ElementVector* CreatePVectorVolume(Element* element);
+ ElementVector* CreatePVectorBoundary(Element* element);
+- void GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss);
+ void GetSolutionFromInputs(Vector* solution,Element* element);
+ void InputUpdateFromSolution(IssmDouble* solution,Element* element);
+ void UpdateConstraints(FemModel* femmodel);
+Index: ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp
+===================================================================
+--- ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 17849)
++++ ../trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp (revision 17850)
+@@ -25,14 +25,14 @@
+ }
+ }
+
++ iomodel->FetchDataToInput(elements,BalancethicknessApparentMassbalanceEnum);
++ iomodel->FetchDataToInput(elements,BalancethicknessNuxEnum);
++ iomodel->FetchDataToInput(elements,BalancethicknessNuyEnum);
++ iomodel->FetchDataToInput(elements,BalancethicknessVxObsEnum);
++ iomodel->FetchDataToInput(elements,BalancethicknessVyObsEnum);
++ iomodel->FetchDataToInput(elements,BalancethicknessThicknessObsEnum);
++ iomodel->FetchDataToInput(elements,MeshVertexonboundaryEnum);
+ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
+- iomodel->FetchDataToInput(elements,VxEnum);
+- iomodel->FetchDataToInput(elements,VyEnum);
+- iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
+- iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
+- iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum);
+- iomodel->FetchDataToInput(elements,MeshVertexonboundaryEnum);
+- iomodel->FetchDataToInput(elements,ThicknessEnum);
+ }/*}}}*/
+ void Balancethickness2Analysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
+
+@@ -41,9 +41,10 @@
+ }/*}}}*/
+ void Balancethickness2Analysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
+
+- /*Do not add constraints in DG*/
+- IoModelToConstraintsx(constraints,iomodel,BalancethicknessSpcthicknessEnum,Balancethickness2AnalysisEnum,P1Enum);
+
++ int finiteelement = P1Enum;
++ IoModelToConstraintsx(constraints,iomodel,BalancethicknessSpcpotentialEnum,Balancethickness2AnalysisEnum,finiteelement);
++
+ }/*}}}*/
+ void Balancethickness2Analysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
+
+@@ -71,8 +72,6 @@
+
+ /*Initialize Element vector and other vectors*/
+ ElementMatrix* Ke = element->NewElementMatrix();
+- IssmDouble* B = xNew(2*numnodes);
+- IssmDouble D[2][2];
+
+ /*Retrieve all inputs and parameters*/
+ element->GetVerticesCoordinates(&xyz_list);
+@@ -82,33 +81,19 @@
+ for(int ig=gauss->begin();igend();ig++){
+ gauss->GaussPoint(ig);
+
+- element->JacobianDeterminant(&Jdet,xyz_list,gauss);
+-
+ IssmDouble* dbasis=xNew(2*numnodes);
+ element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
++ element->JacobianDeterminant(&Jdet,xyz_list,gauss);
+
+ for(int i=0;ivalues[i*numnodes+j] += gauss->weight*Jdet*(dbasis[0*numnodes+i]*dbasis[0*numnodes+j] + dbasis[1*numnodes+i]*dbasis[1*numnodes+j]);
+ }
+ }
+- //GetB(B,element,xyz_list,gauss);
+-
+- //D_scalar=gauss->weight*Jdet;
+-
+- //D[0][0]=D_scalar;
+- //D[0][1]=0.;
+- //D[1][0]=0.;
+- //D[1][1]=D_scalar;
+- //TripleMultiply(B,2,numnodes,1,
+- // &D[0][0],2,2,0,
+- // B,2,numnodes,0,
+- // &Ke->values[0],1);
+ }
+
+ /*Clean up and return*/
+ xDelete(xyz_list);
+- xDelete(B);
+ delete gauss;
+ return Ke;
+ }/*}}}*/
+@@ -127,7 +112,7 @@
+ ElementVector* Balancethickness2Analysis::CreatePVectorVolume(Element* element){/*{{{*/
+
+ /*Intermediaries */
+- IssmDouble dhdt,mb,ms,Jdet;
++ IssmDouble adot,Jdet;
+ IssmDouble* xyz_list = NULL;
+
+ /*Fetch number of nodes and dof for this finite element*/
+@@ -139,11 +124,8 @@
+
+ /*Retrieve all inputs and parameters*/
+ element->GetVerticesCoordinates(&xyz_list);
+- Input* mb_input = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input);
+- Input* ms_input = element->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input);
+- Input* dhdt_input = element->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input);
++ Input* adot_input = element->GetInput(BalancethicknessApparentMassbalanceEnum); _assert_(adot_input);
+
+- /*Initialize mb_correction to 0, do not forget!:*/
+ /* Start looping on the number of gaussian points: */
+ Gauss* gauss=element->NewGauss(2);
+ for(int ig=gauss->begin();igend();ig++){
+@@ -151,12 +133,9 @@
+
+ element->JacobianDeterminant(&Jdet,xyz_list,gauss);
+ element->NodalFunctions(basis,gauss);
++ adot_input->GetInputValue(&adot,gauss);
+
+- ms_input->GetInputValue(&ms,gauss);
+- mb_input->GetInputValue(&mb,gauss);
+- dhdt_input->GetInputValue(&dhdt,gauss);
+-
+- for(int i=0;ivalues[i]+=Jdet*gauss->weight*(ms-mb-dhdt)*basis[i];
++ for(int i=0;ivalues[i]+=Jdet*gauss->weight*adot*basis[i];
+ }
+
+ /*Clean up and return*/
+@@ -184,9 +163,9 @@
+ IssmDouble* basis = xNew(numnodes);
+
+ /*Retrieve all inputs and parameters*/
+- Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input);
+- Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input);
+- Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input);
++ Input* thickness_input = element->GetInput(BalancethicknessThicknessObsEnum); _assert_(thickness_input);
++ Input* vx_input = element->GetInput(BalancethicknessVxObsEnum); _assert_(vx_input);
++ Input* vy_input = element->GetInput(BalancethicknessVyObsEnum); _assert_(vy_input);
+
+ element->GetVerticesCoordinates(&xyz_list);
+ element->GetIcefrontCoordinates(&xyz_list_front,xyz_list,MaskIceLevelsetEnum);
+@@ -203,7 +182,7 @@
+ element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss);
+ element->NodalFunctions(basis,gauss);
+
+- for(int i=0;ivalues[i] += Jdet*gauss->weight*thickness*(vx*normal[0] + vy*normal[1])*basis[i];
++ for(int i=0;ivalues[i] += - Jdet*gauss->weight*thickness*(vx*normal[0] + vy*normal[1])*basis[i];
+ }
+
+ /*Clean up and return*/
+@@ -213,41 +192,13 @@
+ delete gauss;
+ return pe;
+ }/*}}}*/
+-void Balancethickness2Analysis::GetB(IssmDouble* B,Element* element,IssmDouble* xyz_list,Gauss* gauss){/*{{{*/
+- /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2.
+- * For node i, Bi can be expressed in the actual coordinate system
+- * by:
+- * Bi=[ dN/dx ]
+- * [ dN/dy ]
+- * where N is the finiteelement function for node i.
+- *
+- * We assume B' has been allocated already, of size: 3x(NDOF2*numnodes)
+- */
+-
+- /*Fetch number of nodes for this finite element*/
+- int numnodes = element->GetNumberOfNodes();
+-
+- /*Get nodal functions derivatives*/
+- IssmDouble* dbasis=xNew(2*numnodes);
+- element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+-
+- /*Build B': */
+- for(int i=0;i(dbasis);
+-
+-}/*}}}*/
+ void Balancethickness2Analysis::GetSolutionFromInputs(Vector* solution,Element* element){/*{{{*/
+ _error_("not implemented yet");
+ }/*}}}*/
+ void Balancethickness2Analysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
+
+ /*Intermediaries */
+- IssmDouble vx,vy,vel,h,normdphi,dphi[2];
++ IssmDouble vx,vy,vbar,nux,nuy,normdphi,dphi[2];
+ IssmDouble* xyz_list = NULL;
+ int * doflist = NULL;
+
+@@ -270,13 +221,15 @@
+ if(xIsNan(values[i])) _error_("NaN found in solution vector");
+ }
+
+- element->AddInput(EnthalpyEnum,values,element->GetElementType());//FIXME
++ element->AddInput(PotentialEnum,values,element->GetElementType());
+
+ /*Retrieve all inputs and parameters*/
+ element->GetVerticesCoordinates(&xyz_list);
+- Input* potential_input = element->GetInput(EnthalpyEnum); _assert_(potential_input);
+- Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input);
+- Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input);
++ Input* potential_input = element->GetInput(PotentialEnum); _assert_(potential_input);
++ Input* vx_input = element->GetInput(BalancethicknessVxObsEnum); _assert_(vx_input);
++ Input* vy_input = element->GetInput(BalancethicknessVyObsEnum); _assert_(vy_input);
++ Input* nux_input = element->GetInput(BalancethicknessNuxEnum); _assert_(nux_input);
++ Input* nuy_input = element->GetInput(BalancethicknessNuyEnum); _assert_(nuy_input);
+
+ Gauss* gauss=element->NewGauss();
+ for (int iv=0;ivGetInputValue(&vx,gauss);
+ vy_input->GetInputValue(&vy,gauss);
++ nux_input->GetInputValue(&nux,gauss);
++ nuy_input->GetInputValue(&nuy,gauss);
+ potential_input->GetInputDerivativeValue(&dphi[0],xyz_list,gauss);
+
+- vel = sqrt(vx*vx + vy*vy) + 1.e-10;
++ vx = vx*nux; vy = vy*nuy;
++ vbar = sqrt(vx*vx + vy*vy) + 1.e-10;
+ normdphi = sqrt(dphi[0]*dphi[0] + dphi[1]*dphi[1]);
+
+- thickness_list[iv] = normdphi/vel;
+- vx_list[iv] = 1./thickness_list[iv] * dphi[0];
+- vy_list[iv] = 1./thickness_list[iv] * dphi[1];
++ thickness_list[iv] = normdphi/vbar;
++ vx_list[iv] = -1./thickness_list[iv] * dphi[0];
++ vy_list[iv] = -1./thickness_list[iv] * dphi[1];
+ }
+ element->AddInput(ThicknessEnum,thickness_list,P1Enum);
+ element->AddInput(VxEnum,vx_list,P1Enum);
+Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17849)
++++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17850)
+@@ -287,9 +287,14 @@
+ TransientNumRequestedOutputsEnum,
+ TransientRequestedOutputsEnum,
+ PotentialEnum,
++ BalancethicknessSpcpotentialEnum,
++ BalancethicknessApparentMassbalanceEnum,
+ Balancethickness2MisfitEnum,
+- NuXEnum,
+- NuYEnum,
++ BalancethicknessNuxEnum,
++ BalancethicknessNuyEnum,
++ BalancethicknessVxObsEnum,
++ BalancethicknessVyObsEnum,
++ BalancethicknessThicknessObsEnum,
+ /*}}}*/
+ /*Surfaceforcings{{{*/
+ SurfaceforcingsEnum,
+Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17849)
++++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17850)
+@@ -295,9 +295,14 @@
+ case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
+ case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";
+ case PotentialEnum : return "Potential";
++ case BalancethicknessSpcpotentialEnum : return "BalancethicknessSpcpotential";
++ case BalancethicknessApparentMassbalanceEnum : return "BalancethicknessApparentMassbalance";
+ case Balancethickness2MisfitEnum : return "Balancethickness2Misfit";
+- case NuXEnum : return "NuX";
+- case NuYEnum : return "NuY";
++ case BalancethicknessNuxEnum : return "BalancethicknessNux";
++ case BalancethicknessNuyEnum : return "BalancethicknessNuy";
++ case BalancethicknessVxObsEnum : return "BalancethicknessVxObs";
++ case BalancethicknessVyObsEnum : return "BalancethicknessVyObs";
++ case BalancethicknessThicknessObsEnum : return "BalancethicknessThicknessObs";
+ case SurfaceforcingsEnum : return "Surfaceforcings";
+ case SMBEnum : return "SMB";
+ case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance";
+Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17849)
++++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17850)
+@@ -301,9 +301,14 @@
+ else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
+ else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
+ else if (strcmp(name,"Potential")==0) return PotentialEnum;
++ else if (strcmp(name,"BalancethicknessSpcpotential")==0) return BalancethicknessSpcpotentialEnum;
++ else if (strcmp(name,"BalancethicknessApparentMassbalance")==0) return BalancethicknessApparentMassbalanceEnum;
+ else if (strcmp(name,"Balancethickness2Misfit")==0) return Balancethickness2MisfitEnum;
+- else if (strcmp(name,"NuX")==0) return NuXEnum;
+- else if (strcmp(name,"NuY")==0) return NuYEnum;
++ else if (strcmp(name,"BalancethicknessNux")==0) return BalancethicknessNuxEnum;
++ else if (strcmp(name,"BalancethicknessNuy")==0) return BalancethicknessNuyEnum;
++ else if (strcmp(name,"BalancethicknessVxObs")==0) return BalancethicknessVxObsEnum;
++ else if (strcmp(name,"BalancethicknessVyObs")==0) return BalancethicknessVyObsEnum;
++ else if (strcmp(name,"BalancethicknessThicknessObs")==0) return BalancethicknessThicknessObsEnum;
+ else if (strcmp(name,"Surfaceforcings")==0) return SurfaceforcingsEnum;
+ else if (strcmp(name,"SMB")==0) return SMBEnum;
+ else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum;
+@@ -377,15 +382,15 @@
+ else if (strcmp(name,"GiaAnalysis")==0) return GiaAnalysisEnum;
+ else if (strcmp(name,"MeshdeformationSolution")==0) return MeshdeformationSolutionEnum;
+ else if (strcmp(name,"MeshdeformationAnalysis")==0) return MeshdeformationAnalysisEnum;
+- else if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
++ else stage=4;
++ }
++ if(stage==4){
++ if (strcmp(name,"LevelsetAnalysis")==0) return LevelsetAnalysisEnum;
+ else if (strcmp(name,"ExtrapolationAnalysis")==0) return ExtrapolationAnalysisEnum;
+ else if (strcmp(name,"LsfReinitializationAnalysis")==0) return LsfReinitializationAnalysisEnum;
+ else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
+ else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum;
+- else stage=4;
+- }
+- if(stage==4){
+- if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
++ else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum;
+ else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum;
+ else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
+ else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
+@@ -500,15 +505,15 @@
+ else if (strcmp(name,"AndroidFrictionCoefficient")==0) return AndroidFrictionCoefficientEnum;
+ else if (strcmp(name,"ResetPenalties")==0) return ResetPenaltiesEnum;
+ else if (strcmp(name,"SegmentOnIceShelf")==0) return SegmentOnIceShelfEnum;
+- else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
++ else stage=5;
++ }
++ if(stage==5){
++ if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
+ else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
+ else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
+ else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
+ else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
+- else stage=5;
+- }
+- if(stage==5){
+- if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
++ else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
+ else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
+ else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum;
+ else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
+@@ -623,15 +628,15 @@
+ else if (strcmp(name,"MaxAbsVy")==0) return MaxAbsVyEnum;
+ else if (strcmp(name,"MinVz")==0) return MinVzEnum;
+ else if (strcmp(name,"MaxVz")==0) return MaxVzEnum;
+- else if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
++ else stage=6;
++ }
++ if(stage==6){
++ if (strcmp(name,"MaxAbsVz")==0) return MaxAbsVzEnum;
+ else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum;
+ else if (strcmp(name,"IceVolumeAboveFloatation")==0) return IceVolumeAboveFloatationEnum;
+ else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
+ else if (strcmp(name,"Absolute")==0) return AbsoluteEnum;
+- else stage=6;
+- }
+- if(stage==6){
+- if (strcmp(name,"Incremental")==0) return IncrementalEnum;
++ else if (strcmp(name,"Incremental")==0) return IncrementalEnum;
+ else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum;
+ else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum;
+ else if (strcmp(name,"None")==0) return NoneEnum;
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17849)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17850)
+@@ -56,7 +56,6 @@
+ parameters->AddObject(iomodel->CopyConstantObject(DebugProfilingEnum));
+ parameters->AddObject(iomodel->CopyConstantObject(MeshAverageVertexConnectivityEnum));
+ parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum));
+- parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum));
+ parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMeltingRateEnum));
+ parameters->AddObject(iomodel->CopyConstantObject(SettingsWaitonlockEnum));
+ parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofelementsEnum));
+@@ -218,7 +217,6 @@
+ }
+ /*}}}*/
+
+-
+ /*Before returning, create parameters in case we are running Qmu or control types runs: */
+ CreateParametersControl(parameters,iomodel,solution_type);
+
+Index: ../trunk-jpl/src/c/cores/balancethickness2_core.cpp
+===================================================================
+--- ../trunk-jpl/src/c/cores/balancethickness2_core.cpp (revision 17849)
++++ ../trunk-jpl/src/c/cores/balancethickness2_core.cpp (revision 17850)
+@@ -25,7 +25,7 @@
+
+ if(save_results){
+ if(VerboseSolution()) _printf0_(" saving results\n");
+- int outputs[4] = {ThicknessEnum,EnthalpyEnum,VxEnum,VyEnum};
++ int outputs[4] = {ThicknessEnum,PotentialEnum,VxEnum,VyEnum};
+ femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],4);
+ }
+
+Index: ../trunk-jpl/src/m/classes/balancethickness2.m
+===================================================================
+--- ../trunk-jpl/src/m/classes/balancethickness2.m (revision 0)
++++ ../trunk-jpl/src/m/classes/balancethickness2.m (revision 17850)
+@@ -0,0 +1,57 @@
++%BALANCETHICKNESS2 class definition
++%
++% Usage:
++% balancethickness2=balancethickness2();
++
++classdef balancethickness2
++ properties (SetAccess=public)
++ spcpotential = NaN;
++ apparent_massbalance = NaN;
++ nux = NaN;
++ nuy = NaN;
++ vx_obs = NaN;
++ vy_obs = NaN;
++ thickness_obs = NaN;
++ end
++ methods
++ function obj = balancethickness2(varargin) % {{{
++ switch nargin
++ case 0
++ obj=setdefaultparameters(obj);
++ otherwise
++ error('constructor not supported');
++ end
++ end % }}}
++ function obj = setdefaultparameters(obj) % {{{
++
++ end % }}}
++ function md = checkconsistency(obj,md,solution,analyses) % {{{
++ %Early return
++ if solution~=Balancethickness2SolutionEnum(), return; end
++
++ md = checkfield(md,'fieldname','balancethickness.spcpotential','size',[md.mesh.numberofvertices 1]);
++ md = checkfield(md,'fieldname','balancethickness.apparent_massbalance','size',[md.mesh.numberofvertices 1],'NaN',1);
++ md = checkfield(md,'fieldname','balancethickness.nux','size',[md.mesh.numberofvertices 1],'NaN',1,'>',0,'<=',1);
++ md = checkfield(md,'fieldname','balancethickness.nuy','size',[md.mesh.numberofvertices 1],'NaN',1,'>',0,'<=',1);
++ md = checkfield(md,'fieldname','balancethickness.vx_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
++ md = checkfield(md,'fieldname','balancethickness.vy_obs','size',[md.mesh.numberofvertices 1],'NaN',1);
++ md = checkfield(md,'fieldname','balancethickness.thickness_obs','size',[md.mesh.numberofvertices 1],'NaN',1,'>=',0);
++ end % }}}
++ function disp(obj) % {{{
++ disp(sprintf(' balance thickness solution parameters:'));
++
++ fielddisplay(obj,'spcpotential','potential constraints (NaN means no constraint)');
++ fielddisplay(obj,'apparent_massbalance','Apparent mass balance [m/yr]');
++
++ end % }}}
++ function marshall(obj,md,fid) % {{{
++ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','spcpotential','format','DoubleMat','mattype',1);
++ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','apparent_massbalance','format','DoubleMat','mattype',1);
++ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','nux','format','DoubleMat','mattype',1);
++ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','nuy','format','DoubleMat','mattype',1);
++ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','vx_obs','format','DoubleMat','mattype',1);
++ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','vy_obs','format','DoubleMat','mattype',1);
++ WriteData(fid,'object',obj,'class','Balancethickness','fieldname','thickness_obs','format','DoubleMat','mattype',1);
++ end % }}}
++ end
++end
+Index: ../trunk-jpl/src/m/enum/NuXEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/NuXEnum.m (revision 17849)
++++ ../trunk-jpl/src/m/enum/NuXEnum.m (revision 17850)
+@@ -1,11 +0,0 @@
+-function macro=NuXEnum()
+-%NUXENUM - Enum of NuX
+-%
+-% WARNING: DO NOT MODIFY THIS FILE
+-% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+-% Please read src/c/shared/Enum/README for more information
+-%
+-% Usage:
+-% macro=NuXEnum()
+-
+-macro=StringToEnum('NuX');
+Index: ../trunk-jpl/src/m/enum/NuYEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/NuYEnum.m (revision 17849)
++++ ../trunk-jpl/src/m/enum/NuYEnum.m (revision 17850)
+@@ -1,11 +0,0 @@
+-function macro=NuYEnum()
+-%NUYENUM - Enum of NuY
+-%
+-% WARNING: DO NOT MODIFY THIS FILE
+-% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
+-% Please read src/c/shared/Enum/README for more information
+-%
+-% Usage:
+-% macro=NuYEnum()
+-
+-macro=StringToEnum('NuY');
+Index: ../trunk-jpl/src/m/enum/BalancethicknessSpcpotentialEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/BalancethicknessSpcpotentialEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/BalancethicknessSpcpotentialEnum.m (revision 17850)
+@@ -0,0 +1,11 @@
++function macro=BalancethicknessSpcpotentialEnum()
++%BALANCETHICKNESSSPCPOTENTIALENUM - Enum of BalancethicknessSpcpotential
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=BalancethicknessSpcpotentialEnum()
++
++macro=StringToEnum('BalancethicknessSpcpotential');
+Index: ../trunk-jpl/src/m/enum/BalancethicknessThicknessObsEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/BalancethicknessThicknessObsEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/BalancethicknessThicknessObsEnum.m (revision 17850)
+@@ -0,0 +1,11 @@
++function macro=BalancethicknessThicknessObsEnum()
++%BALANCETHICKNESSTHICKNESSOBSENUM - Enum of BalancethicknessThicknessObs
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=BalancethicknessThicknessObsEnum()
++
++macro=StringToEnum('BalancethicknessThicknessObs');
+Index: ../trunk-jpl/src/m/enum/BalancethicknessNuxEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/BalancethicknessNuxEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/BalancethicknessNuxEnum.m (revision 17850)
+@@ -0,0 +1,11 @@
++function macro=BalancethicknessNuxEnum()
++%BALANCETHICKNESSNUXENUM - Enum of BalancethicknessNux
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=BalancethicknessNuxEnum()
++
++macro=StringToEnum('BalancethicknessNux');
+Index: ../trunk-jpl/src/m/enum/BalancethicknessVxObsEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/BalancethicknessVxObsEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/BalancethicknessVxObsEnum.m (revision 17850)
+@@ -0,0 +1,11 @@
++function macro=BalancethicknessVxObsEnum()
++%BALANCETHICKNESSVXOBSENUM - Enum of BalancethicknessVxObs
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=BalancethicknessVxObsEnum()
++
++macro=StringToEnum('BalancethicknessVxObs');
+Index: ../trunk-jpl/src/m/enum/BalancethicknessNuyEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/BalancethicknessNuyEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/BalancethicknessNuyEnum.m (revision 17850)
+@@ -0,0 +1,11 @@
++function macro=BalancethicknessNuyEnum()
++%BALANCETHICKNESSNUYENUM - Enum of BalancethicknessNuy
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=BalancethicknessNuyEnum()
++
++macro=StringToEnum('BalancethicknessNuy');
+Index: ../trunk-jpl/src/m/enum/BalancethicknessVyObsEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/BalancethicknessVyObsEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/BalancethicknessVyObsEnum.m (revision 17850)
+@@ -0,0 +1,11 @@
++function macro=BalancethicknessVyObsEnum()
++%BALANCETHICKNESSVYOBSENUM - Enum of BalancethicknessVyObs
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=BalancethicknessVyObsEnum()
++
++macro=StringToEnum('BalancethicknessVyObs');
+Index: ../trunk-jpl/src/m/enum/EnumDefinitions.py
+===================================================================
+--- ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17849)
++++ ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17850)
+@@ -287,9 +287,14 @@
+ def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0]
+ def TransientRequestedOutputsEnum(): return StringToEnum("TransientRequestedOutputs")[0]
+ def PotentialEnum(): return StringToEnum("Potential")[0]
++def BalancethicknessSpcpotentialEnum(): return StringToEnum("BalancethicknessSpcpotential")[0]
++def BalancethicknessApparentMassbalanceEnum(): return StringToEnum("BalancethicknessApparentMassbalance")[0]
+ def Balancethickness2MisfitEnum(): return StringToEnum("Balancethickness2Misfit")[0]
+-def NuXEnum(): return StringToEnum("NuX")[0]
+-def NuYEnum(): return StringToEnum("NuY")[0]
++def BalancethicknessNuxEnum(): return StringToEnum("BalancethicknessNux")[0]
++def BalancethicknessNuyEnum(): return StringToEnum("BalancethicknessNuy")[0]
++def BalancethicknessVxObsEnum(): return StringToEnum("BalancethicknessVxObs")[0]
++def BalancethicknessVyObsEnum(): return StringToEnum("BalancethicknessVyObs")[0]
++def BalancethicknessThicknessObsEnum(): return StringToEnum("BalancethicknessThicknessObs")[0]
+ def SurfaceforcingsEnum(): return StringToEnum("Surfaceforcings")[0]
+ def SMBEnum(): return StringToEnum("SMB")[0]
+ def SurfaceforcingsMassBalanceEnum(): return StringToEnum("SurfaceforcingsMassBalance")[0]
+Index: ../trunk-jpl/src/m/enum/BalancethicknessApparentMassbalanceEnum.m
+===================================================================
+--- ../trunk-jpl/src/m/enum/BalancethicknessApparentMassbalanceEnum.m (revision 0)
++++ ../trunk-jpl/src/m/enum/BalancethicknessApparentMassbalanceEnum.m (revision 17850)
+@@ -0,0 +1,11 @@
++function macro=BalancethicknessApparentMassbalanceEnum()
++%BALANCETHICKNESSAPPARENTMASSBALANCEENUM - Enum of BalancethicknessApparentMassbalance
++%
++% WARNING: DO NOT MODIFY THIS FILE
++% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
++% Please read src/c/shared/Enum/README for more information
++%
++% Usage:
++% macro=BalancethicknessApparentMassbalanceEnum()
++
++macro=StringToEnum('BalancethicknessApparentMassbalance');
Index: /issm/oecreview/Archive/17802-17983/ISSM-17850-17851.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17850-17851.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17850-17851.diff (revision 17986)
@@ -0,0 +1,96 @@
+Index: ../trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim
+===================================================================
+--- ../trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 17850)
++++ ../trunk-jpl/externalpackages/vim/addons/vim/syntax/c.vim (revision 17851)
+@@ -516,6 +516,7 @@
+ syn keyword cType AdjointBalancethicknessAnalysis
+ syn keyword cType AdjointHorizAnalysis
+ syn keyword cType Analysis
++syn keyword cType Balancethickness2Analysis
+ syn keyword cType BalancethicknessAnalysis
+ syn keyword cType BalancethicknessSoftAnalysis
+ syn keyword cType BalancevelocityAnalysis
+@@ -636,6 +637,7 @@
+ syn keyword cConstant SedimentHeadEnum
+ syn keyword cConstant SedimentHeadOldEnum
+ syn keyword cConstant SedimentHeadResidualEnum
++syn keyword cConstant EffectivePressureEnum
+ syn keyword cConstant EplHeadEnum
+ syn keyword cConstant EplHeadOldEnum
+ syn keyword cConstant EplHeadSlopeXEnum
+@@ -654,6 +656,7 @@
+ syn keyword cConstant HydrologydcEplCompressibilityEnum
+ syn keyword cConstant HydrologydcEplPorosityEnum
+ syn keyword cConstant HydrologydcEplInitialThicknessEnum
++syn keyword cConstant HydrologydcEplMaxThicknessEnum
+ syn keyword cConstant HydrologydcEplThicknessEnum
+ syn keyword cConstant HydrologydcEplThicknessOldEnum
+ syn keyword cConstant HydrologydcEplConductivityEnum
+@@ -700,6 +703,7 @@
+ syn keyword cConstant MaterialsRheologyBbarEnum
+ syn keyword cConstant MaterialsRheologyLawEnum
+ syn keyword cConstant MaterialsRheologyNEnum
++syn keyword cConstant DamageIsdamageEnum
+ syn keyword cConstant DamageDEnum
+ syn keyword cConstant DamageFEnum
+ syn keyword cConstant QmuDamageDEnum
+@@ -709,6 +713,7 @@
+ syn keyword cConstant DamageC2Enum
+ syn keyword cConstant DamageC3Enum
+ syn keyword cConstant DamageC4Enum
++syn keyword cConstant DamageElementinterpEnum
+ syn keyword cConstant DamageHealingEnum
+ syn keyword cConstant DamageStressThresholdEnum
+ syn keyword cConstant DamageStabilizationEnum
+@@ -746,6 +751,7 @@
+ syn keyword cConstant MeshUpperelementsEnum
+ syn keyword cConstant MeshVertexonbaseEnum
+ syn keyword cConstant MeshVertexonsurfaceEnum
++syn keyword cConstant MeshVertexonboundaryEnum
+ syn keyword cConstant MeshXEnum
+ syn keyword cConstant MeshYEnum
+ syn keyword cConstant MeshZEnum
+@@ -817,8 +823,18 @@
+ syn keyword cConstant TransientIsthermalEnum
+ syn keyword cConstant TransientIsgiaEnum
+ syn keyword cConstant TransientIsdamageevolutionEnum
++syn keyword cConstant TransientIshydrologyEnum
+ syn keyword cConstant TransientNumRequestedOutputsEnum
+ syn keyword cConstant TransientRequestedOutputsEnum
++syn keyword cConstant PotentialEnum
++syn keyword cConstant BalancethicknessSpcpotentialEnum
++syn keyword cConstant BalancethicknessApparentMassbalanceEnum
++syn keyword cConstant Balancethickness2MisfitEnum
++syn keyword cConstant BalancethicknessNuxEnum
++syn keyword cConstant BalancethicknessNuyEnum
++syn keyword cConstant BalancethicknessVxObsEnum
++syn keyword cConstant BalancethicknessVyObsEnum
++syn keyword cConstant BalancethicknessThicknessObsEnum
+ syn keyword cConstant SurfaceforcingsEnum
+ syn keyword cConstant SMBEnum
+ syn keyword cConstant SurfaceforcingsMassBalanceEnum
+@@ -850,6 +866,8 @@
+ syn keyword cConstant DefaultAnalysisEnum
+ syn keyword cConstant BalancethicknessAnalysisEnum
+ syn keyword cConstant BalancethicknessSolutionEnum
++syn keyword cConstant Balancethickness2AnalysisEnum
++syn keyword cConstant Balancethickness2SolutionEnum
+ syn keyword cConstant BalancethicknessSoftAnalysisEnum
+ syn keyword cConstant BalancethicknessSoftSolutionEnum
+ syn keyword cConstant BalancevelocityAnalysisEnum
+@@ -938,6 +956,7 @@
+ syn keyword cConstant IntVecParamEnum
+ syn keyword cConstant TransientParamEnum
+ syn keyword cConstant MaticeEnum
++syn keyword cConstant MatdamageiceEnum
+ syn keyword cConstant MatparEnum
+ syn keyword cConstant NodeEnum
+ syn keyword cConstant NumericalfluxEnum
+@@ -1052,6 +1071,7 @@
+ syn keyword cConstant QmuTemperatureEnum
+ syn keyword cConstant HydrologyWaterVxEnum
+ syn keyword cConstant HydrologyWaterVyEnum
++syn keyword cConstant SigmaNNEnum
+ syn keyword cConstant StressTensorEnum
+ syn keyword cConstant StressTensorxxEnum
+ syn keyword cConstant StressTensorxyEnum
Index: /issm/oecreview/Archive/17802-17983/ISSM-17851-17852.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17851-17852.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17851-17852.diff (revision 17986)
@@ -0,0 +1,156 @@
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp (revision 17851)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp (revision 17852)
+@@ -28,11 +28,11 @@
+ /*Allocate ouput*/
+ connectivity=xNewZeroInit(iomodel->numberofvertices);
+
+- /*Get element width (3 or 6)*/
+- switch(iomodel->domaintype){
+- case Domain2DhorizontalEnum: elementswidth=3; break;
+- case Domain2DverticalEnum : elementswidth=3; break;
+- case Domain3DEnum : elementswidth=6; break;
++ /*Get element width*/
++ switch(iomodel->meshelementtype){
++ case TriaEnum: elementswidth=3; break;
++ case PentaEnum: elementswidth=6; break;
++ case TetraEnum: elementswidth=4; break;
+ default: _error_("mesh type "<domaintype)<<" not supported yet");
+ }
+
+Index: ../trunk-jpl/src/c/classes/Elements/Tetra.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17851)
++++ ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17852)
+@@ -102,6 +102,33 @@
+ this->inputs->Configure(parameters);
+ }
+ /*}}}*/
++/*FUNCTION Tetra::ElementSizes (THIS ONE){{{*/
++void Tetra::ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){
++
++ IssmDouble xyz_list[NUMVERTICES][3];
++ IssmDouble xmin,ymin,zmin;
++ IssmDouble xmax,ymax,zmax;
++
++ /*Get xyz list: */
++ ::GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
++ xmin=xyz_list[0][0]; xmax=xyz_list[0][0];
++ ymin=xyz_list[0][1]; ymax=xyz_list[0][1];
++ zmin=xyz_list[0][2]; zmax=xyz_list[0][2];
++
++ for(int i=1;ixmax) xmax=xyz_list[i][0];
++ if(xyz_list[i][1]ymax) ymax=xyz_list[i][1];
++ if(xyz_list[i][2]zmax) zmax=xyz_list[i][2];
++ }
++
++ *hx=xmax-xmin;
++ *hy=ymax-ymin;
++ *hz=zmax-zmin;
++}
++/*}}}*/
+ /*FUNCTION Tetra::FaceOnBaseIndices{{{*/
+ void Tetra::FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3){
+
+@@ -172,6 +199,32 @@
+ return this->element_type;
+ }
+ /*}}}*/
++/*FUNCTION Tetra::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype) (THIS ONE??){{{*/
++void Tetra::GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){
++
++ Input* input=inputs->GetInput(enumtype);
++ if(!input) _error_("No input of type " << EnumToStringx(enumtype) << " found in tria");
++
++ GaussTetra* gauss=new GaussTetra();
++ gauss->GaussVertex(this->GetNodeIndex(node));
++
++ input->GetInputValue(pvalue,gauss);
++ delete gauss;
++}
++/*}}}*/
++/*FUNCTION Tetra::GetNodeIndex (THIS ONE){{{*/
++int Tetra::GetNodeIndex(Node* node){
++
++ _assert_(nodes);
++ int numnodes = this->NumberofNodes();
++
++ for(int i=0;iNumberofNodes();
+@@ -916,6 +969,23 @@
+ return TetraRef::VelocityInterpolation();
+ }
+ /*}}}*/
++/*FUNCTION Tetra::ViscousHeating (THIS ONE){{{*/
++void Tetra::ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){
++
++ /*Intermediaries*/
++ IssmDouble phi;
++ IssmDouble viscosity;
++ IssmDouble epsilon[6];
++
++ _assert_(gauss->Enum()==GaussTetraEnum);
++ this->StrainRateFS(&epsilon[0],xyz_list,(GaussTetra*)gauss,vx_input,vy_input,vz_input);
++ this->ViscosityFS(&viscosity,3,xyz_list,(GaussTetra*)gauss,vx_input,vy_input,vz_input);
++ GetPhi(&phi,&epsilon[0],viscosity);
++
++ /*Assign output pointer*/
++ *pphi = phi;
++}
++/*}}}*/
+ /*FUNCTION Tetra::PressureInterpolation{{{*/
+ int Tetra::PressureInterpolation(void){
+ return TetraRef::PressureInterpolation();
+Index: ../trunk-jpl/src/c/classes/Elements/Tetra.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17851)
++++ ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17852)
+@@ -61,7 +61,7 @@
+ void Configure(Elements* elements,Loads* loads,Nodes* nodesin,Vertices* verticesin,Materials* materials,Parameters* parameters);
+ void SetCurrentConfiguration(Elements* elements,Loads* loads,Nodes* nodes,Materials* materials,Parameters* parameters);
+ void Delta18oParameterization(void){_error_("not implemented yet");};
+- void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){_error_("not implemented yet");};
++ void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz);
+ void FaceOnFrontIndices(int* pindex1,int* pindex2,int* pindex3);
+ void FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3);
+ void FaceOnSurfaceIndices(int* pindex1,int* pindex2,int* pindex3);
+@@ -71,7 +71,7 @@
+ Element* GetLowerElement(void){_error_("not implemented yet");};
+ Element* GetSurfaceElement(void){_error_("not implemented yet");};
+ Element* GetBasalElement(void){_error_("not implemented yet");};
+- int GetNodeIndex(Node* node){_error_("not implemented yet");};
++ int GetNodeIndex(Node* node);
+ int GetNumberOfNodes(void);
+ int GetNumberOfVertices(void);
+ void GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
+@@ -111,7 +111,7 @@
+ int VelocityInterpolation(void);
+ void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");};
+ IssmDouble GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");};
+- void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");};
++ void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype);
+ Node* GetNode(int node_number){_error_("Not implemented");};
+ IssmDouble GetXcoord(Gauss* gauss);
+ IssmDouble GetYcoord(Gauss* gauss);
+@@ -127,7 +127,7 @@
+ Gauss* NewGaussTop(int order);
+ int VertexConnectivity(int vertexindex){_error_("not implemented yet");};
+ void VerticalSegmentIndices(int** pindices,int* pnumseg){_error_("not implemented yet");};
+- void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input){_error_("not implemented yet");};
++ void ViscousHeating(IssmDouble* pphi,IssmDouble* xyz_list,Gauss* gauss,Input* vx_input,Input* vy_input,Input* vz_input);
+ bool IsZeroLevelset(int levelset_enum){_error_("not implemented");};
+ bool IsIcefront(void);
+ bool IsFaceOnBoundary(void){_error_("not implemented yet");};
Index: /issm/oecreview/Archive/17802-17983/ISSM-17852-17853.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17852-17853.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17852-17853.diff (revision 17986)
@@ -0,0 +1,20 @@
+Index: ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17852)
++++ ../trunk-jpl/src/c/modules/ModelProcessorx/CreateEdges.cpp (revision 17853)
+@@ -39,11 +39,11 @@
+ elementedges = xNew(elementnbe*2);
+ elementedges_markers = xNew(elementnbe);
+ elementedges[2*0+0] = 1; elementedges[2*0+1] = 2; elementedges_markers[0] = 1;
+- elementedges[2*1+0] = 2; elementedges[2*1+1] = 0; elementedges_markers[1] = 1;
++ elementedges[2*1+0] = 0; elementedges[2*1+1] = 2; elementedges_markers[1] = 1;
+ elementedges[2*2+0] = 0; elementedges[2*2+1] = 1; elementedges_markers[2] = 1;
+- elementedges[2*3+0] = 0; elementedges[2*3+1] = 3; elementedges_markers[3] = 1;
+- elementedges[2*4+0] = 1; elementedges[2*4+1] = 3; elementedges_markers[4] = 1;
+- elementedges[2*5+0] = 2; elementedges[2*5+1] = 3; elementedges_markers[5] = 1;
++ elementedges[2*3+0] = 1; elementedges[2*3+1] = 3; elementedges_markers[3] = 1;
++ elementedges[2*4+0] = 2; elementedges[2*4+1] = 3; elementedges_markers[4] = 1;
++ elementedges[2*5+0] = 0; elementedges[2*5+1] = 3; elementedges_markers[5] = 1;
+ break;
+ case PentaEnum:
+ elementnbv = 6;
Index: /issm/oecreview/Archive/17802-17983/ISSM-17853-17854.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17853-17854.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17853-17854.diff (revision 17986)
@@ -0,0 +1,13 @@
+Index: ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp (revision 17853)
++++ ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp (revision 17854)
+@@ -70,6 +70,8 @@
+ else{
+ _error_(index1 <<" "<weights[i]=this->weights[i]*0.5/1.732050807568877; //FIXME: double check that
+ }
+ /*}}}*/
+ /*FUNCTION GaussTetra::~GaussTetra(){{{*/
Index: /issm/oecreview/Archive/17802-17983/ISSM-17854-17855.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17854-17855.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17854-17855.diff (revision 17986)
@@ -0,0 +1,36 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17854)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17855)
+@@ -1664,11 +1664,13 @@
+ void Tria::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){
+
+ /*Build unit outward pointing vector*/
++ int index1,index2;
+ IssmDouble vector[2];
+ IssmDouble norm;
+
+- vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0];
+- vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1];
++ this->EdgeOnBaseIndices(&index1,&index2);
++ vector[0]=xyz_list[index2*3+0] - xyz_list[index1*3+0];
++ vector[1]=xyz_list[index2*3+1] - xyz_list[index1*3+1];
+
+ norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]);
+
+@@ -1680,11 +1682,13 @@
+ void Tria::NormalTop(IssmDouble* bed_normal,IssmDouble* xyz_list){
+
+ /*Build unit outward pointing vector*/
++ int index1,index2;
+ IssmDouble vector[2];
+ IssmDouble norm;
+
+- vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0];
+- vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1];
++ this->EdgeOnSurfaceIndices(&index1,&index2);
++ vector[0]=xyz_list[index2*3+0] - xyz_list[index1*3+0];
++ vector[1]=xyz_list[index2*3+1] - xyz_list[index1*3+1];
+
+ norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]);
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17855-17856.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17855-17856.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17855-17856.diff (revision 17986)
@@ -0,0 +1,142 @@
+Index: ../trunk-jpl/src/m/plot/checkplotoptions.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/checkplotoptions.py (revision 17855)
++++ ../trunk-jpl/src/m/plot/checkplotoptions.py (revision 17856)
+@@ -49,50 +49,69 @@
+
+ #text
+ if options.exist('text'):
+- #1: textvalue
+- textvalues=options.getfieldvalue('text')
+- numtext=len(textvalues)
+
+- #2: textweight
+- if options.exist('textweight'):
+- textweightvalues=options.getfieldvalue('textweight')
+- else:
+- textweightvalues='n'
+- textweightvalues=npy.tile(textweightvalues,numtext)
++ # text values (coerce to list for consistent functionality)
++ textlist=[]
++ text=options.getfieldvalue('text','default text')
++ textlist.extend([text] if isinstance(text,str) else text)
++ numtext=len(textlist)
+
+- #3 textsize
++ # text position
++ textpos=options.getfieldvalue('textposition',[0.5,0.5])
++ if not isinstance(textpos,list):
++ raise Exception('textposition should be passed as a list')
++ textx=[item[0] for item in textpos]
++ texty=[item[1] for item in textpos]
++ if len(textx)!=numtext or len(texty)!=numtext:
++ raise Exception('textposition should contain one list of x,y vertices for every text instance')
++
++ # font size
+ if options.exist('textsize'):
+- textsizevalues=options.getfieldvalue('textsize')
++ textsize=options.getfieldvalue('textsize',12)
++ sizelist=[]
++ sizelist.extend(textsize if isinstance(textsize,list) else [textsize])
+ else:
+- textsizevalues=14
+- textsizevalues=npy.tile(textsizevalues,numtext)
++ sizelist=[12]
++ if len(sizelist)==1:
++ sizelist=npy.tile(sizelist,numtext)
+
+- #4 textcolor
++ # font color
+ if options.exist('textcolor'):
+- textcolorvalues=options.getfieldvalue('textcolor')
++ textcolor=options.getfieldvalue('textcolor','k')
++ colorlist=[]
++ colorlist.extend(textcolor if isinstance(textcolor,list) else [textcolor])
+ else:
+- textcolorvalues='k'
+- textcolorvalues=npy.tile(textsizevalues,numtext)
++ colorlist=['k']
++ if len(colorlist)==1:
++ colorlist=npy.tile(colorlist,numtext)
+
+- #5 textposition
+- if options.exist('textposition'):
+- options.getfieldvalue('textposition')
++ # textweight
++ if options.exist('textweight'):
++ textweightvalues=options.getfieldvalue('textweight')
++ weightlist=[]
++ weightlist.extend(textweight if isinstance(textwieght,list) else [textweight])
+ else:
+- raise Exception("plotmodel error message: 'textposition' option is missing")
++ weightlist=['normal']
++ if len(weightlist)==1:
++ weightlist=npy.tile(weightlist,numtext)
+
+- #6 textrotation
++ # text rotation
+ if options.exist('textrotation'):
+- textrotationvalues=options.getfieldvalue('textrotation')
++ textrotation=options.getfieldvalue('textrotation',0)
++ rotationlist=[]
++ rotationlist.extend(textrotation if isinstance(textrotation,list) else [textrotation])
+ else:
+- textrotationvalues=0
+- textrotationvalues=npy.tile(textrotationvalues,numtext)
++ rotationlist=[0]
++ if len(rotationlist)==1:
++ rotationlist=npy.tile(rotationlist,numtext)
+
+- options.changfieldvalue('text',textvalues)
+- options.changfieldvalue('textsize',textsizevalues)
+- options.changfieldvalue('textweight',textweightvalues)
+- options.changfieldvalue('textcolor',textcolorvalues)
+- options.changfieldvalue('textposition',textpositionvalues)
+- options.changfieldvalue('textrotation',textrotationvalues)
++ options.changefieldvalue('text',textlist)
++ options.addfield('textx',textx)
++ options.addfield('texty',texty)
++ options.changefieldvalue('textsize',sizelist)
++ options.changefieldvalue('textcolor',colorlist)
++ options.changefieldvalue('textweight',weightlist)
++ options.changefieldvalue('textrotation',rotationlist)
+
+ #expdisp
+ expdispvaluesarray=[0,0]
+Index: ../trunk-jpl/src/m/plot/applyoptions.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/applyoptions.py (revision 17855)
++++ ../trunk-jpl/src/m/plot/applyoptions.py (revision 17856)
+@@ -226,7 +226,11 @@
+ locs=npy.arange(lims[0],lims[1]+1,options.getfieldvalue('colorbarlines'))
+ cb.add_lines(locs,['k' for i in range(len(locs))],npy.ones_like(locs))
+ if options.exist('colorbartitle'):
+- cb.set_label(options.getfieldvalue('colorbartitle'),fontsize=fontsize)
++ if options.exist('colorbartitlepad'):
++ cb.set_label(options.getfieldvalue('colorbartitle'),\
++ labelpad=options.getfieldvalue('colorbartitlepad'),fontsize=fontsize)
++ else:
++ cb.set_label(options.getfieldvalue('colorbartitle'),fontsize=fontsize)
+ cb.ax.tick_params(labelsize=fontsize)
+ #}}}
+
+@@ -234,7 +238,18 @@
+
+ #expdisp
+
+- #text
++ #text {{{
++ if options.exist('text'):
++ text=options.getfieldvalue('text')
++ textx=options.getfieldvalue('textx')
++ texty=options.getfieldvalue('texty')
++ textsize=options.getfieldvalue('textsize')
++ textcolor=options.getfieldvalue('textcolor')
++ textweight=options.getfieldvalue('textweight')
++ textrotation=options.getfieldvalue('textrotation')
++ for label,x,y,size,color,weight,rotation in zip(text,textx,texty,textsize,textcolor,textweight,textrotation):
++ ax.text(x,y,label,transform=ax.transAxes,fontsize=size,color=color,weight=weight,rotation=rotation)
++ #}}}
+
+ #north arrow
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17856-17857.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17856-17857.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17856-17857.diff (revision 17986)
@@ -0,0 +1,26 @@
+Index: ../trunk-jpl/test/NightlyRun/test211.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.py (revision 17856)
++++ ../trunk-jpl/test/NightlyRun/test211.py (revision 17857)
+@@ -28,7 +28,7 @@
+ field_tolerances=[\
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\
+ 5e-08,5e-08,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,\
+- 1e-07,1e-07,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06]
++ 1e-07,1e-07,5e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06]
+ field_values=[\
+ md.results.TransientSolution[0].Vx,\
+ md.results.TransientSolution[0].Vy,\
+Index: ../trunk-jpl/test/NightlyRun/test211.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.m (revision 17856)
++++ ../trunk-jpl/test/NightlyRun/test211.m (revision 17857)
+@@ -15,7 +15,7 @@
+ field_tolerances={...
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,...
+ 5e-08,5e-08,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,...
+- 1e-07,1e-07,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06};
++ 1e-07,1e-07,5e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06};
+ field_values={...
+ (md.results.TransientSolution(1).Vx),...
+ (md.results.TransientSolution(1).Vy),...
Index: /issm/oecreview/Archive/17802-17983/ISSM-17857-17858.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17857-17858.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17857-17858.diff (revision 17986)
@@ -0,0 +1,64 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17857)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17858)
+@@ -156,6 +156,7 @@
+ }
+ else{
+ IssmDouble* xyz_list=NULL;
++ IssmDouble *xyz_list_base=NULL;
+ IssmDouble pressure,viscosity,sigma_nn;
+ IssmDouble sigma_xx,sigma_xy,sigma_yy;
+ IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/
+@@ -164,6 +165,7 @@
+
+ /* Get node coordinates and dof list: */
+ GetVerticesCoordinates(&xyz_list);
++ GetVerticesCoordinatesTop(&xyz_list_base);
+
+ /*Retrieve all inputs we will be needing: */
+ this->FindParam(&domaintype,DomainTypeEnum);
+@@ -187,7 +189,7 @@
+ sigma_xy=2*viscosity*epsilon[2];
+
+ /*Get normal vector to the bed */
+- NormalBase(&base_normal[0],xyz_list);
++ NormalBase(&base_normal[0],xyz_list_base);
+
+ /*Compute sigma_nn*/
+ sigma_nn=sigma_xx*base_normal[0]*base_normal[0] + sigma_xy*base_normal[0]*base_normal[1] + sigma_yy*base_normal[1]*base_normal[1];
+@@ -197,6 +199,7 @@
+
+ /*Clean up and return*/
+ xDelete(xyz_list);
++ xDelete(xyz_list_base);
+ delete gauss;
+ }
+ }
+@@ -1664,13 +1667,11 @@
+ void Tria::NormalBase(IssmDouble* bed_normal,IssmDouble* xyz_list){
+
+ /*Build unit outward pointing vector*/
+- int index1,index2;
+ IssmDouble vector[2];
+ IssmDouble norm;
+
+- this->EdgeOnBaseIndices(&index1,&index2);
+- vector[0]=xyz_list[index2*3+0] - xyz_list[index1*3+0];
+- vector[1]=xyz_list[index2*3+1] - xyz_list[index1*3+1];
++ vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0];
++ vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1];
+
+ norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]);
+
+@@ -1687,8 +1688,8 @@
+ IssmDouble norm;
+
+ this->EdgeOnSurfaceIndices(&index1,&index2);
+- vector[0]=xyz_list[index2*3+0] - xyz_list[index1*3+0];
+- vector[1]=xyz_list[index2*3+1] - xyz_list[index1*3+1];
++ vector[0]=xyz_list[1*3+0] - xyz_list[0*3+0];
++ vector[1]=xyz_list[1*3+1] - xyz_list[0*3+1];
+
+ norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]);
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17858-17859.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17858-17859.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17858-17859.diff (revision 17986)
@@ -0,0 +1,37 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17858)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17859)
+@@ -1449,6 +1449,7 @@
+
+ /*Intermediaries*/
+ IssmDouble* xyz_list = NULL;
++ IssmDouble* xyz_list_base = NULL;
+ IssmDouble pressure,water_pressure,sigma_nn,viscosity,bed,base;
+ IssmDouble bed_normal[2];
+ IssmDouble epsilon[3]; /* epsilon=[exx,eyy,exy];*/
+@@ -1457,6 +1458,7 @@
+
+ /* Get node coordinates and dof list: */
+ GetVerticesCoordinates(&xyz_list);
++ GetVerticesCoordinatesTop(&xyz_list_base);
+
+ /*Retrieve all inputs we will be needing: */
+ Input* pressure_input = inputs->GetInput(PressureEnum); _assert_(pressure_input);
+@@ -1483,7 +1485,7 @@
+ IssmDouble sigma_xy=2.*viscosity*epsilon[2];
+
+ /*Get normal vector to the bed */
+- NormalBase(&bed_normal[0],xyz_list);
++ NormalBase(&bed_normal[0],xyz_list_base);
+
+ /*basalforce*/
+ sigma_nn = sigma_xx*bed_normal[0]*bed_normal[0] + sigma_yy*bed_normal[1]*bed_normal[1] + 2.*sigma_xy*bed_normal[0]*bed_normal[1];
+@@ -1517,6 +1519,7 @@
+ /*clean up*/
+ delete gauss;
+ xDelete(xyz_list);
++ xDelete(xyz_list_base);
+ }
+ /*}}}*/
+ /*FUNCTION Tria::IsNodeOnShelfFromFlags {{{*/
Index: /issm/oecreview/Archive/17802-17983/ISSM-17859-17860.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17859-17860.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17859-17860.diff (revision 17986)
@@ -0,0 +1,29 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17859)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17860)
+@@ -1680,10 +1680,11 @@
+
+ bed_normal[0]= + vector[1]/norm;
+ bed_normal[1]= - vector[0]/norm;
++ _assert_(bed_normal[1]<0);
+ }
+ /*}}}*/
+ /*FUNCTION Tria::NormalTop {{{*/
+-void Tria::NormalTop(IssmDouble* bed_normal,IssmDouble* xyz_list){
++void Tria::NormalTop(IssmDouble* top_normal,IssmDouble* xyz_list){
+
+ /*Build unit outward pointing vector*/
+ int index1,index2;
+@@ -1696,8 +1697,9 @@
+
+ norm=sqrt(vector[0]*vector[0] + vector[1]*vector[1]);
+
+- bed_normal[0]= + vector[1]/norm;
+- bed_normal[1]= - vector[0]/norm;
++ top_normal[0]= + vector[1]/norm;
++ top_normal[1]= - vector[0]/norm;
++ _assert_(top_normal[1]<0);
+ }
+ /*}}}*/
+ /*FUNCTION Tria::VelocityInterpolation{{{*/
Index: /issm/oecreview/Archive/17802-17983/ISSM-17860-17861.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17860-17861.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17860-17861.diff (revision 17986)
@@ -0,0 +1,41 @@
+Index: ../trunk-jpl/test/NightlyRun/test435.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test435.m (revision 17860)
++++ ../trunk-jpl/test/NightlyRun/test435.m (revision 17861)
+@@ -47,8 +47,8 @@
+ 'Bed2','Surface2','Thickness2','Floatingice2','Vx2','Vy2','Vz2','Pressure2',...
+ 'Bed3','Surface3','Thickness3','Floatingice3','Vx3','Vy3','Vz3','Pressure3'};
+ field_tolerances={2e-11,5e-12,2e-11,1e-11,4e-10,1e-08,6e-10,1e-13,...
+- 3e-11,3e-11,9e-10,7e-11,1e-09,1e-08,1e-09,1e-10,...
+- 1e-10,3e-11,1e-10,7e-11,1e-09,1e-08,1e-09,1e-10};
++ 3e-11,3e-11,9e-10,7e-11,1e-09,5e-08,1e-09,1e-10,...
++ 1e-10,3e-11,1e-10,7e-11,1e-09,5e-08,1e-09,1e-10};
+ field_values={...
+ (md.results.TransientSolution(1).Base),...
+ (md.results.TransientSolution(1).Surface),...
+Index: ../trunk-jpl/test/NightlyRun/test322.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test322.m (revision 17860)
++++ ../trunk-jpl/test/NightlyRun/test322.m (revision 17861)
+@@ -22,7 +22,7 @@
+
+ %Fields and tolerances to track changes
+ field_names ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'};
+-field_tolerances={1e-05,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,2e-09,2e-09,2e-09};
++field_tolerances={1e-05,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,5e-08,5e-08,5e-08};
+ field_values={...
+ (md.results.StressbalanceSolution.Gradient1),...
+ (md.results.StressbalanceSolution.J),...
+Index: ../trunk-jpl/test/NightlyRun/test322.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test322.py (revision 17860)
++++ ../trunk-jpl/test/NightlyRun/test322.py (revision 17861)
+@@ -34,7 +34,7 @@
+
+ #Fields and tolerances to track changes
+ field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy']
+-field_tolerances=[1e-05,1e-08,1e-09,1e-09,2e-09,2e-09,2e-09]
++field_tolerances=[1e-05,1e-08,1e-09,1e-09,5e-08,5e-08,5e-08]
+ field_values=[\
+ md.results.StressbalanceSolution.Gradient1,\
+ md.results.StressbalanceSolution.J,\
Index: /issm/oecreview/Archive/17802-17983/ISSM-17861-17862.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17861-17862.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17861-17862.diff (revision 17986)
@@ -0,0 +1,236 @@
+Index: ../trunk-jpl/src/c/modules/InputExtrudex/InputExtrudex.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/InputExtrudex/InputExtrudex.cpp (revision 0)
++++ ../trunk-jpl/src/c/modules/InputExtrudex/InputExtrudex.cpp (revision 17862)
+@@ -0,0 +1,15 @@
++/*!\file InputExtrudex
++ * \brief: extrude input
++ */
++
++#include "./InputExtrudex.h"
++#include "../../shared/shared.h"
++#include "../../classes/classes.h"
++#include "../../toolkits/toolkits.h"
++
++void InputExtrudex(FemModel* femmodel,int input_enum){
++ for(int i=0;ielements->Size();i++){
++ Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i));
++ element->InputExtrude(input_enum);
++ }
++}
+Index: ../trunk-jpl/src/c/modules/InputExtrudex/InputExtrudex.h
+===================================================================
+--- ../trunk-jpl/src/c/modules/InputExtrudex/InputExtrudex.h (revision 0)
++++ ../trunk-jpl/src/c/modules/InputExtrudex/InputExtrudex.h (revision 17862)
+@@ -0,0 +1,13 @@
++/*!\file: InputExtrudex.h
++ * \brief header file for field extrusion
++ */
++
++#ifndef _INPUTEXTRUDEX_H
++#define _INPUTEXTRUDEX_H
++
++#include "../../classes/classes.h"
++
++/* local prototypes: */
++void InputExtrudex(FemModel* femmodel,int input_enum);
++
++#endif /* _INPUTDUPLICATEX_H */
+Index: ../trunk-jpl/src/c/modules/modules.h
+===================================================================
+--- ../trunk-jpl/src/c/modules/modules.h (revision 17861)
++++ ../trunk-jpl/src/c/modules/modules.h (revision 17862)
+@@ -36,7 +36,9 @@
+ #include "./GroundinglineMigrationx/GroundinglineMigrationx.h"
+ #include "./HoleFillerx/HoleFillerx.h"
+ #include "./InputControlUpdatex/InputControlUpdatex.h"
++#include "./InputDepthAverageAtBasex/InputDepthAverageAtBasex.h"
+ #include "./InputDuplicatex/InputDuplicatex.h"
++#include "./InputExtrudex/InputExtrudex.h"
+ #include "./InputScalex/InputScalex.h"
+ #include "./InterpFromMesh2dx/InterpFromMesh2dx.h"
+ #include "./InterpFromGridToMeshx/InterpFromGridToMeshx.h"
+Index: ../trunk-jpl/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp
+===================================================================
+--- ../trunk-jpl/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp (revision 0)
++++ ../trunk-jpl/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp (revision 17862)
+@@ -0,0 +1,15 @@
++/*!\file InputDepthAverageAtBasex
++ * \brief: extrude input
++ */
++
++#include "./InputDepthAverageAtBasex.h"
++#include "../../shared/shared.h"
++#include "../../classes/classes.h"
++#include "../../toolkits/toolkits.h"
++
++void InputDepthAverageAtBasex(FemModel* femmodel,int original_enum, int new_enum){
++ for(int i=0;ielements->Size();i++){
++ Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i));
++ element->InputDepthAverageAtBase(original_enum,new_enum);
++ }
++}
+Index: ../trunk-jpl/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.h
+===================================================================
+--- ../trunk-jpl/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.h (revision 0)
++++ ../trunk-jpl/src/c/modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.h (revision 17862)
+@@ -0,0 +1,13 @@
++/*!\file: InputDepthAverageAtBasex.h
++ * \brief header file for field extrusion
++ */
++
++#ifndef _INPUTDEPTHAVERAGEATBASEX_H
++#define _INPUTDEPTHAVERAGEATBASEX_H
++
++#include "../../classes/classes.h"
++
++/* local prototypes: */
++void InputDepthAverageAtBasex(FemModel* femmodel,int reinitialized_enum, int original_enum);
++
++#endif /* _INPUTDUPLICATEX_H */
+Index: ../trunk-jpl/src/c/Makefile.am
+===================================================================
+--- ../trunk-jpl/src/c/Makefile.am (revision 17861)
++++ ../trunk-jpl/src/c/Makefile.am (revision 17862)
+@@ -283,8 +283,12 @@
+ ./modules/VertexCoordinatesx/VertexCoordinatesx.cpp\
+ ./modules/OutputResultsx/OutputResultsx.h\
+ ./modules/OutputResultsx/OutputResultsx.cpp\
++ ./modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.h\
++ ./modules/InputDepthAverageAtBasex/InputDepthAverageAtBasex.cpp\
+ ./modules/InputDuplicatex/InputDuplicatex.h\
+ ./modules/InputDuplicatex/InputDuplicatex.cpp\
++ ./modules/InputExtrudex/InputExtrudex.h\
++ ./modules/InputExtrudex/InputExtrudex.cpp\
+ ./modules/InputScalex/InputScalex.h\
+ ./modules/InputScalex/InputScalex.cpp\
+ ./modules/SurfaceAreax/SurfaceAreax.h\
+Index: ../trunk-jpl/src/c/classes/Elements/Element.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17862)
+@@ -96,6 +96,7 @@
+ int Sid();
+ void InputChangeName(int enum_type,int enum_type_old);
+ void InputCreate(IssmDouble* vector,IoModel* iomodel,int M,int N,int vector_type,int vector_enum,int code);
++ void InputDuplicate(int original_enum,int new_enum);
+ void InputUpdateFromConstant(IssmDouble constant, int name);
+ void InputUpdateFromConstant(int constant, int name);
+ void InputUpdateFromConstant(bool constant, int name);
+@@ -207,7 +208,7 @@
+ virtual void ComputeDeviatoricStressTensor(void)=0;
+
+ virtual void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finite_element)=0;
+- virtual void InputDuplicate(int original_enum,int new_enum)=0;
++ virtual void InputExtrude(int input_enum)=0;
+ virtual void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solution,int inputenum)=0;
+ virtual void InputUpdateFromSolutionOneDof(IssmDouble* solution,int inputenum)=0;
+
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17862)
+@@ -1032,15 +1032,6 @@
+ this->inputs->AddInput((Input*)newinput);
+ }
+ /*}}}*/
+-/*FUNCTION Tria::InputDuplicate{{{*/
+-void Tria::InputDuplicate(int original_enum,int new_enum){
+-
+- /*Call inputs method*/
+- if (IsInput(original_enum)) {
+- inputs->DuplicateInput(original_enum,new_enum);
+- }
+-}
+-/*}}}*/
+ /*FUNCTION Tria::InputScale{{{*/
+ void Tria::InputScale(int enum_type,IssmDouble scale_factor){
+
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17862)
+@@ -87,7 +87,7 @@
+ void GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
+ void GetVerticesCoordinatesTop(IssmDouble** pxyz_list);
+ void InputDepthAverageAtBase(int enum_type,int average_enum_type);
+- void InputDuplicate(int original_enum,int new_enum);
++ void InputExtrude(int enum_type){_error_("not implemented"); /*For penta only*/};
+ void InputScale(int enum_type,IssmDouble scale_factor);
+ void MaterialUpdateFromTemperature(void){_error_("not implemented yet");};
+ int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum);
+Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17862)
+@@ -1357,14 +1357,6 @@
+ this->inputs->AddInput((Input*)depth_averaged_input);
+ }
+ /*}}}*/
+-/*FUNCTION Penta::InputDuplicate{{{*/
+-void Penta::InputDuplicate(int original_enum,int new_enum){
+-
+- /*Call inputs method*/
+- if (IsInput(original_enum)) inputs->DuplicateInput(original_enum,new_enum);
+-
+-}
+-/*}}}*/
+ /*FUNCTION Penta::InputExtrude {{{*/
+ void Penta::InputExtrude(int enum_type){
+
+Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17862)
+@@ -86,7 +86,6 @@
+ void GetVerticesCoordinatesTop(IssmDouble** pxyz_list);
+
+ void InputDepthAverageAtBase(int enum_type,int average_enum_type);
+- void InputDuplicate(int original_enum,int new_enum);
+ void InputScale(int enum_type,IssmDouble scale_factor);
+ int NumberofNodesVelocity(void);
+ int NumberofNodesPressure(void);
+Index: ../trunk-jpl/src/c/classes/Elements/Seg.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17862)
+@@ -132,7 +132,7 @@
+
+ void GetSolutionFromInputsOneDof(Vector* solution,int enum_type){_error_("not implemented yet");};
+ void InputDepthAverageAtBase(int enum_type,int average_enum_type){_error_("not implemented yet");};
+- void InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");};
++ void InputExtrude(int enum_type){_error_("not implemented"); /*For penta only*/};
+ void InputScale(int enum_type,IssmDouble scale_factor){_error_("not implemented yet");};
+ void MaterialUpdateFromTemperature(void){_error_("not implemented yet");};
+ int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Tetra.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17862)
+@@ -137,7 +137,7 @@
+
+ void GetSolutionFromInputsOneDof(Vector* solution,int enum_type){_error_("not implemented yet");};
+ void InputDepthAverageAtBase(int enum_type,int average_enum_type){_error_("not implemented yet");};
+- void InputDuplicate(int original_enum,int new_enum){_error_("not implemented yet");};
++ void InputExtrude(int enum_type){_error_("not implemented"); /*For penta only*/};
+ void InputScale(int enum_type,IssmDouble scale_factor){_error_("not implemented yet");};
+ void MaterialUpdateFromTemperature(void){_error_("not implemented yet");};
+ int NodalValue(IssmDouble* pvalue, int index, int natureofdataenum){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17861)
++++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17862)
+@@ -657,6 +657,13 @@
+ _error_("Cannot add input for vector type " << vector_type << " (not supported)");
+ }
+ }/*}}}*/
++void Element::InputDuplicate(int original_enum,int new_enum){/*{{{*/
++
++ /*Call inputs method*/
++ if (IsInput(original_enum)) inputs->DuplicateInput(original_enum,new_enum);
++
++}
++/*}}}*/
+ void Element::InputUpdateFromConstant(int constant, int name){/*{{{*/
+
+ /*Check that name is an element input*/
Index: /issm/oecreview/Archive/17802-17983/ISSM-17862-17863.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17862-17863.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17862-17863.diff (revision 17986)
@@ -0,0 +1,40 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17862)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17863)
+@@ -165,7 +165,7 @@
+
+ /* Get node coordinates and dof list: */
+ GetVerticesCoordinates(&xyz_list);
+- GetVerticesCoordinatesTop(&xyz_list_base);
++ GetVerticesCoordinatesBase(&xyz_list_base);
+
+ /*Retrieve all inputs we will be needing: */
+ this->FindParam(&domaintype,DomainTypeEnum);
+@@ -192,7 +192,7 @@
+ NormalBase(&base_normal[0],xyz_list_base);
+
+ /*Compute sigma_nn*/
+- sigma_nn=sigma_xx*base_normal[0]*base_normal[0] + sigma_xy*base_normal[0]*base_normal[1] + sigma_yy*base_normal[1]*base_normal[1];
++ sigma_nn=sigma_xx*base_normal[0]*base_normal[0] + 2*sigma_xy*base_normal[0]*base_normal[1] + sigma_yy*base_normal[1]*base_normal[1];
+
+ /*Add Stress tensor components into inputs*/
+ this->inputs->AddInput(new TriaInput(SigmaNNEnum,&sigma_nn,P0Enum));
+@@ -1449,7 +1449,7 @@
+
+ /* Get node coordinates and dof list: */
+ GetVerticesCoordinates(&xyz_list);
+- GetVerticesCoordinatesTop(&xyz_list_base);
++ GetVerticesCoordinatesBase(&xyz_list_base);
+
+ /*Retrieve all inputs we will be needing: */
+ Input* pressure_input = inputs->GetInput(PressureEnum); _assert_(pressure_input);
+@@ -1690,7 +1690,7 @@
+
+ top_normal[0]= + vector[1]/norm;
+ top_normal[1]= - vector[0]/norm;
+- _assert_(top_normal[1]<0);
++ _assert_(top_normal[1]>0);
+ }
+ /*}}}*/
+ /*FUNCTION Tria::VelocityInterpolation{{{*/
Index: /issm/oecreview/Archive/17802-17983/ISSM-17863-17864.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17863-17864.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17863-17864.diff (revision 17986)
@@ -0,0 +1,28 @@
+Index: ../trunk-jpl/src/m/materials/paterson.py
+===================================================================
+--- ../trunk-jpl/src/m/materials/paterson.py (revision 17863)
++++ ../trunk-jpl/src/m/materials/paterson.py (revision 17864)
+@@ -15,9 +15,12 @@
+ raise RuntimeError("input temperature should be in Kelvin (positive)")
+
+ if numpy.ndim(temperature)==2:
+- T = temperature.reshape(-1,)-273.15
++ #T = temperature.reshape(-1,)-273.15
++ T = temperature.flatten()-273.15
++ elif isinstance(temperature,float) or isinstance(temperature,int):
++ T = numpy.array([temperature])-273.15
+ else:
+- T = numpy.array([temperature])-273.15
++ T = temperature-273.15
+
+ #The routine below is equivalent to:
+
+@@ -70,7 +73,7 @@
+ #Now make sure that rigidity is positive
+ pos=numpy.nonzero(rigidity<0)[0]
+ if len(pos):
+- rigidity[pos]=1**6
++ rigidity[pos]=1.e6
+
+ return rigidity
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17864-17865.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17864-17865.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17864-17865.diff (revision 17986)
@@ -0,0 +1,43 @@
+Index: ../trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp
+===================================================================
+--- ../trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 17864)
++++ ../trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp (revision 17865)
+@@ -1424,7 +1424,7 @@
+ (*pl2 )[i]=l2p [iord-1][i];
+ (*pl3 )[i]=l3p [iord-1][i];
+ (*pl4 )[i]=l4p [iord-1][i];
+- (*pwgt)[i]=wgtp[iord-1][i]*2./3.*SQRT2;
++ (*pwgt)[i]=wgtp[iord-1][i];
+ }
+ }
+ else {
+Index: ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp (revision 17864)
++++ ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp (revision 17865)
+@@ -32,10 +32,24 @@
+ /*}}}*/
+ /*FUNCTION GaussTetra::GaussTetra(int order) {{{*/
+ GaussTetra::GaussTetra(int order){
++
+ /*Get gauss points*/
+ GaussLegendreTetra(&numgauss,&coords1,&coords2,&coords3,&coords4,&weights,order);
+- for(int i=0;iweights[i]=this->weights[i]/6.; //FIXME: double check that
+
++ /*Rescale weights if necessary*/
++ IssmDouble sumweights = 0.;
++ for(int i=0;iweights[i];
++ if(sumweights==1.){
++ for(int i=0;iweights[i] = this->weights[i]/6.; /*rescale volume to 1/6*/
++ }
++
++ /*Check final weights in debugging mode*/
++ #ifdef _ISSM_DEBUG_
++ sumweights = 0.; for(int i=0;iweights[i];
++ _assert_(sumweights>1./6.-1e-10);
++ _assert_(sumweights<1./6.+1e-10);
++ #endif
++
+ /*Initialize static fields as undefinite*/
+ weight=UNDEF;
+ coord1=UNDEF;
Index: /issm/oecreview/Archive/17802-17983/ISSM-17865-17866.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17865-17866.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17865-17866.diff (revision 17986)
@@ -0,0 +1,13 @@
+Index: ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp (revision 17865)
++++ ../trunk-jpl/src/c/classes/gauss/GaussTetra.cpp (revision 17866)
+@@ -84,8 +84,6 @@
+ else{
+ _error_(index1 <<" "<weights[i]=this->weights[i]*0.5/1.732050807568877; //FIXME: double check that
+ }
+ /*}}}*/
+ /*FUNCTION GaussTetra::~GaussTetra(){{{*/
Index: /issm/oecreview/Archive/17802-17983/ISSM-17866-17867.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17866-17867.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17866-17867.diff (revision 17986)
@@ -0,0 +1,48 @@
+Index: ../trunk-jpl/src/m/interp/holefiller.py
+===================================================================
+--- ../trunk-jpl/src/m/interp/holefiller.py (revision 17866)
++++ ../trunk-jpl/src/m/interp/holefiller.py (revision 17867)
+@@ -1,11 +1,12 @@
+ import numpy as npy
+ from scipy.spatial import cKDTree
+
+-def nearestneighbors(md,data,goodids,badids,knn):
++def nearestneighbors(x,y,data,goodids,badids,knn):
+ '''
+ fill holes using nearest neigbors. Arguments include:
+
+- md: the model
++
++ x,y: the coordinates of data to be filled
+ data: the data field to be filled (full field, including holes)
+ goodids: id's into the vertices that have good data
+ badids: id's into the vertices with missing/bad data
+@@ -14,22 +15,22 @@
+ then used to fill the hole.
+
+ Usage:
+- filleddata=nearestneighbors(md,goodids,badids,knn)
++ filleddata=nearestneighbors(x,y,data,goodids,badids,knn)
+
+ Example:
+- filledthickness=nearestneighbors(md,goodids,badids,5)
++ filledthickness=nearestneighbors(x,y,data,goodids,badids,5)
+ '''
+
+ if type(knn) != int or knn<1:
+ raise TypeError('nearestneighbors error: knn should be an integer>1')
+
+- if len(data) != md.mesh.numberofvertices:
+- raise StandardError('nearestneighbors error: "data" should have length md.mesh.numberofvertices')
++ if len(x) != len(data) or len(y) != len(data):
++ raise StandardError('nearestneighbors error: x and y should have the same length as "data"')
+
+ filled=data
+
+- XYGood=npy.dstack([md.mesh.x[goodids],md.mesh.y[goodids]])[0]
+- XYBad=npy.dstack([md.mesh.x[badids],md.mesh.y[badids]])[0]
++ XYGood=npy.dstack([x[goodids],y[goodids]])[0]
++ XYBad=npy.dstack([x[badids],y[badids]])[0]
+ tree=cKDTree(XYGood)
+ nearest=tree.query(XYBad,k=knn)[1]
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17867-17868.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17867-17868.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17867-17868.diff (revision 17986)
@@ -0,0 +1,26 @@
+Index: ../trunk-jpl/src/m/parameterization/setmask.py
+===================================================================
+--- ../trunk-jpl/src/m/parameterization/setmask.py (revision 17867)
++++ ../trunk-jpl/src/m/parameterization/setmask.py (revision 17868)
+@@ -54,11 +54,11 @@
+ #}}}
+
+ #level sets
+- md.mask.groundedice_levelset = -1.*numpy.ones((md.mesh.numberofvertices,1))
++ md.mask.groundedice_levelset = -1.*numpy.ones(md.mesh.numberofvertices)
+ md.mask.groundedice_levelset[md.mesh.elements[numpy.nonzero(elementongroundedice),:]-1]=1.
+
+ if(len(args)):
+- md.mask.ice_levelset = 1.*numpy.ones((md.mesh.numberofvertices,1))
++ md.mask.ice_levelset = 1.*numpy.ones(md.mesh.numberofvertices)
+ icedomainfile = options.getfieldvalue('icedomain','none')
+ if not os.path.exists(icedomainfile):
+ raise IOError("setmask error message: ice domain file '%s' not found." % icedomainfile)
+@@ -66,6 +66,6 @@
+ [vertexinsideicedomain,elementinsideicedomain]=ContourToMesh(elements,x,y,icedomainfile,'node',1)
+ md.mask.ice_levelset[numpy.nonzero(vertexinsideicedomain)[0]] = -1.
+ else:
+- md.mask.ice_levelset = -1.*numpy.ones((md.mesh.numberofvertices,1))
++ md.mask.ice_levelset = -1.*numpy.ones(md.mesh.numberofvertices)
+
+ return md
Index: /issm/oecreview/Archive/17802-17983/ISSM-17868-17869.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17868-17869.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17868-17869.diff (revision 17986)
@@ -0,0 +1,12 @@
+Index: ../trunk-jpl/src/m/plot/applyoptions.py
+===================================================================
+--- ../trunk-jpl/src/m/plot/applyoptions.py (revision 17868)
++++ ../trunk-jpl/src/m/plot/applyoptions.py (revision 17869)
+@@ -232,6 +232,7 @@
+ else:
+ cb.set_label(options.getfieldvalue('colorbartitle'),fontsize=fontsize)
+ cb.ax.tick_params(labelsize=fontsize)
++ plt.sca(ax) # return to original axes control
+ #}}}
+
+ #area
Index: /issm/oecreview/Archive/17802-17983/ISSM-17869-17870.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17869-17870.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17869-17870.diff (revision 17986)
@@ -0,0 +1,17 @@
+Index: ../trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py
+===================================================================
+--- ../trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 17869)
++++ ../trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 17870)
+@@ -41,9 +41,9 @@
+ if not numpy.size(pos):
+ print "SetMarineIceSheetBC warning: ice front all around the glacier, no dirichlet found. Dirichlet must be added manually."
+
+- md.stressbalance.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
+- md.stressbalance.spcvy=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
+- md.stressbalance.spcvz=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
++ md.stressbalance.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices,))
++ md.stressbalance.spcvy=float('nan')*numpy.ones((md.mesh.numberofvertices,))
++ md.stressbalance.spcvz=float('nan')*numpy.ones((md.mesh.numberofvertices,))
+ md.stressbalance.referential=float('nan')*numpy.ones((md.mesh.numberofvertices,6))
+ md.stressbalance.loadingforce=0*numpy.ones((md.mesh.numberofvertices,3))
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17870-17871.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17870-17871.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17870-17871.diff (revision 17986)
@@ -0,0 +1,30 @@
+Index: ../trunk-jpl/test/NightlyRun/test211.py
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.py (revision 17870)
++++ ../trunk-jpl/test/NightlyRun/test211.py (revision 17871)
+@@ -27,8 +27,8 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
+ field_tolerances=[\
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\
+- 5e-08,5e-08,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,\
+- 1e-07,1e-07,5e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06]
++ 5e-07,5e-07,1e-05,1e-07,1e-08,1e-08,1e-08,1e-08,5e-08,2e-06,\
++ 1e-07,1e-07,5e-05,1e-07,1e-08,1e-08,1e-08,1e-08,5e-08,2e-06]
+ field_values=[\
+ md.results.TransientSolution[0].Vx,\
+ md.results.TransientSolution[0].Vy,\
+Index: ../trunk-jpl/test/NightlyRun/test211.m
+===================================================================
+--- ../trunk-jpl/test/NightlyRun/test211.m (revision 17870)
++++ ../trunk-jpl/test/NightlyRun/test211.m (revision 17871)
+@@ -14,8 +14,8 @@
+ 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
+ field_tolerances={...
+ 2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,...
+- 5e-08,5e-08,1e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06,...
+- 1e-07,1e-07,5e-05,5e-08,1e-08,1e-08,1e-08,1e-08,2e-08,2e-06};
++ 5e-07,5e-07,1e-05,1e-07,1e-08,1e-08,1e-08,1e-08,5e-08,2e-06,...
++ 1e-07,1e-07,5e-05,1e-07,1e-08,1e-08,1e-08,1e-08,5e-08,2e-06};
+ field_values={...
+ (md.results.TransientSolution(1).Vx),...
+ (md.results.TransientSolution(1).Vy),...
Index: /issm/oecreview/Archive/17802-17983/ISSM-17871-17872.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17871-17872.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17871-17872.diff (revision 17986)
@@ -0,0 +1,63 @@
+Index: ../trunk-jpl/externalpackages/m1qn3/install.sh
+===================================================================
+--- ../trunk-jpl/externalpackages/m1qn3/install.sh (revision 0)
++++ ../trunk-jpl/externalpackages/m1qn3/install.sh (revision 17872)
+@@ -0,0 +1,18 @@
++#!/bin/bash
++set -eu
++
++#Some cleanup
++rm -rf install src m1qn3-3.3-distrib
++mkdir install
++
++#Download from ISSM server
++$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/m1qn3-3.3-distrib.tgz' 'm1qn3-3.3-distrib.tgz'
++
++#Untar
++tar -xzf m1qn3-3.3-distrib.tgz
++mv m1qn3-3.3-distrib src
++
++#Compile m1qn3
++cd src/src/
++cp ../../Makefile .
++make
+
+Property changes on: ../trunk-jpl/externalpackages/m1qn3/install.sh
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
+Index: ../trunk-jpl/externalpackages/m1qn3/Makefile
+===================================================================
+--- ../trunk-jpl/externalpackages/m1qn3/Makefile (revision 0)
++++ ../trunk-jpl/externalpackages/m1qn3/Makefile (revision 17872)
+@@ -0,0 +1,21 @@
++#Makefile for m1qn3 library.
++
++#preliminary:
++LIB_EXT=a
++FC=gfortran
++
++install: libm1qn3.$(LIB_EXT)
++ cp libm1qn3.$(LIB_EXT) ../../install/
++
++
++OBJECTS= m1qn3.o
++
++libm1qn3.$(LIB_EXT): $(OBJECTS)
++ ar -r libm1qn3.$(LIB_EXT) $(OBJECTS)
++ ranlib libm1qn3.$(LIB_EXT)
++
++%.o: %.f
++ $(FC) $(FFLAGS) -c $< -o $@
++
++clean:
++ rm -rf *.o *.$(LIB_EXT)
+
+Property changes on: ../trunk-jpl/externalpackages/m1qn3/Makefile
+___________________________________________________________________
+Added: svn:executable
+## -0,0 +1 ##
++*
+\ No newline at end of property
Index: /issm/oecreview/Archive/17802-17983/ISSM-17872-17873.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17872-17873.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17872-17873.diff (revision 17986)
@@ -0,0 +1,13 @@
+Index: ../trunk-jpl/src/m/parameterization/setflowequation.py
+===================================================================
+--- ../trunk-jpl/src/m/parameterization/setflowequation.py (revision 17872)
++++ ../trunk-jpl/src/m/parameterization/setflowequation.py (revision 17873)
+@@ -88,7 +88,7 @@
+ fullspcnodes=numpy.logical_or(numpy.logical_not(numpy.isnan(md.stressbalance.spcvx)).astype(int)+ \
+ numpy.logical_not(numpy.isnan(md.stressbalance.spcvy)).astype(int)+ \
+ numpy.logical_not(numpy.isnan(md.stressbalance.spcvz)).astype(int)==3, \
+- numpy.logical_and(nodeonHO,nodeonFS).reshape(-1,1)).astype(int) #find all the nodes on the boundary of the domain without icefront
++ numpy.logical_and(nodeonHO,nodeonFS)).astype(int) #find all the nodes on the boundary of the domain without icefront
+ # fullspcelems=double(sum(fullspcnodes(md.mesh.elements),2)==6); %find all the nodes on the boundary of the domain without icefront
+ fullspcelems=(numpy.sum(fullspcnodes[md.mesh.elements-1],axis=1)==6).astype(int) #find all the nodes on the boundary of the domain without icefront
+ FSflag[numpy.nonzero(fullspcelems.reshape(-1))]=False
Index: /issm/oecreview/Archive/17802-17983/ISSM-17873-17874.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17873-17874.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17873-17874.diff (revision 17986)
@@ -0,0 +1,854 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Element.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17874)
+@@ -241,6 +241,7 @@
+
+ virtual int VelocityInterpolation()=0;
+ virtual int PressureInterpolation()=0;
++ virtual int TensorInterpolation()=0;
+ virtual bool IsZeroLevelset(int levelset_enum)=0;
+ virtual bool IsIcefront(void)=0;
+ virtual bool IsFaceOnBoundary(void)=0;
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17874)
+@@ -1596,7 +1596,7 @@
+ void Tria::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTriaEnum);
+- this->GetNodalFunctionsDerivativesVelocity(dbasis,xyz_list,(GaussTria*)gauss);
++ this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussTria*)gauss,this->VelocityInterpolation());
+
+ }
+ /*}}}*/
+@@ -1604,7 +1604,7 @@
+ void Tria::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTriaEnum);
+- this->GetNodalFunctionsVelocity(basis,(GaussTria*)gauss);
++ this->GetNodalFunctions(basis,(GaussTria*)gauss,this->VelocityInterpolation());
+
+ }
+ /*}}}*/
+@@ -1612,7 +1612,7 @@
+ void Tria::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTriaEnum);
+- this->GetNodalFunctionsPressure(basis,(GaussTria*)gauss);
++ this->GetNodalFunctions(basis,(GaussTria*)gauss,this->PressureInterpolation());
+
+ }
+ /*}}}*/
+@@ -1620,7 +1620,7 @@
+ void Tria::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTriaEnum);
+- this->GetNodalFunctionsTensor(basis,(GaussTria*)gauss);
++ this->GetNodalFunctions(basis,(GaussTria*)gauss,this->TensorInterpolation());
+
+ }
+ /*}}}*/
+@@ -1703,6 +1703,11 @@
+ return TriaRef::PressureInterpolation();
+ }
+ /*}}}*/
++/*FUNCTION Tria::TensorInterpolation{{{*/
++int Tria::TensorInterpolation(void){
++ return TriaRef::TensorInterpolation();
++}
++/*}}}*/
+ /*FUNCTION Tria::NumberofNodesPressure{{{*/
+ int Tria::NumberofNodesPressure(void){
+ return TriaRef::NumberofNodesPressure();
+Index: ../trunk-jpl/src/c/classes/Elements/TriaRef.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/TriaRef.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/TriaRef.h (revision 17874)
+@@ -28,16 +28,11 @@
+ void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,Gauss* gauss);
+ void GetNodalFunctions(IssmDouble* basis,Gauss* gauss);
+ void GetNodalFunctions(IssmDouble* basis,Gauss* gauss,int finiteelement);
+- void GetNodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss);
+- void GetNodalFunctionsPressure(IssmDouble* basis, Gauss* gauss);
+- void GetNodalFunctionsTensor(IssmDouble* basis, Gauss* gauss);
+ void GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss, int index1,int index2);
+ void GetSegmentBFlux(IssmDouble* B,Gauss* gauss, int index1,int index2);
+ void GetSegmentBprimeFlux(IssmDouble* Bprime,Gauss* gauss, int index1,int index2);
+ void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss);
+ void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement);
+- void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss);
+- void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss);
+ void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss);
+ void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement);
+ void GetInputValue(IssmDouble* pp, IssmDouble* plist, Gauss* gauss);
+@@ -51,5 +46,6 @@
+ int NumberofNodesPressure(void);
+ int VelocityInterpolation(void);
+ int PressureInterpolation(void);
++ int TensorInterpolation(void);
+ };
+ #endif
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17874)
+@@ -99,6 +99,7 @@
+ Element* SpawnTopElement(void);
+ int VelocityInterpolation();
+ int PressureInterpolation();
++ int TensorInterpolation();
+ IssmDouble SurfaceArea(void);
+ void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type,int finitelement);
+ IssmDouble TimeAdapt();
+Index: ../trunk-jpl/src/c/classes/Elements/PentaRef.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 17874)
+@@ -327,56 +327,28 @@
+ basis[11]=-(27.)/(16.)*gauss->coord3*(zeta-1)*(zeta+1./3.)*(zeta+1.);
+ return;
+ default:
+- _error_("Element type "<element_type)<<" not supported yet");
++ _error_("Element type "<element_type;
+- this->element_type = VelocityInterpolation();
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = save;
+-
++/*FUNCTION PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){{{*/
++void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
++ GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type);
+ }
+ /*}}}*/
+-/*FUNCTION PentaRef::GetNodalFunctionsPressure{{{*/
+-void PentaRef::GetNodalFunctionsPressure(IssmDouble* basis,Gauss* gauss){
+- /*This routine returns the values of the nodal functions at the gaussian point.*/
++/*FUNCTION PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){{{*/
++void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss,int finiteelement){
+
+- int save = this->element_type;
+- this->element_type = PressureInterpolation();
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = save;
+-
+-}
+-/*}}}*/
+-/*FUNCTION PentaRef::GetNodalFunctionsTensor{{{*/
+-void PentaRef::GetNodalFunctionsTensor(IssmDouble* basis,Gauss* gauss){
+- /*This routine returns the values of the nodal functions at the gaussian point.*/
+-
+- int save = this->element_type;
+- this->element_type = TensorInterpolation();
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = save;
+-
+-}
+-/*}}}*/
+-/*FUNCTION PentaRef::GetNodalFunctionsDerivatives{{{*/
+-void PentaRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
+-
+ /*This routine returns the values of the nodal functions derivatives (with respect to the
+ * actual coordinate system): */
+ IssmDouble Jinv[3][3];
+
+ /*Fetch number of nodes for this finite element*/
+- int numnodes = this->NumberofNodes();
++ int numnodes = this->NumberofNodes(finiteelement);
+
+ /*Get nodal functions derivatives in reference triangle*/
+ IssmDouble* dbasis_ref=xNew(3*numnodes);
+- GetNodalFunctionsDerivativesReference(dbasis_ref,gauss);
++ GetNodalFunctionsDerivativesReference(dbasis_ref,gauss,finiteelement);
+
+ /*Get Jacobian invert: */
+ GetJacobianInvert(&Jinv[0][0], xyz_list, gauss);
+@@ -396,31 +368,16 @@
+
+ /*Clean up*/
+ xDelete(dbasis_ref);
+-
+ }
+ /*}}}*/
+-/*FUNCTION PentaRef::GetNodalFunctionsDerivativesVelocity{{{*/
+-void PentaRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
+-
+- int save = this->element_type;
+- this->element_type = VelocityInterpolation();
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = save;
+-
++/*FUNCTION PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){{{*/
++void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){
++ GetNodalFunctionsDerivativesReference(dbasis,gauss,this->element_type);
+ }
+ /*}}}*/
+-/*FUNCTION PentaRef::GetNodalFunctionsDerivativesPressure{{{*/
+-void PentaRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
++/*FUNCTION PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){{{*/
++void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in,int finiteelement){
+
+- int save = this->element_type;
+- this->element_type = PressureInterpolation();
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = save;
+-}
+-/*}}}*/
+-/*FUNCTION PentaRef::GetNodalFunctionsDerivativesReference{{{*/
+-void PentaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss_in){
+-
+ /*This routine returns the values of the nodal functions derivatives (with respect to the
+ * natural coordinate system) at the gaussian point. */
+
+@@ -433,7 +390,7 @@
+ /*Get current coordinates in reference element*/
+ IssmDouble zeta=gauss->coord4;
+
+- switch(this->element_type){
++ switch(finiteelement){
+ case P0Enum:
+ /*Zero derivative*/
+ dbasis[NUMNODESP0*0+0] = 0.;
+@@ -836,7 +793,7 @@
+ dbasis[NUMNODESP1xP3*2+11] = -gauss->coord3 *(27./16.)*( 2.* zeta *( zeta + (1./3.)) + ( zeta - 1. )*( zeta + 1. ));
+ return;
+ default:
+- _error_("Element type "<element_type)<<" not supported yet");
++ _error_("Element type "<Enum()==GaussPentaEnum);
+- this->GetNodalFunctionsDerivativesVelocity(dbasis,xyz_list,(GaussPenta*)gauss);
++ this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussPenta*)gauss,this->VelocityInterpolation());
+
+ }
+ /*}}}*/
+@@ -1857,7 +1858,7 @@
+ void Penta::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussPentaEnum);
+- this->GetNodalFunctionsVelocity(basis,(GaussPenta*)gauss);
++ this->GetNodalFunctions(basis,(GaussPenta*)gauss,this->VelocityInterpolation());
+
+ }
+ /*}}}*/
+@@ -1865,7 +1866,7 @@
+ void Penta::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussPentaEnum);
+- this->GetNodalFunctionsPressure(basis,(GaussPenta*)gauss);
++ this->GetNodalFunctions(basis,(GaussPenta*)gauss,this->PressureInterpolation());
+
+ }
+ /*}}}*/
+@@ -1873,7 +1874,7 @@
+ void Penta::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussPentaEnum);
+- this->GetNodalFunctionsTensor(basis,(GaussPenta*)gauss);
++ this->GetNodalFunctions(basis,(GaussPenta*)gauss,this->TensorInterpolation());
+
+ }
+ /*}}}*/
+Index: ../trunk-jpl/src/c/classes/Elements/PentaRef.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/PentaRef.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/PentaRef.h (revision 17874)
+@@ -23,13 +23,10 @@
+ /*Numerics*/
+ void GetNodalFunctions(IssmDouble* basis, Gauss* gauss);
+ void GetNodalFunctions(IssmDouble* basis, Gauss* gauss,int finiteelement);
+- void GetNodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss);
+- void GetNodalFunctionsPressure(IssmDouble* basis, Gauss* gauss);
+- void GetNodalFunctionsTensor(IssmDouble* basis, Gauss* gauss);
+ void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss);
+- void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss);
+- void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss);
++ void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss,int finiteelement);
+ void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss);
++ void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss,int finiteelement);
+ void GetNodalFunctionsP1(IssmDouble* l1l6, Gauss* gauss);
+ void GetNodalFunctionsMINI(IssmDouble* l1l7, Gauss* gauss);
+ void GetNodalFunctionsP1Derivatives(IssmDouble* dh1dh6,IssmDouble* xyz_list, Gauss* gauss);
+Index: ../trunk-jpl/src/c/classes/Elements/SegRef.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/SegRef.cpp (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/SegRef.cpp (revision 17874)
+@@ -90,7 +90,7 @@
+
+ _assert_(basis);
+
+- switch(element_type){
++ switch(finiteelement){
+ case P0Enum:
+ basis[0]=1.;
+ return;
+@@ -104,7 +104,7 @@
+ basis[2]=(1.-gauss->coord1)*(1.+gauss->coord1);
+ return;
+ default:
+- _error_("Element type "<coord1;
+ return;
+ default:
+- _error_("Element type "<element_type)<<" not supported yet");
++ _error_("Element type "<coord1*gauss->coord4;
+ return;
+ default:
+- _error_("Element type "<element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- this->element_type = P2Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = TaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+-/*FUNCTION TetraRef::GetNodalFunctionsPressure{{{*/
+-void TetraRef::GetNodalFunctionsPressure(IssmDouble* basis,GaussTetra* gauss){
+- /*This routine returns the values of the nodal functions at the gaussian point.*/
+-
+- switch(this->element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = TaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+-/*FUNCTION TetraRef::GetNodalFunctionsTensor{{{*/
+-void TetraRef::GetNodalFunctionsTensor(IssmDouble* basis,GaussTetra* gauss){
+- /*This routine returns the values of the nodal functions at the gaussian point.*/
+-
+- switch(this->element_type){
+- case XTaylorHoodEnum:
+- this->element_type = P1DGEnum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = XTaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+ /*FUNCTION TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){{{*/
+ void TetraRef::GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){
+ GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss,this->element_type);
+@@ -225,72 +140,6 @@
+ xDelete(dbasis_ref);
+ }
+ /*}}}*/
+-/*FUNCTION TetraRef::GetNodalFunctionsDerivativesPressure (THIS ONE and following ones){{{*/
+-void TetraRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){
+- switch(this->element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = TaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+-/*FUNCTION TetraRef::GetNodalFunctionsDerivativesVelocity{{{*/
+-void TetraRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss){
+- switch(this->element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- this->element_type = P2Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = TaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+ /*FUNCTION TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss){{{*/
+ void TetraRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss){
+ /*This routine returns the values of the nodal functions derivatives (with respect to the
+@@ -394,7 +243,7 @@
+ dbasis[NUMNODESP2*2+9] = 4.*(gauss->coord1-gauss->coord4);
+ return;
+ default:
+- _error_("Element type "<element_type)<<" not supported yet");
++ _error_("Element type "<element_type){
++ case XTaylorHoodEnum: return P1DGEnum;
++ default: _error_("Element type "<element_type)<<" not supported yet");
++ }
+ }
+ /*}}}*/
+Index: ../trunk-jpl/src/c/classes/Elements/Penta.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17874)
+@@ -91,6 +91,7 @@
+ int NumberofNodesPressure(void);
+ int VelocityInterpolation();
+ int PressureInterpolation();
++ int TensorInterpolation(){_error_("not implemented yet");};
+ bool IsZeroLevelset(int levelset_enum);
+ bool IsIcefront(void);
+ bool IsFaceOnBoundary(void){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Tetra.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17874)
+@@ -589,7 +589,7 @@
+ void Tetra::NodalFunctionsVelocity(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTetraEnum);
+- this->GetNodalFunctionsVelocity(basis,(GaussTetra*)gauss);
++ this->GetNodalFunctions(basis,(GaussTetra*)gauss,this->VelocityInterpolation());
+
+ }
+ /*}}}*/
+@@ -597,7 +597,7 @@
+ void Tetra::NodalFunctionsPressure(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTetraEnum);
+- this->GetNodalFunctionsPressure(basis,(GaussTetra*)gauss);
++ this->GetNodalFunctions(basis,(GaussTetra*)gauss,this->PressureInterpolation());
+
+ }
+ /*}}}*/
+@@ -605,7 +605,7 @@
+ void Tetra::NodalFunctionsTensor(IssmDouble* basis, Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTetraEnum);
+- this->GetNodalFunctionsTensor(basis,(GaussTetra*)gauss);
++ this->GetNodalFunctions(basis,(GaussTetra*)gauss,this->TensorInterpolation());
+
+ }
+ /*}}}*/
+@@ -621,7 +621,7 @@
+ void Tetra::NodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,Gauss* gauss){
+
+ _assert_(gauss->Enum()==GaussTetraEnum);
+- this->GetNodalFunctionsDerivativesVelocity(dbasis,xyz_list,(GaussTetra*)gauss);
++ this->GetNodalFunctionsDerivatives(dbasis,xyz_list,(GaussTetra*)gauss,this->VelocityInterpolation());
+
+ }
+ /*}}}*/
+@@ -991,6 +991,11 @@
+ return TetraRef::PressureInterpolation();
+ }
+ /*}}}*/
++/*FUNCTION Tetra::TensorInterpolation{{{*/
++int Tetra::TensorInterpolation(void){
++ return TetraRef::TensorInterpolation();
++}
++/*}}}*/
+ /*FUNCTION Tetra::ZeroLevelsetCoordinates{{{*/
+ void Tetra::ZeroLevelsetCoordinates(IssmDouble** pxyz_zero,IssmDouble* xyz_list,int levelsetenum){
+ /*Compute portion of the element that is grounded*/
+Index: ../trunk-jpl/src/c/classes/Elements/TetraRef.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/TetraRef.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/TetraRef.h (revision 17874)
+@@ -28,13 +28,8 @@
+ void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussTetra* gauss);
+ void GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss);
+ void GetNodalFunctions(IssmDouble* basis,GaussTetra* gauss,int finiteelement);
+- void GetNodalFunctionsVelocity(IssmDouble* basis, GaussTetra* gauss);
+- void GetNodalFunctionsPressure(IssmDouble* basis, GaussTetra* gauss);
+- void GetNodalFunctionsTensor(IssmDouble* basis, GaussTetra* gauss);
+ void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss);
+ void GetNodalFunctionsDerivatives(IssmDouble* dbasis,IssmDouble* xyz_list, GaussTetra* gauss,int finiteelement);
+- void GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list,GaussTetra* gauss);
+- void GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list,GaussTetra* gauss);
+ void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss);
+ void GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,GaussTetra* gauss,int finiteelement);
+ void GetInputDerivativeValue(IssmDouble* p, IssmDouble* plist,IssmDouble* xyz_list, GaussTetra* gauss);
+@@ -47,5 +42,6 @@
+ int NumberofNodesPressure(void);
+ int VelocityInterpolation(void);
+ int PressureInterpolation(void);
++ int TensorInterpolation(void);
+ };
+ #endif
+Index: ../trunk-jpl/src/c/classes/Elements/Seg.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17874)
+@@ -104,6 +104,7 @@
+ void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){_error_("not implemented yet");};
+ void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");};
+ int VelocityInterpolation(void){_error_("not implemented yet");};
++ int TensorInterpolation(void){_error_("not implemented yet");};
+ void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");};
+ IssmDouble GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");};
+ void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype){_error_("not implemented yet");};
+Index: ../trunk-jpl/src/c/classes/Elements/Tetra.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17874)
+@@ -109,6 +109,7 @@
+ void ValueP1OnGauss(IssmDouble* pvalue,IssmDouble* values,Gauss* gauss){_error_("not implemented yet");};
+ void ValueP1DerivativesOnGauss(IssmDouble* dvalue,IssmDouble* values,IssmDouble* xyz_list,Gauss* gauss){_error_("not implemented yet");};
+ int VelocityInterpolation(void);
++ int TensorInterpolation(void);
+ void GetGroundedPart(int* point1,IssmDouble* fraction1, IssmDouble* fraction2,bool* mainlyfloating){_error_("not implemented yet");};
+ IssmDouble GetGroundedPortion(IssmDouble* xyz_list){_error_("not implemented yet");};
+ void GetInputValue(IssmDouble* pvalue,Node* node,int enumtype);
+Index: ../trunk-jpl/src/c/classes/Elements/TriaRef.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/TriaRef.cpp (revision 17873)
++++ ../trunk-jpl/src/c/classes/Elements/TriaRef.cpp (revision 17874)
+@@ -211,105 +211,10 @@
+ basis[5]=4.*gauss->coord1*gauss->coord2;
+ return;
+ default:
+- _error_("Element type "<element_type)<<" not supported yet");
++ _error_("Element type "<element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- this->element_type = P2Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = TaylorHoodEnum;
+- return;
+- case XTaylorHoodEnum:
+- this->element_type = P2Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = XTaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+-/*FUNCTION TriaRef::GetNodalFunctionsPressure{{{*/
+-void TriaRef::GetNodalFunctionsPressure(IssmDouble* basis,Gauss* gauss){
+- /*This routine returns the values of the nodal functions at the gaussian point.*/
+-
+- switch(this->element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = TaylorHoodEnum;
+- return;
+- case XTaylorHoodEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = XTaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+-/*FUNCTION TriaRef::GetNodalFunctionsTensor{{{*/
+-void TriaRef::GetNodalFunctionsTensor(IssmDouble* basis,Gauss* gauss){
+- /*This routine returns the values of the nodal functions at the gaussian point.*/
+-
+- switch(this->element_type){
+- case XTaylorHoodEnum:
+- this->element_type = P1DGEnum;
+- this->GetNodalFunctions(basis,gauss);
+- this->element_type = XTaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+ /*FUNCTION TriaRef::GetSegmentNodalFunctions{{{*/
+ void TriaRef::GetSegmentNodalFunctions(IssmDouble* basis,Gauss* gauss,int index1,int index2){
+ /*This routine returns the values of the nodal functions at the gaussian point.*/
+@@ -388,73 +293,6 @@
+
+ }
+ /*}}}*/
+-/*FUNCTION TriaRef::GetNodalFunctionsDerivativesPressure{{{*/
+-void TriaRef::GetNodalFunctionsDerivativesPressure(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
+- switch(this->element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = TaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+-/*FUNCTION TriaRef::GetNodalFunctionsDerivativesVelocity{{{*/
+-void TriaRef::GetNodalFunctionsDerivativesVelocity(IssmDouble* dbasis,IssmDouble* xyz_list, Gauss* gauss){
+- switch(this->element_type){
+- case P1P1Enum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1Enum;
+- return;
+- case P1P1GLSEnum:
+- this->element_type = P1Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = P1P1GLSEnum;
+- return;
+- case MINIcondensedEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIcondensedEnum;
+- return;
+- case MINIEnum:
+- this->element_type = P1bubbleEnum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = MINIEnum;
+- return;
+- case TaylorHoodEnum:
+- case XTaylorHoodEnum:
+- this->element_type = P2Enum;
+- this->GetNodalFunctionsDerivatives(dbasis,xyz_list,gauss);
+- this->element_type = XTaylorHoodEnum;
+- return;
+- default:
+- _error_("Element type "<element_type)<<" not supported yet");
+- }
+-}
+-/*}}}*/
+ /*FUNCTION TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){{{*/
+ void TriaRef::GetNodalFunctionsDerivativesReference(IssmDouble* dbasis,Gauss* gauss){
+ /*This routine returns the values of the nodal functions derivatives (with respect to the
+@@ -527,7 +365,7 @@
+ dbasis[NUMNODESP2*1+5] = -2.*SQRT3/3.*(gauss->coord1+gauss->coord2);
+ return;
+ default:
+- _error_("Element type "<element_type)<<" not supported yet");
++ _error_("Element type "<element_type){
++ case XTaylorHoodEnum: return P1DGEnum;
++ default: _error_("Element type "<element_type)<<" not supported yet");
++ }
++}
++/*}}}*/
+ /*FUNCTION TriaRef::NodeOnEdgeIndices{{{*/
+ void TriaRef::NodeOnEdgeIndices(int* pnumindices,int** pindices,int index,int finiteelement){
+
Index: /issm/oecreview/Archive/17802-17983/ISSM-17874-17875.diff
===================================================================
--- /issm/oecreview/Archive/17802-17983/ISSM-17874-17875.diff (revision 17986)
+++ /issm/oecreview/Archive/17802-17983/ISSM-17874-17875.diff (revision 17986)
@@ -0,0 +1,223 @@
+Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17874)
++++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17875)
+@@ -1710,12 +1710,12 @@
+ /*}}}*/
+ /*FUNCTION Tria::NumberofNodesPressure{{{*/
+ int Tria::NumberofNodesPressure(void){
+- return TriaRef::NumberofNodesPressure();
++ return TriaRef::NumberofNodes(this->PressureInterpolation());
+ }
+ /*}}}*/
+ /*FUNCTION Tria::NumberofNodesVelocity{{{*/
+ int Tria::NumberofNodesVelocity(void){
+- return TriaRef::NumberofNodesVelocity();
++ return TriaRef::NumberofNodes(this->VelocityInterpolation());
+ }
+ /*}}}*/
+ /*FUNCTION Tria::PositiveDegreeDay{{{*/
+Index: ../trunk-jpl/src/c/classes/Elements/TriaRef.h
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/TriaRef.h (revision 17874)
++++ ../trunk-jpl/src/c/classes/Elements/TriaRef.h (revision 17875)
+@@ -42,8 +42,6 @@
+ void NodeOnEdgeIndices(int* pnumindices,int** pindices,int index,int finiteelement);
+ int NumberofNodes(void);
+ int NumberofNodes(int finiteelement);
+- int NumberofNodesVelocity(void);
+- int NumberofNodesPressure(void);
+ int VelocityInterpolation(void);
+ int PressureInterpolation(void);
+ int TensorInterpolation(void);
+Index: ../trunk-jpl/src/c/classes/Elements/PentaRef.cpp
+===================================================================
+--- ../trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 17874)
++++ ../trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 17875)
+@@ -1095,38 +1095,6 @@
+ return -1;
+ }
+ /*}}}*/
+-/*FUNCTION PentaRef::NumberofNodesPressure{{{*/
+-int PentaRef::NumberofNodesPressure(void){
+-
+- switch(this->element_type){
+- case P1P1Enum: return NUMNODESP1;
+- case P1P1GLSEnum: return NUMNODESP1;
+- case MINIcondensedEnum: return NUMNODESP1;
+- case MINIEnum: return NUMNODESP1;
+- case TaylorHoodEnum: return NUMNODESP1;
+- case OneLayerP4zEnum: return NUMNODESP1;
+- default: _error_("Element type "<element_type)<<" not supported yet");
+- }
+-
+- return -1;
+-}
+-/*}}}*/
+-/*FUNCTION PentaRef::NumberofNodesVelocity{{{*/
+-int PentaRef::NumberofNodesVelocity(void){
+-
+- switch(this->element_type){
+- case P1P1Enum: return NUMNODESP1;
+- case P1P1GLSEnum: return NUMNODESP1;
+- case MINIcondensedEnum: return NUMNODESP1b;
+- case MINIEnum: return NUMNODESP1b;
+- case TaylorHoodEnum: return NUMNODESP2;
+- case OneLayerP4zEnum: return NUMNODESP2xP4;
+- default: _error_("Element type "<