Changeset 22951

Timestamp:

07/16/18 15:35:26 (7 years ago)

Author:

Eric.Larour

Message:

CHG: new enums for the new slr/esa capabilities.

Location:

issm/trunk-jpl

Files:

• m4/analyses.m4 (modified) (1 diff)
• src/c/shared/Enum/EnumDefinitions.h (modified) (4 diffs)
• src/c/shared/Enum/EnumToStringx.cpp (modified) (4 diffs)
• src/c/shared/Enum/StringToEnumx.cpp (modified) (18 diffs)

issm/trunk-jpl/m4/analyses.m4

@@ -11 +11 @@
 
 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-HydrologySommers{{{
+
 AC_ARG_WITH([HydrologySommers],
+
         AS_HELP_STRING([--with-HydrologySommers = YES], [compile with HydrologySommers capabilities (default is yes)]),
+
         [HYDROLOGYSOMMERS=$withval],[HYDROLOGYSOMMERS=yes])
+
 AC_MSG_CHECKING(for HydrologySommers capability compilation)
 
+
 HAVE_HYDROLOGYSOMMERS=no 
+
 if test "x$HYDROLOGYSOMMERS" = "xyes"; then
+
         HAVE_HYDROLOGYSOMMERS=yes
+
         AC_DEFINE([_HAVE_HYDROLOGYSOMMERS_],[1],[with HydrologySommers capability])
-fi
+
+fi
+
 AM_CONDITIONAL([HYDROLOGYSOMMERS], [test x$HAVE_HYDROLOGYSOMMERS = xyes])
+
 AC_MSG_RESULT($HAVE_HYDROLOGYSOMMERS)
+
 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 }}}
 

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -233 +233 @@
         RootPathEnum,
         SaveResultsEnum,
+        SealevelEustaticEnum,
+        SealevelEustaticOceanMaskEnum,
+        SealevelEustaticMaskEnum,
+        SealevelUEsaRateEnum,
+        SealevelNEsaRateEnum,
+        SealevelRSLRateEnum,
+        SealevelUEsaEnum, 
+        SealevelRSLEustaticRateEnum,
+        SealevelNEsaEnum, 
+        SealevelUGiaEnum,
+        SealevelNGiaEnum,
+        SealevelRSLEnum,
+        SealevelRSLEustaticEnum,
+        SealevelUNorthEsaEnum,
+        SealevelUEastEsaEnum,
+        SealevelNGiaRateEnum,
+        SealevelUGiaRateEnum,
         SealevelriseAbstolEnum,
         SealevelriseAngularVelocityEnum,
+        SealevelriseCumDeltathicknessEnum,
         SealevelriseElasticEnum,
         SealevelriseEquatorialMoiEnum,
         SealevelriseFluidLoveEnum,
         SealevelriseGElasticEnum,
+        SealevelriseGeodeticEnum,
+        SealevelriseGeodeticRunFrequencyEnum,
         SealevelriseHElasticEnum,
+        SealevelriseHorizEnum,
+        SealevelriseLoopIncrementEnum,
         SealevelriseMaxiterEnum,
         SealevelriseOceanAreaScalingEnum,
@@ -247 +269 @@
         SealevelriseRigidEnum,
         SealevelriseRotationEnum,
+        SealevelriseRunCountEnum,
         SealevelriseTidalLoveHEnum,
+        SealevelriseSpcthicknessEnum,
         SealevelriseTidalLoveKEnum,
         SealevelriseTransitionsEnum,
@@ -810 +834 @@
         LevelsetfunctionPicardEnum,
         LinearFloatingMeltRateEnum,
+        SpatialLinearFloatingMeltRateEnum,
         LliboutryDuvalEnum,
         LoadsEnum,
@@ -1023 +1048 @@
         SealevelAbsoluteEnum,
         SealevelEmotionEnum,
-        SealevelEustaticEnum,
         SealevelInertiaTensorXZEnum,
         SealevelInertiaTensorYZEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -241 +241 @@
                 case RootPathEnum : return "RootPath";
                 case SaveResultsEnum : return "SaveResults";
+                case SealevelEustaticEnum : return "SealevelEustatic";
+                case SealevelEustaticOceanMaskEnum : return "SealevelEustaticOceanMask";
+                case SealevelEustaticMaskEnum : return "SealevelEustaticMask";
+                case SealevelUEsaRateEnum : return "SealevelUEsaRate";
+                case SealevelNEsaRateEnum : return "SealevelNEsaRate";
+                case SealevelRSLRateEnum : return "SealevelRSLRate";
+                case SealevelUEsaEnum : return "SealevelUEsa";
+                case SealevelRSLEustaticRateEnum : return "SealevelRSLEustaticRate";
+                case SealevelNEsaEnum : return "SealevelNEsa";
+                case SealevelUGiaEnum : return "SealevelUGia";
+                case SealevelNGiaEnum : return "SealevelNGia";
+                case SealevelRSLEnum : return "SealevelRSL";
+                case SealevelRSLEustaticEnum : return "SealevelRSLEustatic";
+                case SealevelUNorthEsaEnum : return "SealevelUNorthEsa";
+                case SealevelUEastEsaEnum : return "SealevelUEastEsa";
+                case SealevelNGiaRateEnum : return "SealevelNGiaRate";
+                case SealevelUGiaRateEnum : return "SealevelUGiaRate";
                 case SealevelriseAbstolEnum : return "SealevelriseAbstol";
                 case SealevelriseAngularVelocityEnum : return "SealevelriseAngularVelocity";
+                case SealevelriseCumDeltathicknessEnum : return "SealevelriseCumDeltathickness";
                 case SealevelriseElasticEnum : return "SealevelriseElastic";
                 case SealevelriseEquatorialMoiEnum : return "SealevelriseEquatorialMoi";
                 case SealevelriseFluidLoveEnum : return "SealevelriseFluidLove";
                 case SealevelriseGElasticEnum : return "SealevelriseGElastic";
+                case SealevelriseGeodeticEnum : return "SealevelriseGeodetic";
+                case SealevelriseGeodeticRunFrequencyEnum : return "SealevelriseGeodeticRunFrequency";
                 case SealevelriseHElasticEnum : return "SealevelriseHElastic";
+                case SealevelriseHorizEnum : return "SealevelriseHoriz";
+                case SealevelriseLoopIncrementEnum : return "SealevelriseLoopIncrement";
                 case SealevelriseMaxiterEnum : return "SealevelriseMaxiter";
                 case SealevelriseOceanAreaScalingEnum : return "SealevelriseOceanAreaScaling";
@@ -255 +277 @@
                 case SealevelriseRigidEnum : return "SealevelriseRigid";
                 case SealevelriseRotationEnum : return "SealevelriseRotation";
+                case SealevelriseRunCountEnum : return "SealevelriseRunCount";
                 case SealevelriseTidalLoveHEnum : return "SealevelriseTidalLoveH";
+                case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness";
                 case SealevelriseTidalLoveKEnum : return "SealevelriseTidalLoveK";
                 case SealevelriseTransitionsEnum : return "SealevelriseTransitions";
@@ -814 +838 @@
                 case LevelsetfunctionPicardEnum : return "LevelsetfunctionPicard";
                 case LinearFloatingMeltRateEnum : return "LinearFloatingMeltRate";
+                case SpatialLinearFloatingMeltRateEnum : return "SpatialLinearFloatingMeltRate";
                 case LliboutryDuvalEnum : return "LliboutryDuval";
                 case LoadsEnum : return "Loads";
@@ -1027 +1052 @@
                 case SealevelAbsoluteEnum : return "SealevelAbsolute";
                 case SealevelEmotionEnum : return "SealevelEmotion";
-                case SealevelEustaticEnum : return "SealevelEustatic";
                 case SealevelInertiaTensorXZEnum : return "SealevelInertiaTensorXZ";
                 case SealevelInertiaTensorYZEnum : return "SealevelInertiaTensorYZ";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -244 +244 @@
               else if (strcmp(name,"RootPath")==0) return RootPathEnum;
               else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
+              else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
+              else if (strcmp(name,"SealevelEustaticOceanMask")==0) return SealevelEustaticOceanMaskEnum;
+              else if (strcmp(name,"SealevelEustaticMask")==0) return SealevelEustaticMaskEnum;
+              else if (strcmp(name,"SealevelUEsaRate")==0) return SealevelUEsaRateEnum;
+              else if (strcmp(name,"SealevelNEsaRate")==0) return SealevelNEsaRateEnum;
+              else if (strcmp(name,"SealevelRSLRate")==0) return SealevelRSLRateEnum;
+              else if (strcmp(name,"SealevelUEsa")==0) return SealevelUEsaEnum;
+              else if (strcmp(name,"SealevelRSLEustaticRate")==0) return SealevelRSLEustaticRateEnum;
+              else if (strcmp(name,"SealevelNEsa")==0) return SealevelNEsaEnum;
+              else if (strcmp(name,"SealevelUGia")==0) return SealevelUGiaEnum;
+              else if (strcmp(name,"SealevelNGia")==0) return SealevelNGiaEnum;
+              else if (strcmp(name,"SealevelRSL")==0) return SealevelRSLEnum;
+              else if (strcmp(name,"SealevelRSLEustatic")==0) return SealevelRSLEustaticEnum;
+              else if (strcmp(name,"SealevelUNorthEsa")==0) return SealevelUNorthEsaEnum;
+              else if (strcmp(name,"SealevelUEastEsa")==0) return SealevelUEastEsaEnum;
+              else if (strcmp(name,"SealevelNGiaRate")==0) return SealevelNGiaRateEnum;
+         else stage=3;
+   }
+   if(stage==3){
+              if (strcmp(name,"SealevelUGiaRate")==0) return SealevelUGiaRateEnum;
               else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
               else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum;
+              else if (strcmp(name,"SealevelriseCumDeltathickness")==0) return SealevelriseCumDeltathicknessEnum;
               else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
               else if (strcmp(name,"SealevelriseEquatorialMoi")==0) return SealevelriseEquatorialMoiEnum;
               else if (strcmp(name,"SealevelriseFluidLove")==0) return SealevelriseFluidLoveEnum;
               else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
+              else if (strcmp(name,"SealevelriseGeodetic")==0) return SealevelriseGeodeticEnum;
+              else if (strcmp(name,"SealevelriseGeodeticRunFrequency")==0) return SealevelriseGeodeticRunFrequencyEnum;
               else if (strcmp(name,"SealevelriseHElastic")==0) return SealevelriseHElasticEnum;
+              else if (strcmp(name,"SealevelriseHoriz")==0) return SealevelriseHorizEnum;
+              else if (strcmp(name,"SealevelriseLoopIncrement")==0) return SealevelriseLoopIncrementEnum;
               else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
               else if (strcmp(name,"SealevelriseOceanAreaScaling")==0) return SealevelriseOceanAreaScalingEnum;
@@ -258 +283 @@
               else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
               else if (strcmp(name,"SealevelriseRotation")==0) return SealevelriseRotationEnum;
+              else if (strcmp(name,"SealevelriseRunCount")==0) return SealevelriseRunCountEnum;
               else if (strcmp(name,"SealevelriseTidalLoveH")==0) return SealevelriseTidalLoveHEnum;
+              else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
               else if (strcmp(name,"SealevelriseTidalLoveK")==0) return SealevelriseTidalLoveKEnum;
-         else stage=3;
-   }
-   if(stage==3){
-              if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum;
+              else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum;
               else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum;
               else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
@@ -359 +383 @@
               else if (strcmp(name,"TransientIsmasstransport")==0) return TransientIsmasstransportEnum;
               else if (strcmp(name,"TransientIsmovingfront")==0) return TransientIsmovingfrontEnum;
-              else if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
+         else stage=4;
+   }
+   if(stage==4){
+              if (strcmp(name,"TransientIsoceancoupling")==0) return TransientIsoceancouplingEnum;
               else if (strcmp(name,"TransientIsslr")==0) return TransientIsslrEnum;
               else if (strcmp(name,"TransientIssmb")==0) return TransientIssmbEnum;
@@ -383 +410 @@
               else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
               else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
-         else stage=4;
-   }
-   if(stage==4){
-              if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
+              else if (strcmp(name,"BasalforcingsPicoBasinId")==0) return BasalforcingsPicoBasinIdEnum;
               else if (strcmp(name,"BasalforcingsPicoBoxId")==0) return BasalforcingsPicoBoxIdEnum;
               else if (strcmp(name,"BasalforcingsPicoGroundingLineDepth")==0) return BasalforcingsPicoGroundingLineDepthEnum;
@@ -482 +506 @@
               else if (strcmp(name,"InversionVelObs")==0) return InversionVelObsEnum;
               else if (strcmp(name,"InversionVxObs")==0) return InversionVxObsEnum;
-              else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
+         else stage=5;
+   }
+   if(stage==5){
+              if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeX")==0) return LevelsetfunctionSlopeXEnum;
               else if (strcmp(name,"LevelsetfunctionSlopeY")==0) return LevelsetfunctionSlopeYEnum;
@@ -506 +533 @@
               else if (strcmp(name,"Misfit")==0) return MisfitEnum;
               else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
-         else stage=5;
-   }
-   if(stage==5){
-              if (strcmp(name,"Node")==0) return NodeEnum;
+              else if (strcmp(name,"Node")==0) return NodeEnum;
               else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum;
               else if (strcmp(name,"P0")==0) return P0Enum;
@@ -605 +629 @@
               else if (strcmp(name,"SurfaceAbsVelMisfit")==0) return SurfaceAbsVelMisfitEnum;
               else if (strcmp(name,"SurfaceArea")==0) return SurfaceAreaEnum;
-              else if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
+         else stage=6;
+   }
+   if(stage==6){
+              if (strcmp(name,"SurfaceAverageVelMisfit")==0) return SurfaceAverageVelMisfitEnum;
               else if (strcmp(name,"Surface")==0) return SurfaceEnum;
               else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
@@ -629 +656 @@
               else if (strcmp(name,"Vy")==0) return VyEnum;
               else if (strcmp(name,"VyMesh")==0) return VyMeshEnum;
-         else stage=6;
-   }
-   if(stage==6){
-              if (strcmp(name,"VyObs")==0) return VyObsEnum;
+              else if (strcmp(name,"VyObs")==0) return VyObsEnum;
               else if (strcmp(name,"Vz")==0) return VzEnum;
               else if (strcmp(name,"VzFS")==0) return VzFSEnum;
@@ -728 +752 @@
               else if (strcmp(name,"ElementSId")==0) return ElementSIdEnum;
               else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum;
-              else if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
+         else stage=7;
+   }
+   if(stage==7){
+              if (strcmp(name,"EplHeadStacked")==0) return EplHeadStackedEnum;
               else if (strcmp(name,"EplHead")==0) return EplHeadEnum;
               else if (strcmp(name,"EsaAnalysis")==0) return EsaAnalysisEnum;
@@ -752 +779 @@
               else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
               else if (strcmp(name,"Free")==0) return FreeEnum;
-         else stage=7;
-   }
-   if(stage==7){
-              if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
+              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
               else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
               else if (strcmp(name,"FSApproximation")==0) return FSApproximationEnum;
@@ -832 +856 @@
               else if (strcmp(name,"LevelsetfunctionPicard")==0) return LevelsetfunctionPicardEnum;
               else if (strcmp(name,"LinearFloatingMeltRate")==0) return LinearFloatingMeltRateEnum;
+              else if (strcmp(name,"SpatialLinearFloatingMeltRate")==0) return SpatialLinearFloatingMeltRateEnum;
               else if (strcmp(name,"LliboutryDuval")==0) return LliboutryDuvalEnum;
               else if (strcmp(name,"Loads")==0) return LoadsEnum;
@@ -850 +875 @@
               else if (strcmp(name,"Masscon")==0) return MassconEnum;
               else if (strcmp(name,"Massfluxatgate")==0) return MassfluxatgateEnum;
-              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
+         else stage=8;
+   }
+   if(stage==8){
+              if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
               else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
               else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
@@ -875 +903 @@
               else if (strcmp(name,"Matestar")==0) return MatestarEnum;
               else if (strcmp(name,"Matice")==0) return MaticeEnum;
-         else stage=8;
-   }
-   if(stage==8){
-              if (strcmp(name,"Matlitho")==0) return MatlithoEnum;
+              else if (strcmp(name,"Matlitho")==0) return MatlithoEnum;
               else if (strcmp(name,"Matpar")==0) return MatparEnum;
               else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
@@ -973 +998 @@
               else if (strcmp(name,"Outputdefinition59")==0) return Outputdefinition59Enum;
               else if (strcmp(name,"Outputdefinition5")==0) return Outputdefinition5Enum;
-              else if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
+         else stage=9;
+   }
+   if(stage==9){
+              if (strcmp(name,"Outputdefinition60")==0) return Outputdefinition60Enum;
               else if (strcmp(name,"Outputdefinition61")==0) return Outputdefinition61Enum;
               else if (strcmp(name,"Outputdefinition62")==0) return Outputdefinition62Enum;
@@ -998 +1026 @@
               else if (strcmp(name,"Outputdefinition81")==0) return Outputdefinition81Enum;
               else if (strcmp(name,"Outputdefinition82")==0) return Outputdefinition82Enum;
-         else stage=9;
-   }
-   if(stage==9){
-              if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum;
+              else if (strcmp(name,"Outputdefinition83")==0) return Outputdefinition83Enum;
               else if (strcmp(name,"Outputdefinition84")==0) return Outputdefinition84Enum;
               else if (strcmp(name,"Outputdefinition85")==0) return Outputdefinition85Enum;
@@ -1051 +1076 @@
               else if (strcmp(name,"SealevelAbsolute")==0) return SealevelAbsoluteEnum;
               else if (strcmp(name,"SealevelEmotion")==0) return SealevelEmotionEnum;
-              else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
               else if (strcmp(name,"SealevelInertiaTensorXZ")==0) return SealevelInertiaTensorXZEnum;
               else if (strcmp(name,"SealevelInertiaTensorYZ")==0) return SealevelInertiaTensorYZEnum;
@@ -1097 +1121 @@
               else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum;
               else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum;
-              else if (strcmp(name,"Sset")==0) return SsetEnum;
+         else stage=10;
+   }
+   if(stage==10){
+              if (strcmp(name,"Sset")==0) return SsetEnum;
               else if (strcmp(name,"SteadystateSolution")==0) return SteadystateSolutionEnum;
               else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum;
@@ -1121 +1148 @@
               else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
               else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
-         else stage=10;
-   }
-   if(stage==10){
-              if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
+              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
               else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
               else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;