Index: /issm/trunk-jpl/configure.ac =================================================================== --- /issm/trunk-jpl/configure.ac (revision 23107) +++ /issm/trunk-jpl/configure.ac (revision 23108) @@ -3,6 +3,6 @@ #AUTOCONF AC_INIT([Ice Sheet System Model (ISSM)],[4.14],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure -AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config -AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4 +AC_CONFIG_AUX_DIR([./aux-config]) #Put config files in aux-config +AC_CONFIG_MACRO_DIR([m4]) #m4 macros are located in m4 m4_include([m4/issm_options.m4]) @@ -25,5 +25,5 @@ #Initialize automake and declare foreign so that we don't need a ChangeLog, INSTALL, etc AM_INIT_AUTOMAKE([foreign]) -AC_CONFIG_HEADERS([./config.h]) #Config file must be config.h +AC_CONFIG_HEADERS([./config.h]) #Config file must be config.h AM_SILENT_RULES([yes]) #Do not show compilation command by default AM_PROG_AR Index: /issm/trunk-jpl/etc/environment.sh =================================================================== --- /issm/trunk-jpl/etc/environment.sh (revision 23107) +++ /issm/trunk-jpl/etc/environment.sh (revision 23108) @@ -235,10 +235,10 @@ PYTHON_DIR="$ISSM_DIR/externalpackages/python/install" -#if [ -d "$PYTHON_DIR" ]; then - #export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/lib" - #pathprepend "$PYTHON_DIR/bin" - #libpathprepend "$PYTHON_DIR/lib" - #libpathprepend "$ISSM_DIR/lib" -#fi +if [ -d "$PYTHON_DIR" ]; then + export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/lib" + pathprepend "$PYTHON_DIR/bin" + libpathprepend "$PYTHON_DIR/lib" + libpathprepend "$ISSM_DIR/lib" +fi MODELE_DIR="$ISSM_DIR/externalpackages/modelE/install" Index: /issm/trunk-jpl/examples/Inversion/runme.m =================================================================== --- /issm/trunk-jpl/examples/Inversion/runme.m (revision 23107) +++ /issm/trunk-jpl/examples/Inversion/runme.m (revision 23108) @@ -1,3 +1,3 @@ -step=1:4; +step=1; if any(step==1) %Generate observations Index: /issm/trunk-jpl/externalpackages/dem/dem.m =================================================================== --- /issm/trunk-jpl/externalpackages/dem/dem.m (revision 23107) +++ /issm/trunk-jpl/externalpackages/dem/dem.m (revision 23108) @@ -119,6 +119,5 @@ decim = 0; -%novalue_color = [0,0,0]; -novalue_color = [1,1,1]; +novalue_color = [0,0,0]; if ~isnumeric(x) | ~isnumeric(y) | ~isnumeric(z) Index: /issm/trunk-jpl/m4/analyses.m4 =================================================================== --- /issm/trunk-jpl/m4/analyses.m4 (revision 23107) +++ /issm/trunk-jpl/m4/analyses.m4 (revision 23108) @@ -11,520 +11,964 @@ dnl with-AdjointBalancethickness2{{{ + AC_ARG_WITH([AdjointBalancethickness2], + AS_HELP_STRING([--with-AdjointBalancethickness2 = YES], [compile with AdjointBalancethickness2 capabilities (default is yes)]), + [ADJOINTBALANCETHICKNESS2=$withval],[ADJOINTBALANCETHICKNESS2=yes]) + AC_MSG_CHECKING(for AdjointBalancethickness2 capability compilation) + HAVE_ADJOINTBALANCETHICKNESS2=no + if test "x$ADJOINTBALANCETHICKNESS2" = "xyes"; then + HAVE_ADJOINTBALANCETHICKNESS2=yes + AC_DEFINE([_HAVE_ADJOINTBALANCETHICKNESS2_],[1],[with AdjointBalancethickness2 capability]) -fi + +fi + AM_CONDITIONAL([ADJOINTBALANCETHICKNESS2], [test x$HAVE_ADJOINTBALANCETHICKNESS2 = xyes]) + AC_MSG_RESULT($HAVE_ADJOINTBALANCETHICKNESS2) + dnl }}} 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 AdjointBalancethickness capability]) -fi + +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 AdjointHoriz capability]) -fi + +fi + AM_CONDITIONAL([ADJOINTHORIZ], [test x$HAVE_ADJOINTHORIZ = xyes]) + AC_MSG_RESULT($HAVE_ADJOINTHORIZ) + 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 Balancethickness2 capability]) -fi + +fi + AM_CONDITIONAL([BALANCETHICKNESS2], [test x$HAVE_BALANCETHICKNESS2 = xyes]) + AC_MSG_RESULT($HAVE_BALANCETHICKNESS2) + 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 Balancethickness capability]) -fi + +fi + AM_CONDITIONAL([BALANCETHICKNESS], [test x$HAVE_BALANCETHICKNESS = xyes]) + AC_MSG_RESULT($HAVE_BALANCETHICKNESS) + 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 BalancethicknessSoft capability]) -fi + +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 Balancevelocity capability]) -fi + +fi + AM_CONDITIONAL([BALANCEVELOCITY], [test x$HAVE_BALANCEVELOCITY = xyes]) + AC_MSG_RESULT($HAVE_BALANCEVELOCITY) + 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 DamageEvolution capability]) -fi + +fi + AM_CONDITIONAL([DAMAGEEVOLUTION], [test x$HAVE_DAMAGEEVOLUTION = xyes]) + AC_MSG_RESULT($HAVE_DAMAGEEVOLUTION) + 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 DepthAverage capability]) -fi + +fi + AM_CONDITIONAL([DEPTHAVERAGE], [test x$HAVE_DEPTHAVERAGE = xyes]) + AC_MSG_RESULT($HAVE_DEPTHAVERAGE) + 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 Enthalpy capability]) -fi + +fi + AM_CONDITIONAL([ENTHALPY], [test x$HAVE_ENTHALPY = xyes]) + AC_MSG_RESULT($HAVE_ENTHALPY) + dnl }}} dnl with-Esa{{{ + AC_ARG_WITH([Esa], + AS_HELP_STRING([--with-Esa = YES], [compile with Esa capabilities (default is yes)]), + [ESA=$withval],[ESA=yes]) + AC_MSG_CHECKING(for Esa capability compilation) + HAVE_ESA=no + if test "x$ESA" = "xyes"; then + HAVE_ESA=yes + AC_DEFINE([_HAVE_ESA_],[1],[with Esa capability]) -fi + +fi + AM_CONDITIONAL([ESA], [test x$HAVE_ESA = xyes]) + AC_MSG_RESULT($HAVE_ESA) + 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 Extrapolation capability]) -fi + +fi + AM_CONDITIONAL([EXTRAPOLATION], [test x$HAVE_EXTRAPOLATION = xyes]) + AC_MSG_RESULT($HAVE_EXTRAPOLATION) + 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 ExtrudeFromBase capability]) -fi + +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 ExtrudeFromTop capability]) -fi + +fi + AM_CONDITIONAL([EXTRUDEFROMTOP], [test x$HAVE_EXTRUDEFROMTOP = xyes]) + AC_MSG_RESULT($HAVE_EXTRUDEFROMTOP) + 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 FreeSurfaceBase capability]) -fi + +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 FreeSurfaceTop capability]) -fi + +fi + AM_CONDITIONAL([FREESURFACETOP], [test x$HAVE_FREESURFACETOP = xyes]) + AC_MSG_RESULT($HAVE_FREESURFACETOP) + dnl }}} dnl with-GLheightadvection{{{ + AC_ARG_WITH([GLheightadvection], + AS_HELP_STRING([--with-GLheightadvection = YES], [compile with GLheightadvection capabilities (default is yes)]), + [GLHEIGHTADVECTION=$withval],[GLHEIGHTADVECTION=yes]) + AC_MSG_CHECKING(for GLheightadvection capability compilation) + HAVE_GLHEIGHTADVECTION=no + if test "x$GLHEIGHTADVECTION" = "xyes"; then + HAVE_GLHEIGHTADVECTION=yes + AC_DEFINE([_HAVE_GLHEIGHTADVECTION_],[1],[with GLheightadvection capability]) -fi + +fi + AM_CONDITIONAL([GLHEIGHTADVECTION], [test x$HAVE_GLHEIGHTADVECTION = xyes]) + AC_MSG_RESULT($HAVE_GLHEIGHTADVECTION) + dnl }}} dnl with-GiaIvins{{{ + AC_ARG_WITH([GiaIvins], + AS_HELP_STRING([--with-GiaIvins = YES], [compile with GiaIvins capabilities (default is yes)]), + [GIAIVINS=$withval],[GIAIVINS=yes]) + AC_MSG_CHECKING(for GiaIvins capability compilation) + HAVE_GIAIVINS=no + if test "x$GIAIVINS" = "xyes"; then + HAVE_GIAIVINS=yes + AC_DEFINE([_HAVE_GIAIVINS_],[1],[with GiaIvins capability]) -fi + +fi + AM_CONDITIONAL([GIAIVINS], [test x$HAVE_GIAIVINS = xyes]) + AC_MSG_RESULT($HAVE_GIAIVINS) + 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 HydrologyDCEfficient capability]) -fi + +fi + AM_CONDITIONAL([HYDROLOGYDCEFFICIENT], [test x$HAVE_HYDROLOGYDCEFFICIENT = xyes]) + AC_MSG_RESULT($HAVE_HYDROLOGYDCEFFICIENT) + 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 HydrologyDCInefficient capability]) -fi + +fi + AM_CONDITIONAL([HYDROLOGYDCINEFFICIENT], [test x$HAVE_HYDROLOGYDCINEFFICIENT = xyes]) + AC_MSG_RESULT($HAVE_HYDROLOGYDCINEFFICIENT) + 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 HydrologyShreve capability]) -fi + +fi + AM_CONDITIONAL([HYDROLOGYSHREVE], [test x$HAVE_HYDROLOGYSHREVE = xyes]) + AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE) + dnl }}} dnl with-HydrologyShakti{{{ + AC_ARG_WITH([HydrologyShakti], + AS_HELP_STRING([--with-HydrologyShakti = YES], [compile with HydrologyShakti capabilities (default is yes)]), + [HYDROLOGYSHAKTI=$withval],[HYDROLOGYSHAKTI=yes]) + AC_MSG_CHECKING(for HydrologyShakti capability compilation) + HAVE_HYDROLOGYSHAKTI=no + if test "x$HYDROLOGYSHAKTI" = "xyes"; then + HAVE_HYDROLOGYSHAKTI=yes + AC_DEFINE([_HAVE_HYDROLOGYSHAKTI_],[1],[with HydrologyShakti capability]) -fi + +fi + AM_CONDITIONAL([HYDROLOGYSHAKTI], [test x$HAVE_HYDROLOGYSHAKTI = xyes]) + AC_MSG_RESULT($HAVE_HYDROLOGYSHAKTI) + dnl }}} dnl with-HydrologyPism{{{ + AC_ARG_WITH([HydrologyPism], + AS_HELP_STRING([--with-HydrologyPism = YES], [compile with HydrologyPism capabilities (default is yes)]), + [HYDROLOGYPISM=$withval],[HYDROLOGYPISM=yes]) + AC_MSG_CHECKING(for HydrologyPism capability compilation) + HAVE_HYDROLOGYPISM=no + if test "x$HYDROLOGYPISM" = "xyes"; then + HAVE_HYDROLOGYPISM=yes + AC_DEFINE([_HAVE_HYDROLOGYPISM_],[1],[with HydrologyPism capability]) -fi + +fi + AM_CONDITIONAL([HYDROLOGYPISM], [test x$HAVE_HYDROLOGYPISM = xyes]) + AC_MSG_RESULT($HAVE_HYDROLOGYPISM) + 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 L2ProjectionBase capability]) -fi + +fi + AM_CONDITIONAL([L2PROJECTIONBASE], [test x$HAVE_L2PROJECTIONBASE = xyes]) + AC_MSG_RESULT($HAVE_L2PROJECTIONBASE) + 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 L2ProjectionEPL capability]) -fi + +fi + AM_CONDITIONAL([L2PROJECTIONEPL], [test x$HAVE_L2PROJECTIONEPL = xyes]) + AC_MSG_RESULT($HAVE_L2PROJECTIONEPL) + 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 Levelset capability]) -fi + +fi + AM_CONDITIONAL([LEVELSET], [test x$HAVE_LEVELSET = xyes]) + AC_MSG_RESULT($HAVE_LEVELSET) + dnl }}} dnl with-Love{{{ + AC_ARG_WITH([Love], + AS_HELP_STRING([--with-Love = YES], [compile with Love capabilities (default is yes)]), + [LOVE=$withval],[LOVE=yes]) + AC_MSG_CHECKING(for Love capability compilation) + HAVE_LOVE=no + if test "x$LOVE" = "xyes"; then + HAVE_LOVE=yes + AC_DEFINE([_HAVE_LOVE_],[1],[with Love capability]) -fi + +fi + AM_CONDITIONAL([LOVE], [test x$HAVE_LOVE = xyes]) + AC_MSG_RESULT($HAVE_LOVE) + 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 Masstransport capability]) -fi + +fi + AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes]) + AC_MSG_RESULT($HAVE_MASSTRANSPORT) + 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 Melting capability]) -fi + +fi + AM_CONDITIONAL([MELTING], [test x$HAVE_MELTING = xyes]) + AC_MSG_RESULT($HAVE_MELTING) + dnl }}} dnl with-Sealevelrise{{{ + AC_ARG_WITH([Sealevelrise], + AS_HELP_STRING([--with-Sealevelrise = YES], [compile with Sealevelrise capabilities (default is yes)]), + [SEALEVELRISE=$withval],[SEALEVELRISE=yes]) + AC_MSG_CHECKING(for Sealevelrise capability compilation) + HAVE_SEALEVELRISE=no + if test "x$SEALEVELRISE" = "xyes"; then + HAVE_SEALEVELRISE=yes + AC_DEFINE([_HAVE_SEALEVELRISE_],[1],[with Sealevelrise capability]) -fi + +fi + AM_CONDITIONAL([SEALEVELRISE], [test x$HAVE_SEALEVELRISE = xyes]) + AC_MSG_RESULT($HAVE_SEALEVELRISE) + dnl }}} dnl with-Smb{{{ + AC_ARG_WITH([Smb], + AS_HELP_STRING([--with-Smb = YES], [compile with Smb capabilities (default is yes)]), + [SMB=$withval],[SMB=yes]) + AC_MSG_CHECKING(for Smb capability compilation) + HAVE_SMB=no + if test "x$SMB" = "xyes"; then + HAVE_SMB=yes + AC_DEFINE([_HAVE_SMB_],[1],[with Smb capability]) -fi + +fi + AM_CONDITIONAL([SMB], [test x$HAVE_SMB = xyes]) + AC_MSG_RESULT($HAVE_SMB) + dnl }}} dnl with-Smooth{{{ + AC_ARG_WITH([Smooth], + AS_HELP_STRING([--with-Smooth = YES], [compile with Smooth capabilities (default is yes)]), + [SMOOTH=$withval],[SMOOTH=yes]) + AC_MSG_CHECKING(for Smooth capability compilation) + HAVE_SMOOTH=no + if test "x$SMOOTH" = "xyes"; then + HAVE_SMOOTH=yes + AC_DEFINE([_HAVE_SMOOTH_],[1],[with Smooth capability]) -fi + +fi + AM_CONDITIONAL([SMOOTH], [test x$HAVE_SMOOTH = xyes]) + AC_MSG_RESULT($HAVE_SMOOTH) + 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 Stressbalance capability]) -fi + +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 StressbalanceSIA capability]) -fi + +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 StressbalanceVertical capability]) -fi + +fi + AM_CONDITIONAL([STRESSBALANCEVERTICAL], [test x$HAVE_STRESSBALANCEVERTICAL = xyes]) + AC_MSG_RESULT($HAVE_STRESSBALANCEVERTICAL) + 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 Thermal capability]) -fi + +fi + AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes]) + AC_MSG_RESULT($HAVE_THERMAL) + dnl }}} dnl with-UzawaPressure{{{ + AC_ARG_WITH([UzawaPressure], + AS_HELP_STRING([--with-UzawaPressure = YES], [compile with UzawaPressure capabilities (default is yes)]), + [UZAWAPRESSURE=$withval],[UZAWAPRESSURE=yes]) + AC_MSG_CHECKING(for UzawaPressure capability compilation) + HAVE_UZAWAPRESSURE=no + if test "x$UZAWAPRESSURE" = "xyes"; then + HAVE_UZAWAPRESSURE=yes + AC_DEFINE([_HAVE_UZAWAPRESSURE_],[1],[with UzawaPressure capability]) -fi + +fi + AM_CONDITIONAL([UZAWAPRESSURE], [test x$HAVE_UZAWAPRESSURE = xyes]) + AC_MSG_RESULT($HAVE_UZAWAPRESSURE) + dnl }}} Index: /issm/trunk-jpl/scripts/cppcheck.sh =================================================================== --- /issm/trunk-jpl/scripts/cppcheck.sh (revision 23107) +++ /issm/trunk-jpl/scripts/cppcheck.sh (revision 23108) @@ -2,6 +2,6 @@ #comprehensive check, except unusedFunction -#cppcheck -j 32 --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ -D_HAVE_JAVASCRIPT_ --enable=warning --enable=style --enable=performance --enable=portability --enable=information --enable=missingInclude $ISSM_DIR/src/c 2> CPPCHECK.err +#cppcheck -j 32 --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ --enable=all $ISSM_DIR/src/c 2> CPPCHECK.err #unused function only (slow) -cppcheck --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ -D_HAVE_JAVASCRIPT_ --enable=unusedFunction $ISSM_DIR/src 2> CPPCHECK.err +cppcheck --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ --enable=unusedFunction $ISSM_DIR/src 2> CPPCHECK.err Index: /issm/trunk-jpl/src/m/classes/clusters/generic.m =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/generic.m (revision 23107) +++ /issm/trunk-jpl/src/m/classes/clusters/generic.m (revision 23108) @@ -111,8 +111,8 @@ else %Add --gen-suppressions=all to get suppression lines - %fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib); + fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib); if ismac, if IssmConfig('_HAVE_MPI_'), - fprintf(fid,'mpiexec -np %i %s --leak-check=full --gen-suppressions=all --error-limit=no --dsymutil=yes --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',... + fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --dsymutil=yes --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',... cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname); else @@ -122,5 +122,5 @@ else if IssmConfig('_HAVE_MPI_'), - fprintf(fid,'mpiexec -np %i %s --leak-check=full --gen-suppressions=all --error-limit=no --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',... + fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',... cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname); else Index: /issm/trunk-jpl/src/m/classes/clusters/pfe.m =================================================================== --- /issm/trunk-jpl/src/m/classes/clusters/pfe.m (revision 23107) +++ /issm/trunk-jpl/src/m/classes/clusters/pfe.m (revision 23108) @@ -11,5 +11,5 @@ name = 'pfe' login = ''; - modules = {'comp-intel/2018.0.128' 'mpi-sgi/mpt'}; + modules = {'comp-intel/2016.2.181' 'mpi-sgi/mpt'}; numnodes = 20; cpuspernode = 8; @@ -163,10 +163,8 @@ fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]); fprintf(fid,'. /usr/share/modules/init/bash\n\n'); - for i=1:numel(cluster.modules), - fprintf(fid,['module load ' cluster.modules{i} '\n']); - end + fprintf(fid,'module load comp-intel/2016.2.181\n'); + fprintf(fid,'module load mpi-sgi/mpt\n'); fprintf(fid,'export PATH="$PATH:."\n\n'); fprintf(fid,'export MPI_GROUP_MAX=64\n\n'); - fprintf(fid,'export MKL_NUM_THREADS=2\n\n'); fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n'); %FIXME @@ -228,7 +226,6 @@ fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]); fprintf(fid,'. /usr/share/modules/init/bash\n\n'); - for i=1:numel(cluster.modules), - fprintf(fid,['module load ' cluster.modules{i} '\n']); - end + fprintf(fid,'module load comp-intel/2016.2.181\n'); + fprintf(fid,'module load mpi-sgi/mpt\n'); fprintf(fid,'export PATH="$PATH:."\n\n'); fprintf(fid,'export MPI_GROUP_MAX=64\n\n'); @@ -356,7 +353,4 @@ fprintf(fid,'#PBS -e %s.errlog \n\n',modelname); fprintf(fid,'. /usr/share/modules/init/bash\n\n'); - %for i=1:numel(cluster.modules), - % fprintf(fid,['module load ' cluster.modules{i} '\n']); - %end fprintf(fid,'module load comp-intel/2016.2.181\n'); fprintf(fid,'module load netcdf/4.4.1.1_mpt\n'); Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m =================================================================== --- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 23107) +++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 23108) @@ -71,5 +71,5 @@ analyses={'EsaAnalysis'}; elseif strcmp(solutiontype,'TransientSolution') - analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologyShaktiAnalysis','HydrologyPismAnalysis'}; + analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologyShaktiAnalysis'}; elseif strcmp(solutiontype,'SealevelriseSolution') analyses={'SealevelriseAnalysis'}; Index: /issm/trunk-jpl/src/m/exp/expread.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expread.m (revision 23107) +++ /issm/trunk-jpl/src/m/exp/expread.m (revision 23108) @@ -28,5 +28,4 @@ %initialize number of profile count=0; -Struct = struct(); %open file Index: /issm/trunk-jpl/src/m/exp/exptool.m =================================================================== --- /issm/trunk-jpl/src/m/exp/exptool.m (revision 23107) +++ /issm/trunk-jpl/src/m/exp/exptool.m (revision 23108) @@ -105,5 +105,4 @@ P=get(gcf,'position'); Fp=get(gca,'position'); - h = findobj(gcf,'type','axes'); F=getframe(gca); F=F.cdata; @@ -115,9 +114,6 @@ y_m=linspace(ylim(2),ylim(1),size(F,1)); %getframe reverse axis... %plot the data in another figure - f2= figure; - s = copyobj(h,f2); - set(gcf,'position',P); - imagesc(x_m,y_m,F); - set(gca,'Ydir','normal','Position',Fp,'Xlim',xlim,'Ylim',ylim); + figure; set(gcf,'position',P); + imagesc(x_m,y_m,F); set(gca,'Ydir','normal','Position',Fp,'Xlim',xlim,'Ylim',ylim); prevplot=1; prevplot2=1; Index: /issm/trunk-jpl/src/m/inversions/marshallcostfunctions.m =================================================================== --- /issm/trunk-jpl/src/m/inversions/marshallcostfunctions.m (revision 23107) +++ /issm/trunk-jpl/src/m/inversions/marshallcostfunctions.m (revision 23108) @@ -15,4 +15,2 @@ pos=find(cost_functions==510); data(pos) = {'ThicknessPositive'}; pos=find(cost_functions==601); data(pos) = {'SurfaceAbsMisfit'}; - pos=find(cost_functions==602); data(pos) = {'OmegaAbsGradient'}; - pos=find(cost_functions==603); data(pos) = {'EtaDiff'}; Index: /issm/trunk-jpl/src/m/inversions/supportedcontrols.m =================================================================== --- /issm/trunk-jpl/src/m/inversions/supportedcontrols.m (revision 23107) +++ /issm/trunk-jpl/src/m/inversions/supportedcontrols.m (revision 23108) @@ -2,5 +2,4 @@ list = {... - 'BalancethicknessSpcthickness',... 'BalancethicknessThickeningRate',... 'FrictionCoefficient',... Index: /issm/trunk-jpl/src/m/plot/manualcb.m =================================================================== --- /issm/trunk-jpl/src/m/plot/manualcb.m (revision 23107) +++ /issm/trunk-jpl/src/m/plot/manualcb.m (revision 23108) @@ -78,5 +78,5 @@ hold on numcolors=size(cmap,1); -if 0, +if 1, %disappears somtimes if strcmpi(getfieldvalue(options,'orientation','vertical'),'vertical'), Index: /issm/trunk-jpl/src/m/plot/scaleruler.m =================================================================== --- /issm/trunk-jpl/src/m/plot/scaleruler.m (revision 23107) +++ /issm/trunk-jpl/src/m/plot/scaleruler.m (revision 23108) @@ -11,5 +11,4 @@ fontsize = getfieldvalue(options,'scaleruler_fontsize',16); unitscale = getfieldvalue(options,'unit',1.); -fontcolor = 'w'; %Go through structure and fill missing arguments Index: /issm/trunk-jpl/src/m/plot/subplotmodel.m =================================================================== --- /issm/trunk-jpl/src/m/plot/subplotmodel.m (revision 23107) +++ /issm/trunk-jpl/src/m/plot/subplotmodel.m (revision 23108) @@ -30,5 +30,5 @@ if(((i-1)*ncols+j)==num) ha = axes('Units','normalized', ... - 'Position',[xmin ymin width height]);%,'XTickLabel','','YTickLabel','','Visible','off'); + 'Position',[xmin ymin width height],'XTickLabel','','YTickLabel','','Visible','off'); return end Index: /issm/trunk-jpl/src/m/solvers/mumpsoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/mumpsoptions.m (revision 23107) +++ /issm/trunk-jpl/src/m/solvers/mumpsoptions.m (revision 23108) @@ -27,10 +27,8 @@ mumps.pc_factor_mat_solver_package=getfieldvalue(options,'pc_factor_mat_solver_package','mumps'); mumps.mat_mumps_icntl_14=getfieldvalue(options,'mat_mumps_icntl_14',120); - - %Seems like this one is not needed anymore mumps.pc_factor_shift_positive_definite=getfieldvalue(options,'pc_factor_shift_positive_definite','true'); %These 2 lines make raijin break (ptwgts error during solver with PETSc 3.3) - %mumps.mat_mumps_icntl_28=2; %1=serial, 2=parallel - %mumps.mat_mumps_icntl_29=2; %parallel ordering 1 = ptscotch, 2 = parmetis + mumps.mat_mumps_icntl_28=2; %1=serial, 2=parallel + mumps.mat_mumps_icntl_29=2; %parallel ordering 1 = ptscotch, 2 = parmetis end Index: /issm/trunk-jpl/test/NightlyRun/test201.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test201.m (revision 23107) +++ /issm/trunk-jpl/test/NightlyRun/test201.m (revision 23108) @@ -1,48 +1,9 @@ %Test Name: SquareShelfStressSSA2d -if 0 -md=triangle(model(),'../Exp/Square.exp',10000.); +md=triangle(model(),'../Exp/Square.exp',150000.); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setflowequation(md,'SSA','all'); -md.cluster=generic('name',oshostname(),'np',5); +md.cluster=generic('name',oshostname(),'np',3); md=solve(md,'Stressbalance'); -else - clf - md=bamg(model(),'domain','../Exp/Square.exp','hmax',10000.); - newdomain = '../Exp/Square_temp.exp'; - resolution = 10000; - distance=abs(ExpToLevelSet(md.mesh.x,md.mesh.y,newdomain)); - pos=find(ContourToNodes(md.mesh.x,md.mesh.y,newdomain,2)); - distance(pos) = -distance(pos); - pos=find(distance<-resolution); - %md2=bamg(model(),'domain','../Exp/Square_temp.exp','hmax',10000.,'RequiredVertices',[md.mesh.x(pos) md.mesh.y(pos) pos],'hmin',10000); - md2=bamg(model(),'domain','../Exp/Square_temp.exp','RequiredVertices',[md.mesh.x(pos) md.mesh.y(pos) pos],'hmax',resolution); - patch( 'Faces',[md.mesh.elements], 'Vertices', [md.mesh.x md.mesh.y],'FaceVertexCData',zeros(size(md.mesh.x)),'FaceColor','none','EdgeColor','k'); - hold on - patch( 'Faces',[md2.mesh.elements], 'Vertices', [md2.mesh.x md2.mesh.y],'FaceVertexCData',zeros(size(md2.mesh.x)),'FaceColor','none','EdgeColor','r'); - error('S'); - %md=bamg(model(),'domain','../Exp/Square_temp2.exp','hmax',10000.); - md=setmask(md,'all',''); - md=parameterize(md,'../Par/SquareShelf.par'); - md=setflowequation(md,'SSA','all'); - pos = find((md.mesh.x>10 & md.mesh.x10); - md.stressbalance.spcvx(pos)=NaN; - md.stressbalance.spcvy(pos)=NaN; - pos = find(md.mesh.vertexonboundary); - md.mask.ice_levelset(pos)=0; - %pos = find(md.mesh.y>10); - %md.stressbalance.spcvy(pos)=NaN; - md.cluster=generic('name',oshostname(),'np',5); - md=solve(md,'Stressbalance'); - - %Compute vm stress - md=mechanicalproperties(md,md.results.StressbalanceSolution.Vx,md.results.StressbalanceSolution.Vy); - lambda1 = max(md.results.strainrate.principalvalue1,0.); - lambda2 = max(md.results.strainrate.principalvalue2,0.); - epse_2 = 1./2. *(lambda1.*lambda1 + lambda2.*lambda2); - n=3; - vm=sqrt(3.) * md.materials.rheology_B(1).* epse_2.^(1./(2.*n)); - -end %Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test308.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test308.m (revision 23107) +++ /issm/trunk-jpl/test/NightlyRun/test308.m (revision 23108) @@ -1,5 +1,4 @@ %Test Name: SquareSheetConstrainedStressFS md=triangle(model(),'../Exp/Square.exp',180000.); -%md=bamg(model(),'domain','../Exp/Square.exp','hmax',180000.); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); @@ -7,6 +6,4 @@ md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); - -md.flowequation.fe_FS = 'TaylorHood'; md=solve(md,'Stressbalance'); Index: /issm/trunk-jpl/test/NightlyRun/test401.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test401.m (revision 23107) +++ /issm/trunk-jpl/test/NightlyRun/test401.m (revision 23108) @@ -1,4 +1,4 @@ %Test Name: SquareSheetShelfStressSSA2d -md=triangle(model(),'../Exp/Square.exp',50000.); +md=triangle(model(),'../Exp/Square.exp',150000.); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par');