Changeset 27154


Ignore:
Timestamp:
07/11/22 01:01:25 (3 years ago)
Author:
Mathieu Morlighem
Message:

CHG: starting age model implementation

Location:
issm/trunk-jpl
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/m4/analyses.m4

    r26099 r27154  
    1111
    1212dnl with-HydrologyTws{{{
    13 
    1413AC_ARG_WITH([HydrologyTws],
    15 
    1614        AS_HELP_STRING([--with-HydrologyTws = YES], [compile with HydrologyTws capabilities (default is yes)]),
    17 
    1815        [HYDROLOGYTWS=$withval],[HYDROLOGYTWS=yes])
    19 
    2016AC_MSG_CHECKING(for HydrologyTws capability compilation)
    2117
    22 
    2318HAVE_HYDROLOGYTWS=no
    24 
    2519if test "x$HYDROLOGYTWS" = "xyes"; then
    26 
    2720        HAVE_HYDROLOGYTWS=yes
    28 
    2921        AC_DEFINE([_HAVE_HYDROLOGYTWS_],[1],[with HydrologyTws capability])
    30 
    31 fi
    32 
     22fi
    3323AM_CONDITIONAL([HYDROLOGYTWS], [test x$HAVE_HYDROLOGYTWS = xyes])
    34 
    3524AC_MSG_RESULT($HAVE_HYDROLOGYTWS)
    36 
    3725dnl }}}
    3826dnl with-AdjointBalancethickness2{{{
    39 
    4027AC_ARG_WITH([AdjointBalancethickness2],
    41 
    4228        AS_HELP_STRING([--with-AdjointBalancethickness2 = YES], [compile with AdjointBalancethickness2 capabilities (default is yes)]),
    43 
    4429        [ADJOINTBALANCETHICKNESS2=$withval],[ADJOINTBALANCETHICKNESS2=yes])
    45 
    4630AC_MSG_CHECKING(for AdjointBalancethickness2 capability compilation)
    4731
    48 
    4932HAVE_ADJOINTBALANCETHICKNESS2=no
    50 
    5133if test "x$ADJOINTBALANCETHICKNESS2" = "xyes"; then
    52 
    5334        HAVE_ADJOINTBALANCETHICKNESS2=yes
    54 
    5535        AC_DEFINE([_HAVE_ADJOINTBALANCETHICKNESS2_],[1],[with AdjointBalancethickness2 capability])
    56 
    57 fi
    58 
     36fi
    5937AM_CONDITIONAL([ADJOINTBALANCETHICKNESS2], [test x$HAVE_ADJOINTBALANCETHICKNESS2 = xyes])
    60 
    6138AC_MSG_RESULT($HAVE_ADJOINTBALANCETHICKNESS2)
    62 
    6339dnl }}}
    6440dnl with-AdjointBalancethickness{{{
    65 
    6641AC_ARG_WITH([AdjointBalancethickness],
    67 
    6842        AS_HELP_STRING([--with-AdjointBalancethickness = YES], [compile with AdjointBalancethickness capabilities (default is yes)]),
    69 
    7043        [ADJOINTBALANCETHICKNESS=$withval],[ADJOINTBALANCETHICKNESS=yes])
    71 
    7244AC_MSG_CHECKING(for AdjointBalancethickness capability compilation)
    7345
    74 
    7546HAVE_ADJOINTBALANCETHICKNESS=no
    76 
    7747if test "x$ADJOINTBALANCETHICKNESS" = "xyes"; then
    78 
    7948        HAVE_ADJOINTBALANCETHICKNESS=yes
    80 
    8149        AC_DEFINE([_HAVE_ADJOINTBALANCETHICKNESS_],[1],[with AdjointBalancethickness capability])
    82 
    83 fi
    84 
     50fi
    8551AM_CONDITIONAL([ADJOINTBALANCETHICKNESS], [test x$HAVE_ADJOINTBALANCETHICKNESS = xyes])
    86 
    8752AC_MSG_RESULT($HAVE_ADJOINTBALANCETHICKNESS)
    88 
    8953dnl }}}
    9054dnl with-AdjointHoriz{{{
    91 
    9255AC_ARG_WITH([AdjointHoriz],
    93 
    9456        AS_HELP_STRING([--with-AdjointHoriz = YES], [compile with AdjointHoriz capabilities (default is yes)]),
    95 
    9657        [ADJOINTHORIZ=$withval],[ADJOINTHORIZ=yes])
    97 
    9858AC_MSG_CHECKING(for AdjointHoriz capability compilation)
    9959
    100 
    10160HAVE_ADJOINTHORIZ=no
    102 
    10361if test "x$ADJOINTHORIZ" = "xyes"; then
    104 
    10562        HAVE_ADJOINTHORIZ=yes
    106 
    10763        AC_DEFINE([_HAVE_ADJOINTHORIZ_],[1],[with AdjointHoriz capability])
    108 
    109 fi
    110 
     64fi
    11165AM_CONDITIONAL([ADJOINTHORIZ], [test x$HAVE_ADJOINTHORIZ = xyes])
    112 
    11366AC_MSG_RESULT($HAVE_ADJOINTHORIZ)
    114 
     67dnl }}}
     68dnl with-Age{{{
     69AC_ARG_WITH([Age],
     70        AS_HELP_STRING([--with-Age = YES], [compile with Age capabilities (default is yes)]),
     71        [AGE=$withval],[AGE=yes])
     72AC_MSG_CHECKING(for Age capability compilation)
     73
     74HAVE_AGE=no
     75if test "x$AGE" = "xyes"; then
     76        HAVE_AGE=yes
     77        AC_DEFINE([_HAVE_AGE_],[1],[with Age capability])
     78fi
     79AM_CONDITIONAL([AGE], [test x$HAVE_AGE = xyes])
     80AC_MSG_RESULT($HAVE_AGE)
    11581dnl }}}
    11682dnl with-Balancethickness2{{{
    117 
    11883AC_ARG_WITH([Balancethickness2],
    119 
    12084        AS_HELP_STRING([--with-Balancethickness2 = YES], [compile with Balancethickness2 capabilities (default is yes)]),
    121 
    12285        [BALANCETHICKNESS2=$withval],[BALANCETHICKNESS2=yes])
    123 
    12486AC_MSG_CHECKING(for Balancethickness2 capability compilation)
    12587
    126 
    12788HAVE_BALANCETHICKNESS2=no
    128 
    12989if test "x$BALANCETHICKNESS2" = "xyes"; then
    130 
    13190        HAVE_BALANCETHICKNESS2=yes
    132 
    13391        AC_DEFINE([_HAVE_BALANCETHICKNESS2_],[1],[with Balancethickness2 capability])
    134 
    135 fi
    136 
     92fi
    13793AM_CONDITIONAL([BALANCETHICKNESS2], [test x$HAVE_BALANCETHICKNESS2 = xyes])
    138 
    13994AC_MSG_RESULT($HAVE_BALANCETHICKNESS2)
    140 
    14195dnl }}}
    14296dnl with-Balancethickness{{{
    143 
    14497AC_ARG_WITH([Balancethickness],
    145 
    14698        AS_HELP_STRING([--with-Balancethickness = YES], [compile with Balancethickness capabilities (default is yes)]),
    147 
    14899        [BALANCETHICKNESS=$withval],[BALANCETHICKNESS=yes])
    149 
    150100AC_MSG_CHECKING(for Balancethickness capability compilation)
    151101
    152 
    153102HAVE_BALANCETHICKNESS=no
    154 
    155103if test "x$BALANCETHICKNESS" = "xyes"; then
    156 
    157104        HAVE_BALANCETHICKNESS=yes
    158 
    159105        AC_DEFINE([_HAVE_BALANCETHICKNESS_],[1],[with Balancethickness capability])
    160 
    161 fi
    162 
     106fi
    163107AM_CONDITIONAL([BALANCETHICKNESS], [test x$HAVE_BALANCETHICKNESS = xyes])
    164 
    165108AC_MSG_RESULT($HAVE_BALANCETHICKNESS)
    166 
    167109dnl }}}
    168110dnl with-BalancethicknessSoft{{{
    169 
    170111AC_ARG_WITH([BalancethicknessSoft],
    171 
    172112        AS_HELP_STRING([--with-BalancethicknessSoft = YES], [compile with BalancethicknessSoft capabilities (default is yes)]),
    173 
    174113        [BALANCETHICKNESSSOFT=$withval],[BALANCETHICKNESSSOFT=yes])
    175 
    176114AC_MSG_CHECKING(for BalancethicknessSoft capability compilation)
    177115
    178 
    179116HAVE_BALANCETHICKNESSSOFT=no
    180 
    181117if test "x$BALANCETHICKNESSSOFT" = "xyes"; then
    182 
    183118        HAVE_BALANCETHICKNESSSOFT=yes
    184 
    185119        AC_DEFINE([_HAVE_BALANCETHICKNESSSOFT_],[1],[with BalancethicknessSoft capability])
    186 
    187 fi
    188 
     120fi
    189121AM_CONDITIONAL([BALANCETHICKNESSSOFT], [test x$HAVE_BALANCETHICKNESSSOFT = xyes])
    190 
    191122AC_MSG_RESULT($HAVE_BALANCETHICKNESSSOFT)
    192 
    193123dnl }}}
    194124dnl with-Balancevelocity{{{
    195 
    196125AC_ARG_WITH([Balancevelocity],
    197 
    198126        AS_HELP_STRING([--with-Balancevelocity = YES], [compile with Balancevelocity capabilities (default is yes)]),
    199 
    200127        [BALANCEVELOCITY=$withval],[BALANCEVELOCITY=yes])
    201 
    202128AC_MSG_CHECKING(for Balancevelocity capability compilation)
    203129
    204 
    205130HAVE_BALANCEVELOCITY=no
    206 
    207131if test "x$BALANCEVELOCITY" = "xyes"; then
    208 
    209132        HAVE_BALANCEVELOCITY=yes
    210 
    211133        AC_DEFINE([_HAVE_BALANCEVELOCITY_],[1],[with Balancevelocity capability])
    212 
    213 fi
    214 
     134fi
    215135AM_CONDITIONAL([BALANCEVELOCITY], [test x$HAVE_BALANCEVELOCITY = xyes])
    216 
    217136AC_MSG_RESULT($HAVE_BALANCEVELOCITY)
    218 
    219137dnl }}}
    220138dnl with-DamageEvolution{{{
    221 
    222139AC_ARG_WITH([DamageEvolution],
    223 
    224140        AS_HELP_STRING([--with-DamageEvolution = YES], [compile with DamageEvolution capabilities (default is yes)]),
    225 
    226141        [DAMAGEEVOLUTION=$withval],[DAMAGEEVOLUTION=yes])
    227 
    228142AC_MSG_CHECKING(for DamageEvolution capability compilation)
    229143
    230 
    231144HAVE_DAMAGEEVOLUTION=no
    232 
    233145if test "x$DAMAGEEVOLUTION" = "xyes"; then
    234 
    235146        HAVE_DAMAGEEVOLUTION=yes
    236 
    237147        AC_DEFINE([_HAVE_DAMAGEEVOLUTION_],[1],[with DamageEvolution capability])
    238 
    239 fi
    240 
     148fi
    241149AM_CONDITIONAL([DAMAGEEVOLUTION], [test x$HAVE_DAMAGEEVOLUTION = xyes])
    242 
    243150AC_MSG_RESULT($HAVE_DAMAGEEVOLUTION)
    244 
    245151dnl }}}
    246152dnl with-DepthAverage{{{
    247 
    248153AC_ARG_WITH([DepthAverage],
    249 
    250154        AS_HELP_STRING([--with-DepthAverage = YES], [compile with DepthAverage capabilities (default is yes)]),
    251 
    252155        [DEPTHAVERAGE=$withval],[DEPTHAVERAGE=yes])
    253 
    254156AC_MSG_CHECKING(for DepthAverage capability compilation)
    255157
    256 
    257158HAVE_DEPTHAVERAGE=no
    258 
    259159if test "x$DEPTHAVERAGE" = "xyes"; then
    260 
    261160        HAVE_DEPTHAVERAGE=yes
    262 
    263161        AC_DEFINE([_HAVE_DEPTHAVERAGE_],[1],[with DepthAverage capability])
    264 
    265 fi
    266 
     162fi
    267163AM_CONDITIONAL([DEPTHAVERAGE], [test x$HAVE_DEPTHAVERAGE = xyes])
    268 
    269164AC_MSG_RESULT($HAVE_DEPTHAVERAGE)
    270 
    271165dnl }}}
    272166dnl with-Enthalpy{{{
    273 
    274167AC_ARG_WITH([Enthalpy],
    275 
    276168        AS_HELP_STRING([--with-Enthalpy = YES], [compile with Enthalpy capabilities (default is yes)]),
    277 
    278169        [ENTHALPY=$withval],[ENTHALPY=yes])
    279 
    280170AC_MSG_CHECKING(for Enthalpy capability compilation)
    281171
    282 
    283172HAVE_ENTHALPY=no
    284 
    285173if test "x$ENTHALPY" = "xyes"; then
    286 
    287174        HAVE_ENTHALPY=yes
    288 
    289175        AC_DEFINE([_HAVE_ENTHALPY_],[1],[with Enthalpy capability])
    290 
    291 fi
    292 
     176fi
    293177AM_CONDITIONAL([ENTHALPY], [test x$HAVE_ENTHALPY = xyes])
    294 
    295178AC_MSG_RESULT($HAVE_ENTHALPY)
    296 
    297179dnl }}}
    298180dnl with-Esa{{{
    299 
    300181AC_ARG_WITH([Esa],
    301 
    302182        AS_HELP_STRING([--with-Esa = YES], [compile with Esa capabilities (default is yes)]),
    303 
    304183        [ESA=$withval],[ESA=yes])
    305 
    306184AC_MSG_CHECKING(for Esa capability compilation)
    307185
    308 
    309186HAVE_ESA=no
    310 
    311187if test "x$ESA" = "xyes"; then
    312 
    313188        HAVE_ESA=yes
    314 
    315189        AC_DEFINE([_HAVE_ESA_],[1],[with Esa capability])
    316 
    317 fi
    318 
     190fi
    319191AM_CONDITIONAL([ESA], [test x$HAVE_ESA = xyes])
    320 
    321192AC_MSG_RESULT($HAVE_ESA)
    322 
    323193dnl }}}
    324194dnl with-Extrapolation{{{
    325 
    326195AC_ARG_WITH([Extrapolation],
    327 
    328196        AS_HELP_STRING([--with-Extrapolation = YES], [compile with Extrapolation capabilities (default is yes)]),
    329 
    330197        [EXTRAPOLATION=$withval],[EXTRAPOLATION=yes])
    331 
    332198AC_MSG_CHECKING(for Extrapolation capability compilation)
    333199
    334 
    335200HAVE_EXTRAPOLATION=no
    336 
    337201if test "x$EXTRAPOLATION" = "xyes"; then
    338 
    339202        HAVE_EXTRAPOLATION=yes
    340 
    341203        AC_DEFINE([_HAVE_EXTRAPOLATION_],[1],[with Extrapolation capability])
    342 
    343 fi
    344 
     204fi
    345205AM_CONDITIONAL([EXTRAPOLATION], [test x$HAVE_EXTRAPOLATION = xyes])
    346 
    347206AC_MSG_RESULT($HAVE_EXTRAPOLATION)
    348 
    349207dnl }}}
    350208dnl with-ExtrudeFromBase{{{
    351 
    352209AC_ARG_WITH([ExtrudeFromBase],
    353 
    354210        AS_HELP_STRING([--with-ExtrudeFromBase = YES], [compile with ExtrudeFromBase capabilities (default is yes)]),
    355 
    356211        [EXTRUDEFROMBASE=$withval],[EXTRUDEFROMBASE=yes])
    357 
    358212AC_MSG_CHECKING(for ExtrudeFromBase capability compilation)
    359213
    360 
    361214HAVE_EXTRUDEFROMBASE=no
    362 
    363215if test "x$EXTRUDEFROMBASE" = "xyes"; then
    364 
    365216        HAVE_EXTRUDEFROMBASE=yes
    366 
    367217        AC_DEFINE([_HAVE_EXTRUDEFROMBASE_],[1],[with ExtrudeFromBase capability])
    368 
    369 fi
    370 
     218fi
    371219AM_CONDITIONAL([EXTRUDEFROMBASE], [test x$HAVE_EXTRUDEFROMBASE = xyes])
    372 
    373220AC_MSG_RESULT($HAVE_EXTRUDEFROMBASE)
    374 
    375221dnl }}}
    376222dnl with-ExtrudeFromTop{{{
    377 
    378223AC_ARG_WITH([ExtrudeFromTop],
    379 
    380224        AS_HELP_STRING([--with-ExtrudeFromTop = YES], [compile with ExtrudeFromTop capabilities (default is yes)]),
    381 
    382225        [EXTRUDEFROMTOP=$withval],[EXTRUDEFROMTOP=yes])
    383 
    384226AC_MSG_CHECKING(for ExtrudeFromTop capability compilation)
    385227
    386 
    387228HAVE_EXTRUDEFROMTOP=no
    388 
    389229if test "x$EXTRUDEFROMTOP" = "xyes"; then
    390 
    391230        HAVE_EXTRUDEFROMTOP=yes
    392 
    393231        AC_DEFINE([_HAVE_EXTRUDEFROMTOP_],[1],[with ExtrudeFromTop capability])
    394 
    395 fi
    396 
     232fi
    397233AM_CONDITIONAL([EXTRUDEFROMTOP], [test x$HAVE_EXTRUDEFROMTOP = xyes])
    398 
    399234AC_MSG_RESULT($HAVE_EXTRUDEFROMTOP)
    400 
    401235dnl }}}
    402236dnl with-FreeSurfaceBase{{{
    403 
    404237AC_ARG_WITH([FreeSurfaceBase],
    405 
    406238        AS_HELP_STRING([--with-FreeSurfaceBase = YES], [compile with FreeSurfaceBase capabilities (default is yes)]),
    407 
    408239        [FREESURFACEBASE=$withval],[FREESURFACEBASE=yes])
    409 
    410240AC_MSG_CHECKING(for FreeSurfaceBase capability compilation)
    411241
    412 
    413242HAVE_FREESURFACEBASE=no
    414 
    415243if test "x$FREESURFACEBASE" = "xyes"; then
    416 
    417244        HAVE_FREESURFACEBASE=yes
    418 
    419245        AC_DEFINE([_HAVE_FREESURFACEBASE_],[1],[with FreeSurfaceBase capability])
    420 
    421 fi
    422 
     246fi
    423247AM_CONDITIONAL([FREESURFACEBASE], [test x$HAVE_FREESURFACEBASE = xyes])
    424 
    425248AC_MSG_RESULT($HAVE_FREESURFACEBASE)
    426 
    427249dnl }}}
    428250dnl with-FreeSurfaceTop{{{
    429 
    430251AC_ARG_WITH([FreeSurfaceTop],
    431 
    432252        AS_HELP_STRING([--with-FreeSurfaceTop = YES], [compile with FreeSurfaceTop capabilities (default is yes)]),
    433 
    434253        [FREESURFACETOP=$withval],[FREESURFACETOP=yes])
    435 
    436254AC_MSG_CHECKING(for FreeSurfaceTop capability compilation)
    437255
    438 
    439256HAVE_FREESURFACETOP=no
    440 
    441257if test "x$FREESURFACETOP" = "xyes"; then
    442 
    443258        HAVE_FREESURFACETOP=yes
    444 
    445259        AC_DEFINE([_HAVE_FREESURFACETOP_],[1],[with FreeSurfaceTop capability])
    446 
    447 fi
    448 
     260fi
    449261AM_CONDITIONAL([FREESURFACETOP], [test x$HAVE_FREESURFACETOP = xyes])
    450 
    451262AC_MSG_RESULT($HAVE_FREESURFACETOP)
    452 
    453263dnl }}}
    454264dnl with-GLheightadvection{{{
    455 
    456265AC_ARG_WITH([GLheightadvection],
    457 
    458266        AS_HELP_STRING([--with-GLheightadvection = YES], [compile with GLheightadvection capabilities (default is yes)]),
    459 
    460267        [GLHEIGHTADVECTION=$withval],[GLHEIGHTADVECTION=yes])
    461 
    462268AC_MSG_CHECKING(for GLheightadvection capability compilation)
    463269
    464 
    465270HAVE_GLHEIGHTADVECTION=no
    466 
    467271if test "x$GLHEIGHTADVECTION" = "xyes"; then
    468 
    469272        HAVE_GLHEIGHTADVECTION=yes
    470 
    471273        AC_DEFINE([_HAVE_GLHEIGHTADVECTION_],[1],[with GLheightadvection capability])
    472 
    473 fi
    474 
     274fi
    475275AM_CONDITIONAL([GLHEIGHTADVECTION], [test x$HAVE_GLHEIGHTADVECTION = xyes])
    476 
    477276AC_MSG_RESULT($HAVE_GLHEIGHTADVECTION)
    478 
    479277dnl }}}
    480278dnl with-HydrologyDCEfficient{{{
    481 
    482279AC_ARG_WITH([HydrologyDCEfficient],
    483 
    484280        AS_HELP_STRING([--with-HydrologyDCEfficient = YES], [compile with HydrologyDCEfficient capabilities (default is yes)]),
    485 
    486281        [HYDROLOGYDCEFFICIENT=$withval],[HYDROLOGYDCEFFICIENT=yes])
    487 
    488282AC_MSG_CHECKING(for HydrologyDCEfficient capability compilation)
    489283
    490 
    491284HAVE_HYDROLOGYDCEFFICIENT=no
    492 
    493285if test "x$HYDROLOGYDCEFFICIENT" = "xyes"; then
    494 
    495286        HAVE_HYDROLOGYDCEFFICIENT=yes
    496 
    497287        AC_DEFINE([_HAVE_HYDROLOGYDCEFFICIENT_],[1],[with HydrologyDCEfficient capability])
    498 
    499 fi
    500 
     288fi
    501289AM_CONDITIONAL([HYDROLOGYDCEFFICIENT], [test x$HAVE_HYDROLOGYDCEFFICIENT = xyes])
    502 
    503290AC_MSG_RESULT($HAVE_HYDROLOGYDCEFFICIENT)
    504 
    505291dnl }}}
    506292dnl with-HydrologyDCInefficient{{{
    507 
    508293AC_ARG_WITH([HydrologyDCInefficient],
    509 
    510294        AS_HELP_STRING([--with-HydrologyDCInefficient = YES], [compile with HydrologyDCInefficient capabilities (default is yes)]),
    511 
    512295        [HYDROLOGYDCINEFFICIENT=$withval],[HYDROLOGYDCINEFFICIENT=yes])
    513 
    514296AC_MSG_CHECKING(for HydrologyDCInefficient capability compilation)
    515297
    516 
    517298HAVE_HYDROLOGYDCINEFFICIENT=no
    518 
    519299if test "x$HYDROLOGYDCINEFFICIENT" = "xyes"; then
    520 
    521300        HAVE_HYDROLOGYDCINEFFICIENT=yes
    522 
    523301        AC_DEFINE([_HAVE_HYDROLOGYDCINEFFICIENT_],[1],[with HydrologyDCInefficient capability])
    524 
    525 fi
    526 
     302fi
    527303AM_CONDITIONAL([HYDROLOGYDCINEFFICIENT], [test x$HAVE_HYDROLOGYDCINEFFICIENT = xyes])
    528 
    529304AC_MSG_RESULT($HAVE_HYDROLOGYDCINEFFICIENT)
    530 
    531305dnl }}}
    532306dnl with-HydrologyGlaDS{{{
    533 
    534307AC_ARG_WITH([HydrologyGlaDS],
    535 
    536308        AS_HELP_STRING([--with-HydrologyGlaDS = YES], [compile with HydrologyGlaDS capabilities (default is yes)]),
    537 
    538309        [HYDROLOGYGLADS=$withval],[HYDROLOGYGLADS=yes])
    539 
    540310AC_MSG_CHECKING(for HydrologyGlaDS capability compilation)
    541311
    542 
    543312HAVE_HYDROLOGYGLADS=no
    544 
    545313if test "x$HYDROLOGYGLADS" = "xyes"; then
    546 
    547314        HAVE_HYDROLOGYGLADS=yes
    548 
    549315        AC_DEFINE([_HAVE_HYDROLOGYGLADS_],[1],[with HydrologyGlaDS capability])
    550 
    551 fi
    552 
     316fi
    553317AM_CONDITIONAL([HYDROLOGYGLADS], [test x$HAVE_HYDROLOGYGLADS = xyes])
    554 
    555318AC_MSG_RESULT($HAVE_HYDROLOGYGLADS)
    556 
    557319dnl }}}
    558320dnl with-HydrologyPism{{{
    559 
    560321AC_ARG_WITH([HydrologyPism],
    561 
    562322        AS_HELP_STRING([--with-HydrologyPism = YES], [compile with HydrologyPism capabilities (default is yes)]),
    563 
    564323        [HYDROLOGYPISM=$withval],[HYDROLOGYPISM=yes])
    565 
    566324AC_MSG_CHECKING(for HydrologyPism capability compilation)
    567325
    568 
    569326HAVE_HYDROLOGYPISM=no
    570 
    571327if test "x$HYDROLOGYPISM" = "xyes"; then
    572 
    573328        HAVE_HYDROLOGYPISM=yes
    574 
    575329        AC_DEFINE([_HAVE_HYDROLOGYPISM_],[1],[with HydrologyPism capability])
    576 
    577 fi
    578 
     330fi
    579331AM_CONDITIONAL([HYDROLOGYPISM], [test x$HAVE_HYDROLOGYPISM = xyes])
    580 
    581332AC_MSG_RESULT($HAVE_HYDROLOGYPISM)
    582 
    583333dnl }}}
    584334dnl with-HydrologyShakti{{{
    585 
    586335AC_ARG_WITH([HydrologyShakti],
    587 
    588336        AS_HELP_STRING([--with-HydrologyShakti = YES], [compile with HydrologyShakti capabilities (default is yes)]),
    589 
    590337        [HYDROLOGYSHAKTI=$withval],[HYDROLOGYSHAKTI=yes])
    591 
    592338AC_MSG_CHECKING(for HydrologyShakti capability compilation)
    593339
    594 
    595340HAVE_HYDROLOGYSHAKTI=no
    596 
    597341if test "x$HYDROLOGYSHAKTI" = "xyes"; then
    598 
    599342        HAVE_HYDROLOGYSHAKTI=yes
    600 
    601343        AC_DEFINE([_HAVE_HYDROLOGYSHAKTI_],[1],[with HydrologyShakti capability])
    602 
    603 fi
    604 
     344fi
    605345AM_CONDITIONAL([HYDROLOGYSHAKTI], [test x$HAVE_HYDROLOGYSHAKTI = xyes])
    606 
    607346AC_MSG_RESULT($HAVE_HYDROLOGYSHAKTI)
    608 
    609347dnl }}}
    610348dnl with-HydrologyShreve{{{
    611 
    612349AC_ARG_WITH([HydrologyShreve],
    613 
    614350        AS_HELP_STRING([--with-HydrologyShreve = YES], [compile with HydrologyShreve capabilities (default is yes)]),
    615 
    616351        [HYDROLOGYSHREVE=$withval],[HYDROLOGYSHREVE=yes])
    617 
    618352AC_MSG_CHECKING(for HydrologyShreve capability compilation)
    619353
    620 
    621354HAVE_HYDROLOGYSHREVE=no
    622 
    623355if test "x$HYDROLOGYSHREVE" = "xyes"; then
    624 
    625356        HAVE_HYDROLOGYSHREVE=yes
    626 
    627357        AC_DEFINE([_HAVE_HYDROLOGYSHREVE_],[1],[with HydrologyShreve capability])
    628 
    629 fi
    630 
     358fi
    631359AM_CONDITIONAL([HYDROLOGYSHREVE], [test x$HAVE_HYDROLOGYSHREVE = xyes])
    632 
    633360AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE)
    634 
    635361dnl }}}
    636362dnl with-L2ProjectionBase{{{
    637 
    638363AC_ARG_WITH([L2ProjectionBase],
    639 
    640364        AS_HELP_STRING([--with-L2ProjectionBase = YES], [compile with L2ProjectionBase capabilities (default is yes)]),
    641 
    642365        [L2PROJECTIONBASE=$withval],[L2PROJECTIONBASE=yes])
    643 
    644366AC_MSG_CHECKING(for L2ProjectionBase capability compilation)
    645367
    646 
    647368HAVE_L2PROJECTIONBASE=no
    648 
    649369if test "x$L2PROJECTIONBASE" = "xyes"; then
    650 
    651370        HAVE_L2PROJECTIONBASE=yes
    652 
    653371        AC_DEFINE([_HAVE_L2PROJECTIONBASE_],[1],[with L2ProjectionBase capability])
    654 
    655 fi
    656 
     372fi
    657373AM_CONDITIONAL([L2PROJECTIONBASE], [test x$HAVE_L2PROJECTIONBASE = xyes])
    658 
    659374AC_MSG_RESULT($HAVE_L2PROJECTIONBASE)
    660 
    661375dnl }}}
    662376dnl with-L2ProjectionEPL{{{
    663 
    664377AC_ARG_WITH([L2ProjectionEPL],
    665 
    666378        AS_HELP_STRING([--with-L2ProjectionEPL = YES], [compile with L2ProjectionEPL capabilities (default is yes)]),
    667 
    668379        [L2PROJECTIONEPL=$withval],[L2PROJECTIONEPL=yes])
    669 
    670380AC_MSG_CHECKING(for L2ProjectionEPL capability compilation)
    671381
    672 
    673382HAVE_L2PROJECTIONEPL=no
    674 
    675383if test "x$L2PROJECTIONEPL" = "xyes"; then
    676 
    677384        HAVE_L2PROJECTIONEPL=yes
    678 
    679385        AC_DEFINE([_HAVE_L2PROJECTIONEPL_],[1],[with L2ProjectionEPL capability])
    680 
    681 fi
    682 
     386fi
    683387AM_CONDITIONAL([L2PROJECTIONEPL], [test x$HAVE_L2PROJECTIONEPL = xyes])
    684 
    685388AC_MSG_RESULT($HAVE_L2PROJECTIONEPL)
    686 
    687389dnl }}}
    688390dnl with-Levelset{{{
    689 
    690391AC_ARG_WITH([Levelset],
    691 
    692392        AS_HELP_STRING([--with-Levelset = YES], [compile with Levelset capabilities (default is yes)]),
    693 
    694393        [LEVELSET=$withval],[LEVELSET=yes])
    695 
    696394AC_MSG_CHECKING(for Levelset capability compilation)
    697395
    698 
    699396HAVE_LEVELSET=no
    700 
    701397if test "x$LEVELSET" = "xyes"; then
    702 
    703398        HAVE_LEVELSET=yes
    704 
    705399        AC_DEFINE([_HAVE_LEVELSET_],[1],[with Levelset capability])
    706 
    707 fi
    708 
     400fi
    709401AM_CONDITIONAL([LEVELSET], [test x$HAVE_LEVELSET = xyes])
    710 
    711402AC_MSG_RESULT($HAVE_LEVELSET)
    712 
    713403dnl }}}
    714404dnl with-Love{{{
    715 
    716405AC_ARG_WITH([Love],
    717 
    718406        AS_HELP_STRING([--with-Love = YES], [compile with Love capabilities (default is yes)]),
    719 
    720407        [LOVE=$withval],[LOVE=yes])
    721 
    722408AC_MSG_CHECKING(for Love capability compilation)
    723409
    724 
    725410HAVE_LOVE=no
    726 
    727411if test "x$LOVE" = "xyes"; then
    728 
    729412        HAVE_LOVE=yes
    730 
    731413        AC_DEFINE([_HAVE_LOVE_],[1],[with Love capability])
    732 
    733 fi
    734 
     414fi
    735415AM_CONDITIONAL([LOVE], [test x$HAVE_LOVE = xyes])
    736 
    737416AC_MSG_RESULT($HAVE_LOVE)
    738 
    739417dnl }}}
    740418dnl with-Masstransport{{{
    741 
    742419AC_ARG_WITH([Masstransport],
    743 
    744420        AS_HELP_STRING([--with-Masstransport = YES], [compile with Masstransport capabilities (default is yes)]),
    745 
    746421        [MASSTRANSPORT=$withval],[MASSTRANSPORT=yes])
    747 
    748422AC_MSG_CHECKING(for Masstransport capability compilation)
    749423
    750 
    751424HAVE_MASSTRANSPORT=no
    752 
    753425if test "x$MASSTRANSPORT" = "xyes"; then
    754 
    755426        HAVE_MASSTRANSPORT=yes
    756 
    757427        AC_DEFINE([_HAVE_MASSTRANSPORT_],[1],[with Masstransport capability])
    758 
    759 fi
    760 
     428fi
    761429AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes])
    762 
    763430AC_MSG_RESULT($HAVE_MASSTRANSPORT)
    764 
    765431dnl }}}
    766432dnl with-Melting{{{
    767 
    768433AC_ARG_WITH([Melting],
    769 
    770434        AS_HELP_STRING([--with-Melting = YES], [compile with Melting capabilities (default is yes)]),
    771 
    772435        [MELTING=$withval],[MELTING=yes])
    773 
    774436AC_MSG_CHECKING(for Melting capability compilation)
    775437
    776 
    777438HAVE_MELTING=no
    778 
    779439if test "x$MELTING" = "xyes"; then
    780 
    781440        HAVE_MELTING=yes
    782 
    783441        AC_DEFINE([_HAVE_MELTING_],[1],[with Melting capability])
    784 
    785 fi
    786 
     442fi
    787443AM_CONDITIONAL([MELTING], [test x$HAVE_MELTING = xyes])
    788 
    789444AC_MSG_RESULT($HAVE_MELTING)
    790 
    791445dnl }}}
    792446dnl with-Oceantransport{{{
    793 
    794447AC_ARG_WITH([Oceantransport],
    795 
    796448        AS_HELP_STRING([--with-Oceantransport = YES], [compile with Oceantransport capabilities (default is yes)]),
    797 
    798449        [OCEANTRANSPORT=$withval],[OCEANTRANSPORT=yes])
    799 
    800450AC_MSG_CHECKING(for Oceantransport capability compilation)
    801451
    802 
    803452HAVE_OCEANTRANSPORT=no
    804 
    805453if test "x$OCEANTRANSPORT" = "xyes"; then
    806 
    807454        HAVE_OCEANTRANSPORT=yes
    808 
    809455        AC_DEFINE([_HAVE_OCEANTRANSPORT_],[1],[with Oceantransport capability])
    810 
    811 fi
    812 
     456fi
    813457AM_CONDITIONAL([OCEANTRANSPORT], [test x$HAVE_OCEANTRANSPORT = xyes])
    814 
    815458AC_MSG_RESULT($HAVE_OCEANTRANSPORT)
    816 
    817459dnl }}}
    818460dnl with-Recovery{{{
    819 
    820461AC_ARG_WITH([Recovery],
    821 
    822462        AS_HELP_STRING([--with-Recovery = YES], [compile with Recovery capabilities (default is yes)]),
    823 
    824463        [RECOVERY=$withval],[RECOVERY=yes])
    825 
    826464AC_MSG_CHECKING(for Recovery capability compilation)
    827465
    828 
    829466HAVE_RECOVERY=no
    830 
    831467if test "x$RECOVERY" = "xyes"; then
    832 
    833468        HAVE_RECOVERY=yes
    834 
    835469        AC_DEFINE([_HAVE_RECOVERY_],[1],[with Recovery capability])
    836 
    837 fi
    838 
     470fi
    839471AM_CONDITIONAL([RECOVERY], [test x$HAVE_RECOVERY = xyes])
    840 
    841472AC_MSG_RESULT($HAVE_RECOVERY)
    842 
    843473dnl }}}
    844474dnl with-Sampling{{{
    845 
    846475AC_ARG_WITH([Sampling],
    847 
    848476        AS_HELP_STRING([--with-Sampling = YES], [compile with Sampling capabilities (default is yes)]),
    849 
    850477        [SAMPLING=$withval],[SAMPLING=yes])
    851 
    852478AC_MSG_CHECKING(for Sampling capability compilation)
    853479
    854 
    855480HAVE_SAMPLING=no
    856 
    857481if test "x$SAMPLING" = "xyes"; then
    858 
    859482        HAVE_SAMPLING=yes
    860 
    861483        AC_DEFINE([_HAVE_SAMPLING_],[1],[with Sampling capability])
    862 
    863 fi
    864 
     484fi
    865485AM_CONDITIONAL([SAMPLING], [test x$HAVE_SAMPLING = xyes])
    866 
    867486AC_MSG_RESULT($HAVE_SAMPLING)
    868 
    869487dnl }}}
    870488dnl with-Sealevelchange{{{
    871 
    872489AC_ARG_WITH([Sealevelchange],
    873 
    874490        AS_HELP_STRING([--with-Sealevelchange = YES], [compile with Sealevelchange capabilities (default is yes)]),
    875 
    876491        [SEALEVELCHANGE=$withval],[SEALEVELCHANGE=yes])
    877 
    878492AC_MSG_CHECKING(for Sealevelchange capability compilation)
    879493
    880 
    881494HAVE_SEALEVELCHANGE=no
    882 
    883495if test "x$SEALEVELCHANGE" = "xyes"; then
    884 
    885496        HAVE_SEALEVELCHANGE=yes
    886 
    887497        AC_DEFINE([_HAVE_SEALEVELCHANGE_],[1],[with Sealevelchange capability])
    888 
    889 fi
    890 
     498fi
    891499AM_CONDITIONAL([SEALEVELCHANGE], [test x$HAVE_SEALEVELCHANGE = xyes])
    892 
    893500AC_MSG_RESULT($HAVE_SEALEVELCHANGE)
    894 
    895501dnl }}}
    896502dnl with-Smb{{{
    897 
    898503AC_ARG_WITH([Smb],
    899 
    900504        AS_HELP_STRING([--with-Smb = YES], [compile with Smb capabilities (default is yes)]),
    901 
    902505        [SMB=$withval],[SMB=yes])
    903 
    904506AC_MSG_CHECKING(for Smb capability compilation)
    905507
    906 
    907508HAVE_SMB=no
    908 
    909509if test "x$SMB" = "xyes"; then
    910 
    911510        HAVE_SMB=yes
    912 
    913511        AC_DEFINE([_HAVE_SMB_],[1],[with Smb capability])
    914 
    915 fi
    916 
     512fi
    917513AM_CONDITIONAL([SMB], [test x$HAVE_SMB = xyes])
    918 
    919514AC_MSG_RESULT($HAVE_SMB)
    920 
    921515dnl }}}
    922516dnl with-Smooth{{{
    923 
    924517AC_ARG_WITH([Smooth],
    925 
    926518        AS_HELP_STRING([--with-Smooth = YES], [compile with Smooth capabilities (default is yes)]),
    927 
    928519        [SMOOTH=$withval],[SMOOTH=yes])
    929 
    930520AC_MSG_CHECKING(for Smooth capability compilation)
    931521
    932 
    933522HAVE_SMOOTH=no
    934 
    935523if test "x$SMOOTH" = "xyes"; then
    936 
    937524        HAVE_SMOOTH=yes
    938 
    939525        AC_DEFINE([_HAVE_SMOOTH_],[1],[with Smooth capability])
    940 
    941 fi
    942 
     526fi
    943527AM_CONDITIONAL([SMOOTH], [test x$HAVE_SMOOTH = xyes])
    944 
    945528AC_MSG_RESULT($HAVE_SMOOTH)
    946 
    947529dnl }}}
    948530dnl with-Stressbalance{{{
    949 
    950531AC_ARG_WITH([Stressbalance],
    951 
    952532        AS_HELP_STRING([--with-Stressbalance = YES], [compile with Stressbalance capabilities (default is yes)]),
    953 
    954533        [STRESSBALANCE=$withval],[STRESSBALANCE=yes])
    955 
    956534AC_MSG_CHECKING(for Stressbalance capability compilation)
    957535
    958 
    959536HAVE_STRESSBALANCE=no
    960 
    961537if test "x$STRESSBALANCE" = "xyes"; then
    962 
    963538        HAVE_STRESSBALANCE=yes
    964 
    965539        AC_DEFINE([_HAVE_STRESSBALANCE_],[1],[with Stressbalance capability])
    966 
    967 fi
    968 
     540fi
    969541AM_CONDITIONAL([STRESSBALANCE], [test x$HAVE_STRESSBALANCE = xyes])
    970 
    971542AC_MSG_RESULT($HAVE_STRESSBALANCE)
    972 
    973543dnl }}}
    974544dnl with-StressbalanceSIA{{{
    975 
    976545AC_ARG_WITH([StressbalanceSIA],
    977 
    978546        AS_HELP_STRING([--with-StressbalanceSIA = YES], [compile with StressbalanceSIA capabilities (default is yes)]),
    979 
    980547        [STRESSBALANCESIA=$withval],[STRESSBALANCESIA=yes])
    981 
    982548AC_MSG_CHECKING(for StressbalanceSIA capability compilation)
    983549
    984 
    985550HAVE_STRESSBALANCESIA=no
    986 
    987551if test "x$STRESSBALANCESIA" = "xyes"; then
    988 
    989552        HAVE_STRESSBALANCESIA=yes
    990 
    991553        AC_DEFINE([_HAVE_STRESSBALANCESIA_],[1],[with StressbalanceSIA capability])
    992 
    993 fi
    994 
     554fi
    995555AM_CONDITIONAL([STRESSBALANCESIA], [test x$HAVE_STRESSBALANCESIA = xyes])
    996 
    997556AC_MSG_RESULT($HAVE_STRESSBALANCESIA)
    998 
    999557dnl }}}
    1000558dnl with-StressbalanceVertical{{{
    1001 
    1002559AC_ARG_WITH([StressbalanceVertical],
    1003 
    1004560        AS_HELP_STRING([--with-StressbalanceVertical = YES], [compile with StressbalanceVertical capabilities (default is yes)]),
    1005 
    1006561        [STRESSBALANCEVERTICAL=$withval],[STRESSBALANCEVERTICAL=yes])
    1007 
    1008562AC_MSG_CHECKING(for StressbalanceVertical capability compilation)
    1009563
    1010 
    1011564HAVE_STRESSBALANCEVERTICAL=no
    1012 
    1013565if test "x$STRESSBALANCEVERTICAL" = "xyes"; then
    1014 
    1015566        HAVE_STRESSBALANCEVERTICAL=yes
    1016 
    1017567        AC_DEFINE([_HAVE_STRESSBALANCEVERTICAL_],[1],[with StressbalanceVertical capability])
    1018 
    1019 fi
    1020 
     568fi
    1021569AM_CONDITIONAL([STRESSBALANCEVERTICAL], [test x$HAVE_STRESSBALANCEVERTICAL = xyes])
    1022 
    1023570AC_MSG_RESULT($HAVE_STRESSBALANCEVERTICAL)
    1024 
    1025571dnl }}}
    1026572dnl with-Thermal{{{
    1027 
    1028573AC_ARG_WITH([Thermal],
    1029 
    1030574        AS_HELP_STRING([--with-Thermal = YES], [compile with Thermal capabilities (default is yes)]),
    1031 
    1032575        [THERMAL=$withval],[THERMAL=yes])
    1033 
    1034576AC_MSG_CHECKING(for Thermal capability compilation)
    1035577
    1036 
    1037578HAVE_THERMAL=no
    1038 
    1039579if test "x$THERMAL" = "xyes"; then
    1040 
    1041580        HAVE_THERMAL=yes
    1042 
    1043581        AC_DEFINE([_HAVE_THERMAL_],[1],[with Thermal capability])
    1044 
    1045 fi
    1046 
     582fi
    1047583AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes])
    1048 
    1049584AC_MSG_RESULT($HAVE_THERMAL)
    1050 
    1051585dnl }}}
    1052586dnl with-UzawaPressure{{{
    1053 
    1054587AC_ARG_WITH([UzawaPressure],
    1055 
    1056588        AS_HELP_STRING([--with-UzawaPressure = YES], [compile with UzawaPressure capabilities (default is yes)]),
    1057 
    1058589        [UZAWAPRESSURE=$withval],[UZAWAPRESSURE=yes])
    1059 
    1060590AC_MSG_CHECKING(for UzawaPressure capability compilation)
    1061591
    1062 
    1063592HAVE_UZAWAPRESSURE=no
    1064 
    1065593if test "x$UZAWAPRESSURE" = "xyes"; then
    1066 
    1067594        HAVE_UZAWAPRESSURE=yes
    1068 
    1069595        AC_DEFINE([_HAVE_UZAWAPRESSURE_],[1],[with UzawaPressure capability])
    1070 
    1071 fi
    1072 
     596fi
    1073597AM_CONDITIONAL([UZAWAPRESSURE], [test x$HAVE_UZAWAPRESSURE = xyes])
    1074 
    1075598AC_MSG_RESULT($HAVE_UZAWAPRESSURE)
    1076 
    1077599dnl }}}
    1078600

  • issm/trunk-jpl/src/c/Makefile.am

    r27130 r27154  
    401401endif
    402402#}}}
    403 #GSL sources {{{
     403# GSL sources {{{
    404404if GSL
    405405issm_sources += ./toolkits/gsl/DenseGslSolve.cpp
    … …  
    420420if ADJOINTHORIZ
    421421issm_sources += ./analyses/AdjointHorizAnalysis.cpp
     422endif
     423if AGE
     424issm_sources += ./analyses/AgeAnalysis.cpp
    422425endif
    423426if BALANCETHICKNESS

  • issm/trunk-jpl/src/c/analyses/EnumToAnalysis.cpp

    r26099 r27154  
    2525                #ifdef _HAVE_ADJOINTHORIZ_
    2626                case AdjointHorizAnalysisEnum : return new AdjointHorizAnalysis();
     27                #endif
     28                #ifdef _HAVE_AGE_
     29                case AgeAnalysisEnum : return new AgeAnalysis();
    2730                #endif
    2831                #ifdef _HAVE_BALANCETHICKNESS2_

  • issm/trunk-jpl/src/c/analyses/analyses.h

    r26047 r27154  
    1111#include "./AdjointBalancethickness2Analysis.h"
    1212#include "./AdjointHorizAnalysis.h"
     13#include "./AgeAnalysis.h"
    1314#include "./BalancethicknessAnalysis.h"
    1415#include "./Balancethickness2Analysis.h"

  • issm/trunk-jpl/src/c/cores/transient_core.cpp

    r27102 r27154  
    130130
    131131        /*parameters: */
    132         bool isstressbalance,ismasstransport,isoceantransport,issmb,isthermal,isgroundingline,isesa,issampling;;
     132        bool isstressbalance,ismasstransport,isage,isoceantransport,issmb,isthermal,isgroundingline,isesa,issampling;
    133133        bool isslc,ismovingfront,isdamageevolution,ishydrology,isoceancoupling,isstochasticforcing,save_results;
    134134        int  step,sb_coupling_frequency;
    … …  
    142142        femmodel->parameters->FindParam(&isstressbalance,TransientIsstressbalanceEnum);
    143143        femmodel->parameters->FindParam(&ismasstransport,TransientIsmasstransportEnum);
     144        femmodel->parameters->FindParam(&isage,TransientIsageEnum);
    144145        femmodel->parameters->FindParam(&isoceantransport,TransientIsoceantransportEnum);
    145146        femmodel->parameters->FindParam(&issmb,TransientIssmbEnum);

  • issm/trunk-jpl/src/c/shared/Enum/Enum.vim

    r27131 r27154  
    1717syn keyword cConstant ParametersSTARTEnum
    1818syn keyword cConstant AdolcParamEnum
     19syn keyword cConstant AgeStabilizationEnum
     20syn keyword cConstant AgeNumRequestedOutputsEnum
     21syn keyword cConstant AgeRequestedOutputsEnum
    1922syn keyword cConstant AmrDeviatoricErrorGroupThresholdEnum
    2023syn keyword cConstant AmrDeviatoricErrorMaximumEnum
    … …  
    290293syn keyword cConstant LoveComplexComputationEnum
    291294syn keyword cConstant LoveQuadPrecisionEnum
     295syn keyword cConstant LoveIntStepsPerLayerEnum
    292296syn keyword cConstant LoveMinIntegrationStepsEnum
    293297syn keyword cConstant LoveMaxIntegrationdrEnum
    … …  
    576580syn keyword cConstant ToolkitsTypesEnum
    577581syn keyword cConstant TransientAmrFrequencyEnum
     582syn keyword cConstant TransientIsageEnum
    578583syn keyword cConstant TransientIsdamageevolutionEnum
    579584syn keyword cConstant TransientIsesaEnum
    … …  
    612617syn keyword cConstant AdjointyShearEnum
    613618syn keyword cConstant AdjointzEnum
     619syn keyword cConstant AgeEnum
    614620syn keyword cConstant AirEnum
    615621syn keyword cConstant ApproximationEnum
    … …  
    12301236syn keyword cConstant AdjointBalancethicknessAnalysisEnum
    12311237syn keyword cConstant AdjointHorizAnalysisEnum
     1238syn keyword cConstant AgeAnalysisEnum
    12321239syn keyword cConstant AggressiveMigrationEnum
    12331240syn keyword cConstant AmrBamgEnum
    … …  
    16321639syn keyword cType Cfsurfacesquare
    16331640syn keyword cType Channel
    1634 syn keyword cType classes
    16351641syn keyword cType Constraint
    16361642syn keyword cType Constraints
    … …  
    16391645syn keyword cType ControlInput
    16401646syn keyword cType Covertree
     1647syn keyword cType DataSetParam
    16411648syn keyword cType DatasetInput
    1642 syn keyword cType DataSetParam
    16431649syn keyword cType Definition
    16441650syn keyword cType DependentObject
    … …  
    16531659syn keyword cType ElementInput
    16541660syn keyword cType ElementMatrix
     1661syn keyword cType ElementVector
    16551662syn keyword cType Elements
    1656 syn keyword cType ElementVector
    16571663syn keyword cType ExponentialVariogram
    16581664syn keyword cType ExternalResult
    … …  
    16611667syn keyword cType Friction
    16621668syn keyword cType Gauss
    1663 syn keyword cType GaussianVariogram
    1664 syn keyword cType gaussobjects
    16651669syn keyword cType GaussPenta
    16661670syn keyword cType GaussSeg
    16671671syn keyword cType GaussTetra
    16681672syn keyword cType GaussTria
     1673syn keyword cType GaussianVariogram
    16691674syn keyword cType GenericExternalResult
    16701675syn keyword cType GenericOption
    … …  
    16831688syn keyword cType IssmDirectApplicInterface
    16841689syn keyword cType IssmParallelDirectApplicInterface
    1685 syn keyword cType krigingobjects
    16861690syn keyword cType Load
    16871691syn keyword cType Loads
    … …  
    16941698syn keyword cType Matice
    16951699syn keyword cType Matlitho
    1696 syn keyword cType matrixobjects
    16971700syn keyword cType MatrixParam
    16981701syn keyword cType Misfit
    … …  
    17071710syn keyword cType Observations
    17081711syn keyword cType Option
     1712syn keyword cType OptionUtilities
    17091713syn keyword cType Options
    1710 syn keyword cType OptionUtilities
    17111714syn keyword cType Param
    17121715syn keyword cType Parameters
    … …  
    17221725syn keyword cType Regionaloutput
    17231726syn keyword cType Results
     1727syn keyword cType RiftStruct
    17241728syn keyword cType Riftfront
    1725 syn keyword cType RiftStruct
    17261729syn keyword cType SealevelGeometry
    17271730syn keyword cType Seg
    17281731syn keyword cType SegInput
     1732syn keyword cType SegRef
    17291733syn keyword cType Segment
    1730 syn keyword cType SegRef
    17311734syn keyword cType SpcDynamic
    17321735syn keyword cType SpcStatic
    … …  
    17471750syn keyword cType Vertex
    17481751syn keyword cType Vertices
     1752syn keyword cType classes
     1753syn keyword cType gaussobjects
     1754syn keyword cType krigingobjects
     1755syn keyword cType matrixobjects
    17491756syn keyword cType AdjointBalancethickness2Analysis
    17501757syn keyword cType AdjointBalancethicknessAnalysis
    17511758syn keyword cType AdjointHorizAnalysis
     1759syn keyword cType AgeAnalysis
    17521760syn keyword cType Analysis
    17531761syn keyword cType Balancethickness2Analysis

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

    r27132 r27154  
    1111        /*Parameters{{{*/
    1212        AdolcParamEnum,
     13        AgeStabilizationEnum,
     14        AgeNumRequestedOutputsEnum,
     15        AgeRequestedOutputsEnum,
    1316        AmrDeviatoricErrorGroupThresholdEnum,
    1417        AmrDeviatoricErrorMaximumEnum,
    … …  
    571574        ToolkitsTypesEnum,
    572575        TransientAmrFrequencyEnum,
     576        TransientIsageEnum,
    573577        TransientIsdamageevolutionEnum,
    574578        TransientIsesaEnum,
    … …  
    609613        AdjointyShearEnum,
    610614        AdjointzEnum,
     615        AgeEnum,
    611616        AirEnum,
    612617        ApproximationEnum,
    … …  
    12301235        AdjointBalancethicknessAnalysisEnum,
    12311236        AdjointHorizAnalysisEnum,
     1237        AgeAnalysisEnum,
    12321238        AggressiveMigrationEnum,
    12331239        AmrBamgEnum,

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

    r27132 r27154  
    1919                case ParametersSTARTEnum : return "ParametersSTART";
    2020                case AdolcParamEnum : return "AdolcParam";
     21                case AgeStabilizationEnum : return "AgeStabilization";
     22                case AgeNumRequestedOutputsEnum : return "AgeNumRequestedOutputs";
     23                case AgeRequestedOutputsEnum : return "AgeRequestedOutputs";
    2124                case AmrDeviatoricErrorGroupThresholdEnum : return "AmrDeviatoricErrorGroupThreshold";
    2225                case AmrDeviatoricErrorMaximumEnum : return "AmrDeviatoricErrorMaximum";
    … …  
    579582                case ToolkitsTypesEnum : return "ToolkitsTypes";
    580583                case TransientAmrFrequencyEnum : return "TransientAmrFrequency";
     584                case TransientIsageEnum : return "TransientIsage";
    581585                case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution";
    582586                case TransientIsesaEnum : return "TransientIsesa";
    … …  
    615619                case AdjointyShearEnum : return "AdjointyShear";
    616620                case AdjointzEnum : return "Adjointz";
     621                case AgeEnum : return "Age";
    617622                case AirEnum : return "Air";
    618623                case ApproximationEnum : return "Approximation";
    … …  
    12331238                case AdjointBalancethicknessAnalysisEnum : return "AdjointBalancethicknessAnalysis";
    12341239                case AdjointHorizAnalysisEnum : return "AdjointHorizAnalysis";
     1240                case AgeAnalysisEnum : return "AgeAnalysis";
    12351241                case AggressiveMigrationEnum : return "AggressiveMigration";
    12361242                case AmrBamgEnum : return "AmrBamg";

  • issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim

    r27131 r27154  
    1010syn keyword juliaConstC ParametersSTARTEnum
    1111syn keyword juliaConstC AdolcParamEnum
     12syn keyword juliaConstC AgeStabilizationEnum
     13syn keyword juliaConstC AgeNumRequestedOutputsEnum
     14syn keyword juliaConstC AgeRequestedOutputsEnum
    1215syn keyword juliaConstC AmrDeviatoricErrorGroupThresholdEnum
    1316syn keyword juliaConstC AmrDeviatoricErrorMaximumEnum
    … …  
    283286syn keyword juliaConstC LoveComplexComputationEnum
    284287syn keyword juliaConstC LoveQuadPrecisionEnum
     288syn keyword juliaConstC LoveIntStepsPerLayerEnum
    285289syn keyword juliaConstC LoveMinIntegrationStepsEnum
    286290syn keyword juliaConstC LoveMaxIntegrationdrEnum
    … …  
    569573syn keyword juliaConstC ToolkitsTypesEnum
    570574syn keyword juliaConstC TransientAmrFrequencyEnum
     575syn keyword juliaConstC TransientIsageEnum
    571576syn keyword juliaConstC TransientIsdamageevolutionEnum
    572577syn keyword juliaConstC TransientIsesaEnum
    … …  
    605610syn keyword juliaConstC AdjointyShearEnum
    606611syn keyword juliaConstC AdjointzEnum
     612syn keyword juliaConstC AgeEnum
    607613syn keyword juliaConstC AirEnum
    608614syn keyword juliaConstC ApproximationEnum
    … …  
    12231229syn keyword juliaConstC AdjointBalancethicknessAnalysisEnum
    12241230syn keyword juliaConstC AdjointHorizAnalysisEnum
     1231syn keyword juliaConstC AgeAnalysisEnum
    12251232syn keyword juliaConstC AggressiveMigrationEnum
    12261233syn keyword juliaConstC AmrBamgEnum

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

    r27132 r27154  
    1919              if (strcmp(name,"ParametersSTART")==0) return ParametersSTARTEnum;
    2020              else if (strcmp(name,"AdolcParam")==0) return AdolcParamEnum;
     21              else if (strcmp(name,"AgeStabilization")==0) return AgeStabilizationEnum;
     22              else if (strcmp(name,"AgeNumRequestedOutputs")==0) return AgeNumRequestedOutputsEnum;
     23              else if (strcmp(name,"AgeRequestedOutputs")==0) return AgeRequestedOutputsEnum;
    2124              else if (strcmp(name,"AmrDeviatoricErrorGroupThreshold")==0) return AmrDeviatoricErrorGroupThresholdEnum;
    2225              else if (strcmp(name,"AmrDeviatoricErrorMaximum")==0) return AmrDeviatoricErrorMaximumEnum;
    … …  
    134137              else if (strcmp(name,"CumBslcOcean")==0) return CumBslcOceanEnum;
    135138              else if (strcmp(name,"CumBslcIcePartition")==0) return CumBslcIcePartitionEnum;
    136               else if (strcmp(name,"CumBslcHydroPartition")==0) return CumBslcHydroPartitionEnum;
    137               else if (strcmp(name,"CumBslcOceanPartition")==0) return CumBslcOceanPartitionEnum;
    138               else if (strcmp(name,"CumGmtslc")==0) return CumGmtslcEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"CumGmslc")==0) return CumGmslcEnum;
     142              if (strcmp(name,"CumBslcHydroPartition")==0) return CumBslcHydroPartitionEnum;
     143              else if (strcmp(name,"CumBslcOceanPartition")==0) return CumBslcOceanPartitionEnum;
     144              else if (strcmp(name,"CumGmtslc")==0) return CumGmtslcEnum;
     145              else if (strcmp(name,"CumGmslc")==0) return CumGmslcEnum;
    143146              else if (strcmp(name,"DamageC1")==0) return DamageC1Enum;
    144147              else if (strcmp(name,"DamageC2")==0) return DamageC2Enum;
    … …  
    257260              else if (strcmp(name,"InputToExtrude")==0) return InputToExtrudeEnum;
    258261              else if (strcmp(name,"InputToL2Project")==0) return InputToL2ProjectEnum;
    259               else if (strcmp(name,"InputToSmooth")==0) return InputToSmoothEnum;
    260               else if (strcmp(name,"InversionAlgorithm")==0) return InversionAlgorithmEnum;
    261               else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum;
     265              if (strcmp(name,"InputToSmooth")==0) return InputToSmoothEnum;
     266              else if (strcmp(name,"InversionAlgorithm")==0) return InversionAlgorithmEnum;
     267              else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum;
     268              else if (strcmp(name,"InversionControlScalingFactors")==0) return InversionControlScalingFactorsEnum;
    266269              else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
    267270              else if (strcmp(name,"InversionDxmin")==0) return InversionDxminEnum;
    … …  
    380383              else if (strcmp(name,"QmuMethods")==0) return QmuMethodsEnum;
    381384              else if (strcmp(name,"RestartFileName")==0) return RestartFileNameEnum;
    382               else if (strcmp(name,"Results")==0) return ResultsEnum;
    383               else if (strcmp(name,"RootPath")==0) return RootPathEnum;
    384               else if (strcmp(name,"Modelname")==0) return ModelnameEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"SamplingAlpha")==0) return SamplingAlphaEnum;
     388              if (strcmp(name,"Results")==0) return ResultsEnum;
     389              else if (strcmp(name,"RootPath")==0) return RootPathEnum;
     390              else if (strcmp(name,"Modelname")==0) return ModelnameEnum;
     391              else if (strcmp(name,"SamplingAlpha")==0) return SamplingAlphaEnum;
    389392              else if (strcmp(name,"SamplingNumRequestedOutputs")==0) return SamplingNumRequestedOutputsEnum;
    390393              else if (strcmp(name,"SamplingRequestedOutputs")==0) return SamplingRequestedOutputsEnum;
    … …  
    503506              else if (strcmp(name,"SmbIsd18opd")==0) return SmbIsd18opdEnum;
    504507              else if (strcmp(name,"SmbIsdelta18o")==0) return SmbIsdelta18oEnum;
    505               else if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
    506               else if (strcmp(name,"SmbIsdeltaLWup")==0) return SmbIsdeltaLWupEnum;
    507               else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
     511              if (strcmp(name,"SmbIsdensification")==0) return SmbIsdensificationEnum;
     512              else if (strcmp(name,"SmbIsdeltaLWup")==0) return SmbIsdeltaLWupEnum;
     513              else if (strcmp(name,"SmbIsfirnwarming")==0) return SmbIsfirnwarmingEnum;
     514              else if (strcmp(name,"SmbIsgraingrowth")==0) return SmbIsgraingrowthEnum;
    512515              else if (strcmp(name,"SmbIsmelt")==0) return SmbIsmeltEnum;
    513516              else if (strcmp(name,"SmbIsmungsm")==0) return SmbIsmungsmEnum;
    … …  
    591594              else if (strcmp(name,"ToolkitsTypes")==0) return ToolkitsTypesEnum;
    592595              else if (strcmp(name,"TransientAmrFrequency")==0) return TransientAmrFrequencyEnum;
     596              else if (strcmp(name,"TransientIsage")==0) return TransientIsageEnum;
    593597              else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum;
    594598              else if (strcmp(name,"TransientIsesa")==0) return TransientIsesaEnum;
    … …  
    625629              else if (strcmp(name,"Adjointy")==0) return AdjointyEnum;
    626630              else if (strcmp(name,"AdjointyBase")==0) return AdjointyBaseEnum;
    627               else if (strcmp(name,"AdjointyShear")==0) return AdjointyShearEnum;
    628               else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
    629               else if (strcmp(name,"Air")==0) return AirEnum;
    630               else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"BalancethicknessMisfit")==0) return BalancethicknessMisfitEnum;
     634              if (strcmp(name,"AdjointyShear")==0) return AdjointyShearEnum;
     635              else if (strcmp(name,"Adjointz")==0) return AdjointzEnum;
     636              else if (strcmp(name,"Age")==0) return AgeEnum;
     637              else if (strcmp(name,"Air")==0) return AirEnum;
     638              else if (strcmp(name,"Approximation")==0) return ApproximationEnum;
     639              else if (strcmp(name,"BalancethicknessMisfit")==0) return BalancethicknessMisfitEnum;
    635640              else if (strcmp(name,"BalancethicknessOmega0")==0) return BalancethicknessOmega0Enum;
    636641              else if (strcmp(name,"BalancethicknessOmega")==0) return BalancethicknessOmegaEnum;
    … …  
    747752              else if (strcmp(name,"EsaRotationrate")==0) return EsaRotationrateEnum;
    748753              else if (strcmp(name,"EsaStrainratexx")==0) return EsaStrainratexxEnum;
    749               else if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
     754         else stage=7;
     755   }
     756   if(stage==7){
     757              if (strcmp(name,"EsaStrainratexy")==0) return EsaStrainratexyEnum;
    750758              else if (strcmp(name,"EsaStrainrateyy")==0) return EsaStrainrateyyEnum;
    751759              else if (strcmp(name,"EsaUmotion")==0) return EsaUmotionEnum;
    752760              else if (strcmp(name,"EsaXmotion")==0) return EsaXmotionEnum;
    753761              else if (strcmp(name,"EsaYmotion")==0) return EsaYmotionEnum;
    754          else stage=7;
    755    }
    756    if(stage==7){
    757               if (strcmp(name,"EtaDiff")==0) return EtaDiffEnum;
     762              else if (strcmp(name,"EtaDiff")==0) return EtaDiffEnum;
    758763              else if (strcmp(name,"FlowequationBorderFS")==0) return FlowequationBorderFSEnum;
    759764              else if (strcmp(name,"FrictionAs")==0) return FrictionAsEnum;
    … …  
    870875              else if (strcmp(name,"RadarPowerWolff")==0) return RadarPowerWolffEnum;
    871876              else if (strcmp(name,"RheologyBAbsGradient")==0) return RheologyBAbsGradientEnum;
    872               else if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
     877         else stage=8;
     878   }
     879   if(stage==8){
     880              if (strcmp(name,"RheologyBInitialguess")==0) return RheologyBInitialguessEnum;
    873881              else if (strcmp(name,"RheologyBInitialguessMisfit")==0) return RheologyBInitialguessMisfitEnum;
    874882              else if (strcmp(name,"RheologyBbarAbsGradient")==0) return RheologyBbarAbsGradientEnum;
    875883              else if (strcmp(name,"Sample")==0) return SampleEnum;
    876884              else if (strcmp(name,"SampleOld")==0) return SampleOldEnum;
    877          else stage=8;
    878    }
    879    if(stage==8){
    880               if (strcmp(name,"SampleNoise")==0) return SampleNoiseEnum;
     885              else if (strcmp(name,"SampleNoise")==0) return SampleNoiseEnum;
    881886              else if (strcmp(name,"SamplingBeta")==0) return SamplingBetaEnum;
    882887              else if (strcmp(name,"SamplingKappa")==0) return SamplingKappaEnum;
    … …  
    993998              else if (strcmp(name,"SmbDzMin")==0) return SmbDzMinEnum;
    994999              else if (strcmp(name,"SmbDzTop")==0) return SmbDzTopEnum;
    995               else if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
     1000         else stage=9;
     1001   }
     1002   if(stage==9){
     1003              if (strcmp(name,"SmbDzini")==0) return SmbDziniEnum;
    9961004              else if (strcmp(name,"SmbEAir")==0) return SmbEAirEnum;
    9971005              else if (strcmp(name,"SmbEC")==0) return SmbECEnum;
    9981006              else if (strcmp(name,"SmbECDt")==0) return SmbECDtEnum;
    9991007              else if (strcmp(name,"SmbECini")==0) return SmbECiniEnum;
    1000          else stage=9;
    1001    }
    1002    if(stage==9){
    1003               if (strcmp(name,"SmbEla")==0) return SmbElaEnum;
     1008              else if (strcmp(name,"SmbEla")==0) return SmbElaEnum;
    10041009              else if (strcmp(name,"SmbEvaporation")==0) return SmbEvaporationEnum;
    10051010              else if (strcmp(name,"SmbFAC")==0) return SmbFACEnum;
    … …  
    11161121              else if (strcmp(name,"ThicknessOld")==0) return ThicknessOldEnum;
    11171122              else if (strcmp(name,"ThicknessPositive")==0) return ThicknessPositiveEnum;
    1118               else if (strcmp(name,"ThicknessResidual")==0) return ThicknessResidualEnum;
     1123         else stage=10;
     1124   }
     1125   if(stage==10){
     1126              if (strcmp(name,"ThicknessResidual")==0) return ThicknessResidualEnum;
    11191127              else if (strcmp(name,"TransientAccumulatedDeltaIceThickness")==0) return TransientAccumulatedDeltaIceThicknessEnum;
    11201128              else if (strcmp(name,"Vel")==0) return VelEnum;
    11211129              else if (strcmp(name,"VxAverage")==0) return VxAverageEnum;
    11221130              else if (strcmp(name,"VxBase")==0) return VxBaseEnum;
    1123          else stage=10;
    1124    }
    1125    if(stage==10){
    1126               if (strcmp(name,"Vx")==0) return VxEnum;
     1131              else if (strcmp(name,"Vx")==0) return VxEnum;
    11271132              else if (strcmp(name,"VxMesh")==0) return VxMeshEnum;
    11281133              else if (strcmp(name,"VxObs")==0) return VxObsEnum;
    … …  
    12391244              else if (strcmp(name,"Outputdefinition86")==0) return Outputdefinition86Enum;
    12401245              else if (strcmp(name,"Outputdefinition87")==0) return Outputdefinition87Enum;
    1241               else if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum;
     1246         else stage=11;
     1247   }
     1248   if(stage==11){
     1249              if (strcmp(name,"Outputdefinition88")==0) return Outputdefinition88Enum;
    12421250              else if (strcmp(name,"Outputdefinition89")==0) return Outputdefinition89Enum;
    12431251              else if (strcmp(name,"Outputdefinition8")==0) return Outputdefinition8Enum;
    12441252              else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
    12451253              else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
    1246          else stage=11;
    1247    }
    1248    if(stage==11){
    1249               if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
     1254              else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
    12501255              else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
    12511256              else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
    … …  
    12631268              else if (strcmp(name,"AdjointBalancethicknessAnalysis")==0) return AdjointBalancethicknessAnalysisEnum;
    12641269              else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum;
     1270              else if (strcmp(name,"AgeAnalysis")==0) return AgeAnalysisEnum;
    12651271              else if (strcmp(name,"AggressiveMigration")==0) return AggressiveMigrationEnum;
    12661272              else if (strcmp(name,"AmrBamg")==0) return AmrBamgEnum;
    … …  
    13611367              else if (strcmp(name,"FloatingAreaScaled")==0) return FloatingAreaScaledEnum;
    13621368              else if (strcmp(name,"FloatingMeltRate")==0) return FloatingMeltRateEnum;
    1363               else if (strcmp(name,"Free")==0) return FreeEnum;
     1369         else stage=12;
     1370   }
     1371   if(stage==12){
     1372              if (strcmp(name,"Free")==0) return FreeEnum;
    13641373              else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
    13651374              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
    … …  
    13671376              else if (strcmp(name,"FrontalForcingsRignot")==0) return FrontalForcingsRignotEnum;
    13681377              else if (strcmp(name,"FrontalForcingsRignotAutoregression")==0) return FrontalForcingsRignotAutoregressionEnum;
    1369          else stage=12;
    1370    }
    1371    if(stage==12){
    1372               if (strcmp(name,"Fset")==0) return FsetEnum;
     1378              else if (strcmp(name,"Fset")==0) return FsetEnum;
    13731379              else if (strcmp(name,"FullMeltOnPartiallyFloating")==0) return FullMeltOnPartiallyFloatingEnum;
    13741380              else if (strcmp(name,"GLheightadvectionAnalysis")==0) return GLheightadvectionAnalysisEnum;
    … …  
    14841490              else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum;
    14851491              else if (strcmp(name,"MeshX")==0) return MeshXEnum;
    1486               else if (strcmp(name,"MeshY")==0) return MeshYEnum;
     1492         else stage=13;
     1493   }
     1494   if(stage==13){
     1495              if (strcmp(name,"MeshY")==0) return MeshYEnum;
    14871496              else if (strcmp(name,"MinVel")==0) return MinVelEnum;
    14881497              else if (strcmp(name,"MinVx")==0) return MinVxEnum;
    … …  
    14901499              else if (strcmp(name,"MinVz")==0) return MinVzEnum;
    14911500              else if (strcmp(name,"MismipFloatingMeltRate")==0) return MismipFloatingMeltRateEnum;
    1492          else stage=13;
    1493    }
    1494    if(stage==13){
    1495               if (strcmp(name,"Moulin")==0) return MoulinEnum;
     1501              else if (strcmp(name,"Moulin")==0) return MoulinEnum;
    14961502              else if (strcmp(name,"MpiDense")==0) return MpiDenseEnum;
    14971503              else if (strcmp(name,"Mpi")==0) return MpiEnum;
    … …  
    16071613              else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum;
    16081614              else if (strcmp(name,"SurfaceSlopeSolution")==0) return SurfaceSlopeSolutionEnum;
    1609               else if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
     1615         else stage=14;
     1616   }
     1617   if(stage==14){
     1618              if (strcmp(name,"TaylorHood")==0) return TaylorHoodEnum;
    16101619              else if (strcmp(name,"Tetra")==0) return TetraEnum;
    16111620              else if (strcmp(name,"TetraInput")==0) return TetraInputEnum;
    … …  
    16131622              else if (strcmp(name,"ThermalSolution")==0) return ThermalSolutionEnum;
    16141623              else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
    1615          else stage=14;
    1616    }
    1617    if(stage==14){
    1618               if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum;
     1624              else if (strcmp(name,"TotalCalvingFluxLevelset")==0) return TotalCalvingFluxLevelsetEnum;
    16191625              else if (strcmp(name,"TotalCalvingMeltingFluxLevelset")==0) return TotalCalvingMeltingFluxLevelsetEnum;
    16201626              else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;

  • issm/trunk-jpl/src/c/shared/Enum/Synchronize.sh

    r26874 r27154  
    1717
    1818#Deal with Analyses
    19 if false ; then
     19if false; then
    2020#Build EnumToAnalysis.cpp {{{
    2121#Header
Note: See TracChangeset for help on using the changeset viewer.