Changeset 23107


Ignore:
Timestamp:
08/17/18 11:41:40 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: minor

Location:
issm/trunk-jpl
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/configure.ac

    r22760 r23107  
    33#AUTOCONF
    44AC_INIT([Ice Sheet System Model (ISSM)],[4.14],[issm@jpl.nasa.gov],[issm],[http://issm.jpl.nasa.gov]) #Initializing configure
    5 AC_CONFIG_AUX_DIR([./aux-config])         #Put config files in aux-config
    6 AC_CONFIG_MACRO_DIR([m4])                 #m4 macros are located in m4
     5AC_CONFIG_AUX_DIR([./aux-config])  #Put config files in aux-config
     6AC_CONFIG_MACRO_DIR([m4])          #m4 macros are located in m4
    77m4_include([m4/issm_options.m4])
    88
    … …  
    2525#Initialize automake and declare foreign so that we don't need a ChangeLog, INSTALL, etc
    2626AM_INIT_AUTOMAKE([foreign])
    27 AC_CONFIG_HEADERS([./config.h])   #Config file must be config.h
     27AC_CONFIG_HEADERS([./config.h])  #Config file must be config.h
    2828AM_SILENT_RULES([yes])           #Do not show compilation command by default
    2929AM_PROG_AR

  • issm/trunk-jpl/etc/environment.sh

    r21905 r23107  
    235235
    236236PYTHON_DIR="$ISSM_DIR/externalpackages/python/install"
    237 if [ -d "$PYTHON_DIR" ]; then
    238         export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/lib"
    239         pathprepend    "$PYTHON_DIR/bin"
    240         libpathprepend "$PYTHON_DIR/lib"
    241         libpathprepend "$ISSM_DIR/lib"
    242 fi
     237#if [ -d "$PYTHON_DIR" ]; then
     238        #export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/lib"
     239        #pathprepend    "$PYTHON_DIR/bin"
     240        #libpathprepend "$PYTHON_DIR/lib"
     241        #libpathprepend "$ISSM_DIR/lib"
     242#fi
    243243
    244244MODELE_DIR="$ISSM_DIR/externalpackages/modelE/install"

  • issm/trunk-jpl/examples/Inversion/runme.m

    r21153 r23107  
    1 step=1;
     1step=1:4;
    22if any(step==1)
    33        %Generate observations

  • issm/trunk-jpl/externalpackages/dem/dem.m

    r14224 r23107  
    119119decim = 0;
    120120
    121 novalue_color = [0,0,0];
     121%novalue_color = [0,0,0];
     122novalue_color = [1,1,1];
    122123
    123124if ~isnumeric(x) | ~isnumeric(y) | ~isnumeric(z)

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

    r23021 r23107  
    1111
    1212dnl with-AdjointBalancethickness2{{{
    13 
    1413AC_ARG_WITH([AdjointBalancethickness2],
    15 
    1614        AS_HELP_STRING([--with-AdjointBalancethickness2 = YES], [compile with AdjointBalancethickness2 capabilities (default is yes)]),
    17 
    1815        [ADJOINTBALANCETHICKNESS2=$withval],[ADJOINTBALANCETHICKNESS2=yes])
    19 
    2016AC_MSG_CHECKING(for AdjointBalancethickness2 capability compilation)
    2117
    22 
    2318HAVE_ADJOINTBALANCETHICKNESS2=no
    24 
    2519if test "x$ADJOINTBALANCETHICKNESS2" = "xyes"; then
    26 
    2720        HAVE_ADJOINTBALANCETHICKNESS2=yes
    28 
    2921        AC_DEFINE([_HAVE_ADJOINTBALANCETHICKNESS2_],[1],[with AdjointBalancethickness2 capability])
    30 
    31 fi
    32 
     22fi
    3323AM_CONDITIONAL([ADJOINTBALANCETHICKNESS2], [test x$HAVE_ADJOINTBALANCETHICKNESS2 = xyes])
    34 
    3524AC_MSG_RESULT($HAVE_ADJOINTBALANCETHICKNESS2)
    36 
    3725dnl }}}
    3826dnl with-AdjointBalancethickness{{{
    39 
    4027AC_ARG_WITH([AdjointBalancethickness],
    41 
    4228        AS_HELP_STRING([--with-AdjointBalancethickness = YES], [compile with AdjointBalancethickness capabilities (default is yes)]),
    43 
    4429        [ADJOINTBALANCETHICKNESS=$withval],[ADJOINTBALANCETHICKNESS=yes])
    45 
    4630AC_MSG_CHECKING(for AdjointBalancethickness capability compilation)
    4731
    48 
    4932HAVE_ADJOINTBALANCETHICKNESS=no
    50 
    5133if test "x$ADJOINTBALANCETHICKNESS" = "xyes"; then
    52 
    5334        HAVE_ADJOINTBALANCETHICKNESS=yes
    54 
    5535        AC_DEFINE([_HAVE_ADJOINTBALANCETHICKNESS_],[1],[with AdjointBalancethickness capability])
    56 
    57 fi
    58 
     36fi
    5937AM_CONDITIONAL([ADJOINTBALANCETHICKNESS], [test x$HAVE_ADJOINTBALANCETHICKNESS = xyes])
    60 
    6138AC_MSG_RESULT($HAVE_ADJOINTBALANCETHICKNESS)
    62 
    6339dnl }}}
    6440dnl with-AdjointHoriz{{{
    65 
    6641AC_ARG_WITH([AdjointHoriz],
    67 
    6842        AS_HELP_STRING([--with-AdjointHoriz = YES], [compile with AdjointHoriz capabilities (default is yes)]),
    69 
    7043        [ADJOINTHORIZ=$withval],[ADJOINTHORIZ=yes])
    71 
    7244AC_MSG_CHECKING(for AdjointHoriz capability compilation)
    7345
    74 
    7546HAVE_ADJOINTHORIZ=no
    76 
    7747if test "x$ADJOINTHORIZ" = "xyes"; then
    78 
    7948        HAVE_ADJOINTHORIZ=yes
    80 
    8149        AC_DEFINE([_HAVE_ADJOINTHORIZ_],[1],[with AdjointHoriz capability])
    82 
    83 fi
    84 
     50fi
    8551AM_CONDITIONAL([ADJOINTHORIZ], [test x$HAVE_ADJOINTHORIZ = xyes])
    86 
    8752AC_MSG_RESULT($HAVE_ADJOINTHORIZ)
    88 
    8953dnl }}}
    9054dnl with-Balancethickness2{{{
    91 
    9255AC_ARG_WITH([Balancethickness2],
    93 
    9456        AS_HELP_STRING([--with-Balancethickness2 = YES], [compile with Balancethickness2 capabilities (default is yes)]),
    95 
    9657        [BALANCETHICKNESS2=$withval],[BALANCETHICKNESS2=yes])
    97 
    9858AC_MSG_CHECKING(for Balancethickness2 capability compilation)
    9959
    100 
    10160HAVE_BALANCETHICKNESS2=no
    102 
    10361if test "x$BALANCETHICKNESS2" = "xyes"; then
    104 
    10562        HAVE_BALANCETHICKNESS2=yes
    106 
    10763        AC_DEFINE([_HAVE_BALANCETHICKNESS2_],[1],[with Balancethickness2 capability])
    108 
    109 fi
    110 
     64fi
    11165AM_CONDITIONAL([BALANCETHICKNESS2], [test x$HAVE_BALANCETHICKNESS2 = xyes])
    112 
    11366AC_MSG_RESULT($HAVE_BALANCETHICKNESS2)
    114 
    11567dnl }}}
    11668dnl with-Balancethickness{{{
    117 
    11869AC_ARG_WITH([Balancethickness],
    119 
    12070        AS_HELP_STRING([--with-Balancethickness = YES], [compile with Balancethickness capabilities (default is yes)]),
    121 
    12271        [BALANCETHICKNESS=$withval],[BALANCETHICKNESS=yes])
    123 
    12472AC_MSG_CHECKING(for Balancethickness capability compilation)
    12573
    126 
    12774HAVE_BALANCETHICKNESS=no
    128 
    12975if test "x$BALANCETHICKNESS" = "xyes"; then
    130 
    13176        HAVE_BALANCETHICKNESS=yes
    132 
    13377        AC_DEFINE([_HAVE_BALANCETHICKNESS_],[1],[with Balancethickness capability])
    134 
    135 fi
    136 
     78fi
    13779AM_CONDITIONAL([BALANCETHICKNESS], [test x$HAVE_BALANCETHICKNESS = xyes])
    138 
    13980AC_MSG_RESULT($HAVE_BALANCETHICKNESS)
    140 
    14181dnl }}}
    14282dnl with-BalancethicknessSoft{{{
    143 
    14483AC_ARG_WITH([BalancethicknessSoft],
    145 
    14684        AS_HELP_STRING([--with-BalancethicknessSoft = YES], [compile with BalancethicknessSoft capabilities (default is yes)]),
    147 
    14885        [BALANCETHICKNESSSOFT=$withval],[BALANCETHICKNESSSOFT=yes])
    149 
    15086AC_MSG_CHECKING(for BalancethicknessSoft capability compilation)
    15187
    152 
    15388HAVE_BALANCETHICKNESSSOFT=no
    154 
    15589if test "x$BALANCETHICKNESSSOFT" = "xyes"; then
    156 
    15790        HAVE_BALANCETHICKNESSSOFT=yes
    158 
    15991        AC_DEFINE([_HAVE_BALANCETHICKNESSSOFT_],[1],[with BalancethicknessSoft capability])
    160 
    161 fi
    162 
     92fi
    16393AM_CONDITIONAL([BALANCETHICKNESSSOFT], [test x$HAVE_BALANCETHICKNESSSOFT = xyes])
    164 
    16594AC_MSG_RESULT($HAVE_BALANCETHICKNESSSOFT)
    166 
    16795dnl }}}
    16896dnl with-Balancevelocity{{{
    169 
    17097AC_ARG_WITH([Balancevelocity],
    171 
    17298        AS_HELP_STRING([--with-Balancevelocity = YES], [compile with Balancevelocity capabilities (default is yes)]),
    173 
    17499        [BALANCEVELOCITY=$withval],[BALANCEVELOCITY=yes])
    175 
    176100AC_MSG_CHECKING(for Balancevelocity capability compilation)
    177101
    178 
    179102HAVE_BALANCEVELOCITY=no
    180 
    181103if test "x$BALANCEVELOCITY" = "xyes"; then
    182 
    183104        HAVE_BALANCEVELOCITY=yes
    184 
    185105        AC_DEFINE([_HAVE_BALANCEVELOCITY_],[1],[with Balancevelocity capability])
    186 
    187 fi
    188 
     106fi
    189107AM_CONDITIONAL([BALANCEVELOCITY], [test x$HAVE_BALANCEVELOCITY = xyes])
    190 
    191108AC_MSG_RESULT($HAVE_BALANCEVELOCITY)
    192 
    193109dnl }}}
    194110dnl with-DamageEvolution{{{
    195 
    196111AC_ARG_WITH([DamageEvolution],
    197 
    198112        AS_HELP_STRING([--with-DamageEvolution = YES], [compile with DamageEvolution capabilities (default is yes)]),
    199 
    200113        [DAMAGEEVOLUTION=$withval],[DAMAGEEVOLUTION=yes])
    201 
    202114AC_MSG_CHECKING(for DamageEvolution capability compilation)
    203115
    204 
    205116HAVE_DAMAGEEVOLUTION=no
    206 
    207117if test "x$DAMAGEEVOLUTION" = "xyes"; then
    208 
    209118        HAVE_DAMAGEEVOLUTION=yes
    210 
    211119        AC_DEFINE([_HAVE_DAMAGEEVOLUTION_],[1],[with DamageEvolution capability])
    212 
    213 fi
    214 
     120fi
    215121AM_CONDITIONAL([DAMAGEEVOLUTION], [test x$HAVE_DAMAGEEVOLUTION = xyes])
    216 
    217122AC_MSG_RESULT($HAVE_DAMAGEEVOLUTION)
    218 
    219123dnl }}}
    220124dnl with-DepthAverage{{{
    221 
    222125AC_ARG_WITH([DepthAverage],
    223 
    224126        AS_HELP_STRING([--with-DepthAverage = YES], [compile with DepthAverage capabilities (default is yes)]),
    225 
    226127        [DEPTHAVERAGE=$withval],[DEPTHAVERAGE=yes])
    227 
    228128AC_MSG_CHECKING(for DepthAverage capability compilation)
    229129
    230 
    231130HAVE_DEPTHAVERAGE=no
    232 
    233131if test "x$DEPTHAVERAGE" = "xyes"; then
    234 
    235132        HAVE_DEPTHAVERAGE=yes
    236 
    237133        AC_DEFINE([_HAVE_DEPTHAVERAGE_],[1],[with DepthAverage capability])
    238 
    239 fi
    240 
     134fi
    241135AM_CONDITIONAL([DEPTHAVERAGE], [test x$HAVE_DEPTHAVERAGE = xyes])
    242 
    243136AC_MSG_RESULT($HAVE_DEPTHAVERAGE)
    244 
    245137dnl }}}
    246138dnl with-Enthalpy{{{
    247 
    248139AC_ARG_WITH([Enthalpy],
    249 
    250140        AS_HELP_STRING([--with-Enthalpy = YES], [compile with Enthalpy capabilities (default is yes)]),
    251 
    252141        [ENTHALPY=$withval],[ENTHALPY=yes])
    253 
    254142AC_MSG_CHECKING(for Enthalpy capability compilation)
    255143
    256 
    257144HAVE_ENTHALPY=no
    258 
    259145if test "x$ENTHALPY" = "xyes"; then
    260 
    261146        HAVE_ENTHALPY=yes
    262 
    263147        AC_DEFINE([_HAVE_ENTHALPY_],[1],[with Enthalpy capability])
    264 
    265 fi
    266 
     148fi
    267149AM_CONDITIONAL([ENTHALPY], [test x$HAVE_ENTHALPY = xyes])
    268 
    269150AC_MSG_RESULT($HAVE_ENTHALPY)
    270 
    271151dnl }}}
    272152dnl with-Esa{{{
    273 
    274153AC_ARG_WITH([Esa],
    275 
    276154        AS_HELP_STRING([--with-Esa = YES], [compile with Esa capabilities (default is yes)]),
    277 
    278155        [ESA=$withval],[ESA=yes])
    279 
    280156AC_MSG_CHECKING(for Esa capability compilation)
    281157
    282 
    283158HAVE_ESA=no
    284 
    285159if test "x$ESA" = "xyes"; then
    286 
    287160        HAVE_ESA=yes
    288 
    289161        AC_DEFINE([_HAVE_ESA_],[1],[with Esa capability])
    290 
    291 fi
    292 
     162fi
    293163AM_CONDITIONAL([ESA], [test x$HAVE_ESA = xyes])
    294 
    295164AC_MSG_RESULT($HAVE_ESA)
    296 
    297165dnl }}}
    298166dnl with-Extrapolation{{{
    299 
    300167AC_ARG_WITH([Extrapolation],
    301 
    302168        AS_HELP_STRING([--with-Extrapolation = YES], [compile with Extrapolation capabilities (default is yes)]),
    303 
    304169        [EXTRAPOLATION=$withval],[EXTRAPOLATION=yes])
    305 
    306170AC_MSG_CHECKING(for Extrapolation capability compilation)
    307171
    308 
    309172HAVE_EXTRAPOLATION=no
    310 
    311173if test "x$EXTRAPOLATION" = "xyes"; then
    312 
    313174        HAVE_EXTRAPOLATION=yes
    314 
    315175        AC_DEFINE([_HAVE_EXTRAPOLATION_],[1],[with Extrapolation capability])
    316 
    317 fi
    318 
     176fi
    319177AM_CONDITIONAL([EXTRAPOLATION], [test x$HAVE_EXTRAPOLATION = xyes])
    320 
    321178AC_MSG_RESULT($HAVE_EXTRAPOLATION)
    322 
    323179dnl }}}
    324180dnl with-ExtrudeFromBase{{{
    325 
    326181AC_ARG_WITH([ExtrudeFromBase],
    327 
    328182        AS_HELP_STRING([--with-ExtrudeFromBase = YES], [compile with ExtrudeFromBase capabilities (default is yes)]),
    329 
    330183        [EXTRUDEFROMBASE=$withval],[EXTRUDEFROMBASE=yes])
    331 
    332184AC_MSG_CHECKING(for ExtrudeFromBase capability compilation)
    333185
    334 
    335186HAVE_EXTRUDEFROMBASE=no
    336 
    337187if test "x$EXTRUDEFROMBASE" = "xyes"; then
    338 
    339188        HAVE_EXTRUDEFROMBASE=yes
    340 
    341189        AC_DEFINE([_HAVE_EXTRUDEFROMBASE_],[1],[with ExtrudeFromBase capability])
    342 
    343 fi
    344 
     190fi
    345191AM_CONDITIONAL([EXTRUDEFROMBASE], [test x$HAVE_EXTRUDEFROMBASE = xyes])
    346 
    347192AC_MSG_RESULT($HAVE_EXTRUDEFROMBASE)
    348 
    349193dnl }}}
    350194dnl with-ExtrudeFromTop{{{
    351 
    352195AC_ARG_WITH([ExtrudeFromTop],
    353 
    354196        AS_HELP_STRING([--with-ExtrudeFromTop = YES], [compile with ExtrudeFromTop capabilities (default is yes)]),
    355 
    356197        [EXTRUDEFROMTOP=$withval],[EXTRUDEFROMTOP=yes])
    357 
    358198AC_MSG_CHECKING(for ExtrudeFromTop capability compilation)
    359199
    360 
    361200HAVE_EXTRUDEFROMTOP=no
    362 
    363201if test "x$EXTRUDEFROMTOP" = "xyes"; then
    364 
    365202        HAVE_EXTRUDEFROMTOP=yes
    366 
    367203        AC_DEFINE([_HAVE_EXTRUDEFROMTOP_],[1],[with ExtrudeFromTop capability])
    368 
    369 fi
    370 
     204fi
    371205AM_CONDITIONAL([EXTRUDEFROMTOP], [test x$HAVE_EXTRUDEFROMTOP = xyes])
    372 
    373206AC_MSG_RESULT($HAVE_EXTRUDEFROMTOP)
    374 
    375207dnl }}}
    376208dnl with-FreeSurfaceBase{{{
    377 
    378209AC_ARG_WITH([FreeSurfaceBase],
    379 
    380210        AS_HELP_STRING([--with-FreeSurfaceBase = YES], [compile with FreeSurfaceBase capabilities (default is yes)]),
    381 
    382211        [FREESURFACEBASE=$withval],[FREESURFACEBASE=yes])
    383 
    384212AC_MSG_CHECKING(for FreeSurfaceBase capability compilation)
    385213
    386 
    387214HAVE_FREESURFACEBASE=no
    388 
    389215if test "x$FREESURFACEBASE" = "xyes"; then
    390 
    391216        HAVE_FREESURFACEBASE=yes
    392 
    393217        AC_DEFINE([_HAVE_FREESURFACEBASE_],[1],[with FreeSurfaceBase capability])
    394 
    395 fi
    396 
     218fi
    397219AM_CONDITIONAL([FREESURFACEBASE], [test x$HAVE_FREESURFACEBASE = xyes])
    398 
    399220AC_MSG_RESULT($HAVE_FREESURFACEBASE)
    400 
    401221dnl }}}
    402222dnl with-FreeSurfaceTop{{{
    403 
    404223AC_ARG_WITH([FreeSurfaceTop],
    405 
    406224        AS_HELP_STRING([--with-FreeSurfaceTop = YES], [compile with FreeSurfaceTop capabilities (default is yes)]),
    407 
    408225        [FREESURFACETOP=$withval],[FREESURFACETOP=yes])
    409 
    410226AC_MSG_CHECKING(for FreeSurfaceTop capability compilation)
    411227
    412 
    413228HAVE_FREESURFACETOP=no
    414 
    415229if test "x$FREESURFACETOP" = "xyes"; then
    416 
    417230        HAVE_FREESURFACETOP=yes
    418 
    419231        AC_DEFINE([_HAVE_FREESURFACETOP_],[1],[with FreeSurfaceTop capability])
    420 
    421 fi
    422 
     232fi
    423233AM_CONDITIONAL([FREESURFACETOP], [test x$HAVE_FREESURFACETOP = xyes])
    424 
    425234AC_MSG_RESULT($HAVE_FREESURFACETOP)
    426 
    427235dnl }}}
    428236dnl with-GLheightadvection{{{
    429 
    430237AC_ARG_WITH([GLheightadvection],
    431 
    432238        AS_HELP_STRING([--with-GLheightadvection = YES], [compile with GLheightadvection capabilities (default is yes)]),
    433 
    434239        [GLHEIGHTADVECTION=$withval],[GLHEIGHTADVECTION=yes])
    435 
    436240AC_MSG_CHECKING(for GLheightadvection capability compilation)
    437241
    438 
    439242HAVE_GLHEIGHTADVECTION=no
    440 
    441243if test "x$GLHEIGHTADVECTION" = "xyes"; then
    442 
    443244        HAVE_GLHEIGHTADVECTION=yes
    444 
    445245        AC_DEFINE([_HAVE_GLHEIGHTADVECTION_],[1],[with GLheightadvection capability])
    446 
    447 fi
    448 
     246fi
    449247AM_CONDITIONAL([GLHEIGHTADVECTION], [test x$HAVE_GLHEIGHTADVECTION = xyes])
    450 
    451248AC_MSG_RESULT($HAVE_GLHEIGHTADVECTION)
    452 
    453249dnl }}}
    454250dnl with-GiaIvins{{{
    455 
    456251AC_ARG_WITH([GiaIvins],
    457 
    458252        AS_HELP_STRING([--with-GiaIvins = YES], [compile with GiaIvins capabilities (default is yes)]),
    459 
    460253        [GIAIVINS=$withval],[GIAIVINS=yes])
    461 
    462254AC_MSG_CHECKING(for GiaIvins capability compilation)
    463255
    464 
    465256HAVE_GIAIVINS=no
    466 
    467257if test "x$GIAIVINS" = "xyes"; then
    468 
    469258        HAVE_GIAIVINS=yes
    470 
    471259        AC_DEFINE([_HAVE_GIAIVINS_],[1],[with GiaIvins capability])
    472 
    473 fi
    474 
     260fi
    475261AM_CONDITIONAL([GIAIVINS], [test x$HAVE_GIAIVINS = xyes])
    476 
    477262AC_MSG_RESULT($HAVE_GIAIVINS)
    478 
    479263dnl }}}
    480264dnl with-HydrologyDCEfficient{{{
    481 
    482265AC_ARG_WITH([HydrologyDCEfficient],
    483 
    484266        AS_HELP_STRING([--with-HydrologyDCEfficient = YES], [compile with HydrologyDCEfficient capabilities (default is yes)]),
    485 
    486267        [HYDROLOGYDCEFFICIENT=$withval],[HYDROLOGYDCEFFICIENT=yes])
    487 
    488268AC_MSG_CHECKING(for HydrologyDCEfficient capability compilation)
    489269
    490 
    491270HAVE_HYDROLOGYDCEFFICIENT=no
    492 
    493271if test "x$HYDROLOGYDCEFFICIENT" = "xyes"; then
    494 
    495272        HAVE_HYDROLOGYDCEFFICIENT=yes
    496 
    497273        AC_DEFINE([_HAVE_HYDROLOGYDCEFFICIENT_],[1],[with HydrologyDCEfficient capability])
    498 
    499 fi
    500 
     274fi
    501275AM_CONDITIONAL([HYDROLOGYDCEFFICIENT], [test x$HAVE_HYDROLOGYDCEFFICIENT = xyes])
    502 
    503276AC_MSG_RESULT($HAVE_HYDROLOGYDCEFFICIENT)
    504 
    505277dnl }}}
    506278dnl with-HydrologyDCInefficient{{{
    507 
    508279AC_ARG_WITH([HydrologyDCInefficient],
    509 
    510280        AS_HELP_STRING([--with-HydrologyDCInefficient = YES], [compile with HydrologyDCInefficient capabilities (default is yes)]),
    511 
    512281        [HYDROLOGYDCINEFFICIENT=$withval],[HYDROLOGYDCINEFFICIENT=yes])
    513 
    514282AC_MSG_CHECKING(for HydrologyDCInefficient capability compilation)
    515283
    516 
    517284HAVE_HYDROLOGYDCINEFFICIENT=no
    518 
    519285if test "x$HYDROLOGYDCINEFFICIENT" = "xyes"; then
    520 
    521286        HAVE_HYDROLOGYDCINEFFICIENT=yes
    522 
    523287        AC_DEFINE([_HAVE_HYDROLOGYDCINEFFICIENT_],[1],[with HydrologyDCInefficient capability])
    524 
    525 fi
    526 
     288fi
    527289AM_CONDITIONAL([HYDROLOGYDCINEFFICIENT], [test x$HAVE_HYDROLOGYDCINEFFICIENT = xyes])
    528 
    529290AC_MSG_RESULT($HAVE_HYDROLOGYDCINEFFICIENT)
    530 
    531291dnl }}}
    532292dnl with-HydrologyShreve{{{
    533 
    534293AC_ARG_WITH([HydrologyShreve],
    535 
    536294        AS_HELP_STRING([--with-HydrologyShreve = YES], [compile with HydrologyShreve capabilities (default is yes)]),
    537 
    538295        [HYDROLOGYSHREVE=$withval],[HYDROLOGYSHREVE=yes])
    539 
    540296AC_MSG_CHECKING(for HydrologyShreve capability compilation)
    541297
    542 
    543298HAVE_HYDROLOGYSHREVE=no
    544 
    545299if test "x$HYDROLOGYSHREVE" = "xyes"; then
    546 
    547300        HAVE_HYDROLOGYSHREVE=yes
    548 
    549301        AC_DEFINE([_HAVE_HYDROLOGYSHREVE_],[1],[with HydrologyShreve capability])
    550 
    551 fi
    552 
     302fi
    553303AM_CONDITIONAL([HYDROLOGYSHREVE], [test x$HAVE_HYDROLOGYSHREVE = xyes])
    554 
    555304AC_MSG_RESULT($HAVE_HYDROLOGYSHREVE)
    556 
    557305dnl }}}
    558306dnl with-HydrologyShakti{{{
    559 
    560307AC_ARG_WITH([HydrologyShakti],
    561 
    562308        AS_HELP_STRING([--with-HydrologyShakti = YES], [compile with HydrologyShakti capabilities (default is yes)]),
    563 
    564309        [HYDROLOGYSHAKTI=$withval],[HYDROLOGYSHAKTI=yes])
    565 
    566310AC_MSG_CHECKING(for HydrologyShakti capability compilation)
    567311
    568 
    569312HAVE_HYDROLOGYSHAKTI=no
    570 
    571313if test "x$HYDROLOGYSHAKTI" = "xyes"; then
    572 
    573314        HAVE_HYDROLOGYSHAKTI=yes
    574 
    575315        AC_DEFINE([_HAVE_HYDROLOGYSHAKTI_],[1],[with HydrologyShakti capability])
    576 
    577 fi
    578 
     316fi
    579317AM_CONDITIONAL([HYDROLOGYSHAKTI], [test x$HAVE_HYDROLOGYSHAKTI = xyes])
    580 
    581318AC_MSG_RESULT($HAVE_HYDROLOGYSHAKTI)
    582 
    583319dnl }}}
    584320dnl with-HydrologyPism{{{
    585 
    586321AC_ARG_WITH([HydrologyPism],
    587 
    588322        AS_HELP_STRING([--with-HydrologyPism = YES], [compile with HydrologyPism capabilities (default is yes)]),
    589 
    590323        [HYDROLOGYPISM=$withval],[HYDROLOGYPISM=yes])
    591 
    592324AC_MSG_CHECKING(for HydrologyPism capability compilation)
    593325
    594 
    595326HAVE_HYDROLOGYPISM=no
    596 
    597327if test "x$HYDROLOGYPISM" = "xyes"; then
    598 
    599328        HAVE_HYDROLOGYPISM=yes
    600 
    601329        AC_DEFINE([_HAVE_HYDROLOGYPISM_],[1],[with HydrologyPism capability])
    602 
    603 fi
    604 
     330fi
    605331AM_CONDITIONAL([HYDROLOGYPISM], [test x$HAVE_HYDROLOGYPISM = xyes])
    606 
    607332AC_MSG_RESULT($HAVE_HYDROLOGYPISM)
    608 
    609333dnl }}}
    610334dnl with-L2ProjectionBase{{{
    611 
    612335AC_ARG_WITH([L2ProjectionBase],
    613 
    614336        AS_HELP_STRING([--with-L2ProjectionBase = YES], [compile with L2ProjectionBase capabilities (default is yes)]),
    615 
    616337        [L2PROJECTIONBASE=$withval],[L2PROJECTIONBASE=yes])
    617 
    618338AC_MSG_CHECKING(for L2ProjectionBase capability compilation)
    619339
    620 
    621340HAVE_L2PROJECTIONBASE=no
    622 
    623341if test "x$L2PROJECTIONBASE" = "xyes"; then
    624 
    625342        HAVE_L2PROJECTIONBASE=yes
    626 
    627343        AC_DEFINE([_HAVE_L2PROJECTIONBASE_],[1],[with L2ProjectionBase capability])
    628 
    629 fi
    630 
     344fi
    631345AM_CONDITIONAL([L2PROJECTIONBASE], [test x$HAVE_L2PROJECTIONBASE = xyes])
    632 
    633346AC_MSG_RESULT($HAVE_L2PROJECTIONBASE)
    634 
    635347dnl }}}
    636348dnl with-L2ProjectionEPL{{{
    637 
    638349AC_ARG_WITH([L2ProjectionEPL],
    639 
    640350        AS_HELP_STRING([--with-L2ProjectionEPL = YES], [compile with L2ProjectionEPL capabilities (default is yes)]),
    641 
    642351        [L2PROJECTIONEPL=$withval],[L2PROJECTIONEPL=yes])
    643 
    644352AC_MSG_CHECKING(for L2ProjectionEPL capability compilation)
    645353
    646 
    647354HAVE_L2PROJECTIONEPL=no
    648 
    649355if test "x$L2PROJECTIONEPL" = "xyes"; then
    650 
    651356        HAVE_L2PROJECTIONEPL=yes
    652 
    653357        AC_DEFINE([_HAVE_L2PROJECTIONEPL_],[1],[with L2ProjectionEPL capability])
    654 
    655 fi
    656 
     358fi
    657359AM_CONDITIONAL([L2PROJECTIONEPL], [test x$HAVE_L2PROJECTIONEPL = xyes])
    658 
    659360AC_MSG_RESULT($HAVE_L2PROJECTIONEPL)
    660 
    661361dnl }}}
    662362dnl with-Levelset{{{
    663 
    664363AC_ARG_WITH([Levelset],
    665 
    666364        AS_HELP_STRING([--with-Levelset = YES], [compile with Levelset capabilities (default is yes)]),
    667 
    668365        [LEVELSET=$withval],[LEVELSET=yes])
    669 
    670366AC_MSG_CHECKING(for Levelset capability compilation)
    671367
    672 
    673368HAVE_LEVELSET=no
    674 
    675369if test "x$LEVELSET" = "xyes"; then
    676 
    677370        HAVE_LEVELSET=yes
    678 
    679371        AC_DEFINE([_HAVE_LEVELSET_],[1],[with Levelset capability])
    680 
    681 fi
    682 
     372fi
    683373AM_CONDITIONAL([LEVELSET], [test x$HAVE_LEVELSET = xyes])
    684 
    685374AC_MSG_RESULT($HAVE_LEVELSET)
    686 
    687375dnl }}}
    688376dnl with-Love{{{
    689 
    690377AC_ARG_WITH([Love],
    691 
    692378        AS_HELP_STRING([--with-Love = YES], [compile with Love capabilities (default is yes)]),
    693 
    694379        [LOVE=$withval],[LOVE=yes])
    695 
    696380AC_MSG_CHECKING(for Love capability compilation)
    697381
    698 
    699382HAVE_LOVE=no
    700 
    701383if test "x$LOVE" = "xyes"; then
    702 
    703384        HAVE_LOVE=yes
    704 
    705385        AC_DEFINE([_HAVE_LOVE_],[1],[with Love capability])
    706 
    707 fi
    708 
     386fi
    709387AM_CONDITIONAL([LOVE], [test x$HAVE_LOVE = xyes])
    710 
    711388AC_MSG_RESULT($HAVE_LOVE)
    712 
    713389dnl }}}
    714390dnl with-Masstransport{{{
    715 
    716391AC_ARG_WITH([Masstransport],
    717 
    718392        AS_HELP_STRING([--with-Masstransport = YES], [compile with Masstransport capabilities (default is yes)]),
    719 
    720393        [MASSTRANSPORT=$withval],[MASSTRANSPORT=yes])
    721 
    722394AC_MSG_CHECKING(for Masstransport capability compilation)
    723395
    724 
    725396HAVE_MASSTRANSPORT=no
    726 
    727397if test "x$MASSTRANSPORT" = "xyes"; then
    728 
    729398        HAVE_MASSTRANSPORT=yes
    730 
    731399        AC_DEFINE([_HAVE_MASSTRANSPORT_],[1],[with Masstransport capability])
    732 
    733 fi
    734 
     400fi
    735401AM_CONDITIONAL([MASSTRANSPORT], [test x$HAVE_MASSTRANSPORT = xyes])
    736 
    737402AC_MSG_RESULT($HAVE_MASSTRANSPORT)
    738 
    739403dnl }}}
    740404dnl with-Melting{{{
    741 
    742405AC_ARG_WITH([Melting],
    743 
    744406        AS_HELP_STRING([--with-Melting = YES], [compile with Melting capabilities (default is yes)]),
    745 
    746407        [MELTING=$withval],[MELTING=yes])
    747 
    748408AC_MSG_CHECKING(for Melting capability compilation)
    749409
    750 
    751410HAVE_MELTING=no
    752 
    753411if test "x$MELTING" = "xyes"; then
    754 
    755412        HAVE_MELTING=yes
    756 
    757413        AC_DEFINE([_HAVE_MELTING_],[1],[with Melting capability])
    758 
    759 fi
    760 
     414fi
    761415AM_CONDITIONAL([MELTING], [test x$HAVE_MELTING = xyes])
    762 
    763416AC_MSG_RESULT($HAVE_MELTING)
    764 
    765417dnl }}}
    766418dnl with-Sealevelrise{{{
    767 
    768419AC_ARG_WITH([Sealevelrise],
    769 
    770420        AS_HELP_STRING([--with-Sealevelrise = YES], [compile with Sealevelrise capabilities (default is yes)]),
    771 
    772421        [SEALEVELRISE=$withval],[SEALEVELRISE=yes])
    773 
    774422AC_MSG_CHECKING(for Sealevelrise capability compilation)
    775423
    776 
    777424HAVE_SEALEVELRISE=no
    778 
    779425if test "x$SEALEVELRISE" = "xyes"; then
    780 
    781426        HAVE_SEALEVELRISE=yes
    782 
    783427        AC_DEFINE([_HAVE_SEALEVELRISE_],[1],[with Sealevelrise capability])
    784 
    785 fi
    786 
     428fi
    787429AM_CONDITIONAL([SEALEVELRISE], [test x$HAVE_SEALEVELRISE = xyes])
    788 
    789430AC_MSG_RESULT($HAVE_SEALEVELRISE)
    790 
    791431dnl }}}
    792432dnl with-Smb{{{
    793 
    794433AC_ARG_WITH([Smb],
    795 
    796434        AS_HELP_STRING([--with-Smb = YES], [compile with Smb capabilities (default is yes)]),
    797 
    798435        [SMB=$withval],[SMB=yes])
    799 
    800436AC_MSG_CHECKING(for Smb capability compilation)
    801437
    802 
    803438HAVE_SMB=no
    804 
    805439if test "x$SMB" = "xyes"; then
    806 
    807440        HAVE_SMB=yes
    808 
    809441        AC_DEFINE([_HAVE_SMB_],[1],[with Smb capability])
    810 
    811 fi
    812 
     442fi
    813443AM_CONDITIONAL([SMB], [test x$HAVE_SMB = xyes])
    814 
    815444AC_MSG_RESULT($HAVE_SMB)
    816 
    817445dnl }}}
    818446dnl with-Smooth{{{
    819 
    820447AC_ARG_WITH([Smooth],
    821 
    822448        AS_HELP_STRING([--with-Smooth = YES], [compile with Smooth capabilities (default is yes)]),
    823 
    824449        [SMOOTH=$withval],[SMOOTH=yes])
    825 
    826450AC_MSG_CHECKING(for Smooth capability compilation)
    827451
    828 
    829452HAVE_SMOOTH=no
    830 
    831453if test "x$SMOOTH" = "xyes"; then
    832 
    833454        HAVE_SMOOTH=yes
    834 
    835455        AC_DEFINE([_HAVE_SMOOTH_],[1],[with Smooth capability])
    836 
    837 fi
    838 
     456fi
    839457AM_CONDITIONAL([SMOOTH], [test x$HAVE_SMOOTH = xyes])
    840 
    841458AC_MSG_RESULT($HAVE_SMOOTH)
    842 
    843459dnl }}}
    844460dnl with-Stressbalance{{{
    845 
    846461AC_ARG_WITH([Stressbalance],
    847 
    848462        AS_HELP_STRING([--with-Stressbalance = YES], [compile with Stressbalance capabilities (default is yes)]),
    849 
    850463        [STRESSBALANCE=$withval],[STRESSBALANCE=yes])
    851 
    852464AC_MSG_CHECKING(for Stressbalance capability compilation)
    853465
    854 
    855466HAVE_STRESSBALANCE=no
    856 
    857467if test "x$STRESSBALANCE" = "xyes"; then
    858 
    859468        HAVE_STRESSBALANCE=yes
    860 
    861469        AC_DEFINE([_HAVE_STRESSBALANCE_],[1],[with Stressbalance capability])
    862 
    863 fi
    864 
     470fi
    865471AM_CONDITIONAL([STRESSBALANCE], [test x$HAVE_STRESSBALANCE = xyes])
    866 
    867472AC_MSG_RESULT($HAVE_STRESSBALANCE)
    868 
    869473dnl }}}
    870474dnl with-StressbalanceSIA{{{
    871 
    872475AC_ARG_WITH([StressbalanceSIA],
    873 
    874476        AS_HELP_STRING([--with-StressbalanceSIA = YES], [compile with StressbalanceSIA capabilities (default is yes)]),
    875 
    876477        [STRESSBALANCESIA=$withval],[STRESSBALANCESIA=yes])
    877 
    878478AC_MSG_CHECKING(for StressbalanceSIA capability compilation)
    879479
    880 
    881480HAVE_STRESSBALANCESIA=no
    882 
    883481if test "x$STRESSBALANCESIA" = "xyes"; then
    884 
    885482        HAVE_STRESSBALANCESIA=yes
    886 
    887483        AC_DEFINE([_HAVE_STRESSBALANCESIA_],[1],[with StressbalanceSIA capability])
    888 
    889 fi
    890 
     484fi
    891485AM_CONDITIONAL([STRESSBALANCESIA], [test x$HAVE_STRESSBALANCESIA = xyes])
    892 
    893486AC_MSG_RESULT($HAVE_STRESSBALANCESIA)
    894 
    895487dnl }}}
    896488dnl with-StressbalanceVertical{{{
    897 
    898489AC_ARG_WITH([StressbalanceVertical],
    899 
    900490        AS_HELP_STRING([--with-StressbalanceVertical = YES], [compile with StressbalanceVertical capabilities (default is yes)]),
    901 
    902491        [STRESSBALANCEVERTICAL=$withval],[STRESSBALANCEVERTICAL=yes])
    903 
    904492AC_MSG_CHECKING(for StressbalanceVertical capability compilation)
    905493
    906 
    907494HAVE_STRESSBALANCEVERTICAL=no
    908 
    909495if test "x$STRESSBALANCEVERTICAL" = "xyes"; then
    910 
    911496        HAVE_STRESSBALANCEVERTICAL=yes
    912 
    913497        AC_DEFINE([_HAVE_STRESSBALANCEVERTICAL_],[1],[with StressbalanceVertical capability])
    914 
    915 fi
    916 
     498fi
    917499AM_CONDITIONAL([STRESSBALANCEVERTICAL], [test x$HAVE_STRESSBALANCEVERTICAL = xyes])
    918 
    919500AC_MSG_RESULT($HAVE_STRESSBALANCEVERTICAL)
    920 
    921501dnl }}}
    922502dnl with-Thermal{{{
    923 
    924503AC_ARG_WITH([Thermal],
    925 
    926504        AS_HELP_STRING([--with-Thermal = YES], [compile with Thermal capabilities (default is yes)]),
    927 
    928505        [THERMAL=$withval],[THERMAL=yes])
    929 
    930506AC_MSG_CHECKING(for Thermal capability compilation)
    931507
    932 
    933508HAVE_THERMAL=no
    934 
    935509if test "x$THERMAL" = "xyes"; then
    936 
    937510        HAVE_THERMAL=yes
    938 
    939511        AC_DEFINE([_HAVE_THERMAL_],[1],[with Thermal capability])
    940 
    941 fi
    942 
     512fi
    943513AM_CONDITIONAL([THERMAL], [test x$HAVE_THERMAL = xyes])
    944 
    945514AC_MSG_RESULT($HAVE_THERMAL)
    946 
    947515dnl }}}
    948516dnl with-UzawaPressure{{{
    949 
    950517AC_ARG_WITH([UzawaPressure],
    951 
    952518        AS_HELP_STRING([--with-UzawaPressure = YES], [compile with UzawaPressure capabilities (default is yes)]),
    953 
    954519        [UZAWAPRESSURE=$withval],[UZAWAPRESSURE=yes])
    955 
    956520AC_MSG_CHECKING(for UzawaPressure capability compilation)
    957521
    958 
    959522HAVE_UZAWAPRESSURE=no
    960 
    961523if test "x$UZAWAPRESSURE" = "xyes"; then
    962 
    963524        HAVE_UZAWAPRESSURE=yes
    964 
    965525        AC_DEFINE([_HAVE_UZAWAPRESSURE_],[1],[with UzawaPressure capability])
    966 
    967 fi
    968 
     526fi
    969527AM_CONDITIONAL([UZAWAPRESSURE], [test x$HAVE_UZAWAPRESSURE = xyes])
    970 
    971528AC_MSG_RESULT($HAVE_UZAWAPRESSURE)
    972 
    973529dnl }}}
    974530

  • issm/trunk-jpl/scripts/cppcheck.sh

    r16239 r23107  
    22
    33#comprehensive check, except unusedFunction
    4 #cppcheck -j 32 --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ --enable=all $ISSM_DIR/src/c 2> CPPCHECK.err
     4#cppcheck -j 32 --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ -D_HAVE_JAVASCRIPT_ --enable=warning --enable=style --enable=performance --enable=portability --enable=information --enable=missingInclude $ISSM_DIR/src/c 2> CPPCHECK.err
    55
    66#unused function only (slow)
    7 cppcheck --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ --enable=unusedFunction $ISSM_DIR/src 2> CPPCHECK.err
     7cppcheck --include=$ISSM_DIR/config.h -DHAVE_CONFIG_H -D_HAVE_ADOLC_ -D_HAVE_DAKOTA_ -D_HAVE_JAVASCRIPT_ --enable=unusedFunction $ISSM_DIR/src 2> CPPCHECK.err

  • issm/trunk-jpl/src/m/classes/clusters/generic.m

    r22777 r23107  
    111111                                else
    112112                                        %Add --gen-suppressions=all to get suppression lines
    113                                         fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib);
     113                                        %fprintf(fid,'LD_PRELOAD=%s \\\n',cluster.valgrindlib);
    114114                                        if ismac,
    115115                                                if IssmConfig('_HAVE_MPI_'),
    116                                                         fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --dsymutil=yes --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
     116                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --gen-suppressions=all --error-limit=no --dsymutil=yes --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
    117117                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname], modelname,modelname,modelname);
    118118                                                else
    … …  
    122122                                        else
    123123                                                if IssmConfig('_HAVE_MPI_'),
    124                                                         fprintf(fid,'mpiexec -np %i %s --leak-check=full --error-limit=no --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
     124                                                        fprintf(fid,'mpiexec -np %i %s --leak-check=full --gen-suppressions=all --error-limit=no --suppressions=%s %s/%s %s %s %s 2> %s.errlog >%s.outlog ',...
    125125                                                        cluster.np,cluster.valgrind,cluster.valgrindsup,cluster.codepath,executable,solution,[cluster.executionpath '/' dirname],modelname,modelname,modelname);
    126126                                                else

  • issm/trunk-jpl/src/m/classes/clusters/pfe.m

    r22770 r23107  
    1111                 name           = 'pfe'
    1212                 login          = '';
    13                  modules        = {'comp-intel/2016.2.181' 'mpi-sgi/mpt'};
     13                 modules        = {'comp-intel/2018.0.128' 'mpi-sgi/mpt'};
    1414                 numnodes       = 20;
    1515                 cpuspernode    = 8;
    … …  
    163163                         fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]);
    164164                         fprintf(fid,'. /usr/share/modules/init/bash\n\n');
    165                          fprintf(fid,'module load comp-intel/2016.2.181\n');
    166                          fprintf(fid,'module load mpi-sgi/mpt\n');
     165                         for i=1:numel(cluster.modules),
     166                                 fprintf(fid,['module load ' cluster.modules{i} '\n']);
     167                         end
    167168                         fprintf(fid,'export PATH="$PATH:."\n\n');
    168169                         fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
     170                         fprintf(fid,'export MKL_NUM_THREADS=2\n\n');
    169171                         fprintf(fid,'export ISSM_DIR="%s/../"\n',cluster.codepath); %FIXME
    170172                         fprintf(fid,'source $ISSM_DIR/etc/environment.sh\n');       %FIXME
    … …  
    226228                         fprintf(fid,'#PBS -e %s.errlog \n\n',[cluster.executionpath '/' dirname '/' modelname]);
    227229                         fprintf(fid,'. /usr/share/modules/init/bash\n\n');
    228                          fprintf(fid,'module load comp-intel/2016.2.181\n');
    229                          fprintf(fid,'module load mpi-sgi/mpt\n');
     230                         for i=1:numel(cluster.modules),
     231                                 fprintf(fid,['module load ' cluster.modules{i} '\n']);
     232                         end
    230233                         fprintf(fid,'export PATH="$PATH:."\n\n');
    231234                         fprintf(fid,'export MPI_GROUP_MAX=64\n\n');
    … …  
    353356                         fprintf(fid,'#PBS -e %s.errlog \n\n',modelname);
    354357                         fprintf(fid,'. /usr/share/modules/init/bash\n\n');
     358                         %for i=1:numel(cluster.modules),
     359                         %       fprintf(fid,['module load ' cluster.modules{i} '\n']);
     360                         %end
    355361                         fprintf(fid,'module load comp-intel/2016.2.181\n');
    356362                         fprintf(fid,'module load netcdf/4.4.1.1_mpt\n');

  • issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

    r23020 r23107  
    7171                analyses={'EsaAnalysis'};
    7272        elseif strcmp(solutiontype,'TransientSolution')
    73                 analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologyShaktiAnalysis'};
     73                analyses={'StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologyShaktiAnalysis','HydrologyPismAnalysis'};
    7474        elseif strcmp(solutiontype,'SealevelriseSolution')
    7575                analyses={'SealevelriseAnalysis'};

  • issm/trunk-jpl/src/m/exp/expread.m

    r22930 r23107  
    2828%initialize number of profile
    2929count=0;
     30Struct = struct();
    3031
    3132%open file

  • issm/trunk-jpl/src/m/exp/exptool.m

    r21780 r23107  
    105105                P=get(gcf,'position');
    106106                Fp=get(gca,'position');
     107                h = findobj(gcf,'type','axes');
    107108                F=getframe(gca);
    108109                F=F.cdata;
    … …  
    114115                y_m=linspace(ylim(2),ylim(1),size(F,1)); %getframe reverse axis...
    115116                %plot the data in another figure
    116                 figure; set(gcf,'position',P);
    117                 imagesc(x_m,y_m,F); set(gca,'Ydir','normal','Position',Fp,'Xlim',xlim,'Ylim',ylim);
     117                f2= figure;
     118                s = copyobj(h,f2);
     119                set(gcf,'position',P);
     120                imagesc(x_m,y_m,F);
     121                set(gca,'Ydir','normal','Position',Fp,'Xlim',xlim,'Ylim',ylim);
    118122                prevplot=1;
    119123                prevplot2=1;

  • issm/trunk-jpl/src/m/inversions/marshallcostfunctions.m

    r22770 r23107  
    1515        pos=find(cost_functions==510); data(pos) = {'ThicknessPositive'};
    1616        pos=find(cost_functions==601); data(pos) = {'SurfaceAbsMisfit'};
     17        pos=find(cost_functions==602); data(pos) = {'OmegaAbsGradient'};
     18        pos=find(cost_functions==603); data(pos) = {'EtaDiff'};

  • issm/trunk-jpl/src/m/inversions/supportedcontrols.m

    r22770 r23107  
    22
    33        list = {...
     4                'BalancethicknessSpcthickness',...
    45                'BalancethicknessThickeningRate',...
    56                'FrictionCoefficient',...

  • issm/trunk-jpl/src/m/plot/manualcb.m

    r21993 r23107  
    7878hold on
    7979numcolors=size(cmap,1);
    80 if 1,
     80if 0,
    8181        %disappears somtimes
    8282        if strcmpi(getfieldvalue(options,'orientation','vertical'),'vertical'),

  • issm/trunk-jpl/src/m/plot/scaleruler.m

    r21725 r23107  
    1111fontsize   = getfieldvalue(options,'scaleruler_fontsize',16);
    1212unitscale  = getfieldvalue(options,'unit',1.);
     13fontcolor = 'w';
    1314
    1415%Go through structure and fill missing arguments

  • issm/trunk-jpl/src/m/plot/subplotmodel.m

    r22770 r23107  
    3030                if(((i-1)*ncols+j)==num)
    3131                        ha = axes('Units','normalized', ...
    32                                 'Position',[xmin ymin width height],'XTickLabel','','YTickLabel','','Visible','off');
     32                                'Position',[xmin ymin width height]);%,'XTickLabel','','YTickLabel','','Visible','off');
    3333                        return
    3434                end

  • issm/trunk-jpl/src/m/solvers/mumpsoptions.m

    r22770 r23107  
    2727        mumps.pc_factor_mat_solver_package=getfieldvalue(options,'pc_factor_mat_solver_package','mumps');
    2828        mumps.mat_mumps_icntl_14=getfieldvalue(options,'mat_mumps_icntl_14',120);
     29
     30        %Seems like this one is not needed anymore
    2931        mumps.pc_factor_shift_positive_definite=getfieldvalue(options,'pc_factor_shift_positive_definite','true');
    3032
    3133        %These 2 lines make raijin break (ptwgts error during solver with PETSc 3.3)
    32         mumps.mat_mumps_icntl_28=2; %1=serial, 2=parallel
    33         mumps.mat_mumps_icntl_29=2; %parallel ordering 1 = ptscotch, 2 = parmetis
     34        %mumps.mat_mumps_icntl_28=2; %1=serial, 2=parallel
     35        %mumps.mat_mumps_icntl_29=2; %parallel ordering 1 = ptscotch, 2 = parmetis
    3436end

  • issm/trunk-jpl/test/NightlyRun/test201.m

    r21056 r23107  
    11%Test Name: SquareShelfStressSSA2d
    2 md=triangle(model(),'../Exp/Square.exp',150000.);
     2if 0
     3md=triangle(model(),'../Exp/Square.exp',10000.);
    34md=setmask(md,'all','');
    45md=parameterize(md,'../Par/SquareShelf.par');
    56md=setflowequation(md,'SSA','all');
    6 md.cluster=generic('name',oshostname(),'np',3);
     7md.cluster=generic('name',oshostname(),'np',5);
    78md=solve(md,'Stressbalance');
     9else
     10        clf
     11        md=bamg(model(),'domain','../Exp/Square.exp','hmax',10000.);
     12        newdomain = '../Exp/Square_temp.exp';
     13        resolution = 10000;
     14        distance=abs(ExpToLevelSet(md.mesh.x,md.mesh.y,newdomain));
     15        pos=find(ContourToNodes(md.mesh.x,md.mesh.y,newdomain,2));
     16        distance(pos) = -distance(pos);
     17        pos=find(distance<-resolution);
     18        %md2=bamg(model(),'domain','../Exp/Square_temp.exp','hmax',10000.,'RequiredVertices',[md.mesh.x(pos) md.mesh.y(pos) pos],'hmin',10000);
     19        md2=bamg(model(),'domain','../Exp/Square_temp.exp','RequiredVertices',[md.mesh.x(pos) md.mesh.y(pos) pos],'hmax',resolution);
     20        patch( 'Faces',[md.mesh.elements], 'Vertices', [md.mesh.x md.mesh.y],'FaceVertexCData',zeros(size(md.mesh.x)),'FaceColor','none','EdgeColor','k');
     21        hold on
     22        patch( 'Faces',[md2.mesh.elements], 'Vertices', [md2.mesh.x md2.mesh.y],'FaceVertexCData',zeros(size(md2.mesh.x)),'FaceColor','none','EdgeColor','r');
     23        error('S');
     24        %md=bamg(model(),'domain','../Exp/Square_temp2.exp','hmax',10000.);
     25        md=setmask(md,'all','');
     26        md=parameterize(md,'../Par/SquareShelf.par');
     27        md=setflowequation(md,'SSA','all');
     28        pos = find((md.mesh.x>10 & md.mesh.x<max(md.mesh.x)-10) & md.mesh.y>10);
     29        md.stressbalance.spcvx(pos)=NaN;
     30        md.stressbalance.spcvy(pos)=NaN;
     31        pos = find(md.mesh.vertexonboundary);
     32        md.mask.ice_levelset(pos)=0;
     33        %pos = find(md.mesh.y>10);
     34        %md.stressbalance.spcvy(pos)=NaN;
     35        md.cluster=generic('name',oshostname(),'np',5);
     36        md=solve(md,'Stressbalance');
     37
     38        %Compute vm stress
     39        md=mechanicalproperties(md,md.results.StressbalanceSolution.Vx,md.results.StressbalanceSolution.Vy);
     40        lambda1 = max(md.results.strainrate.principalvalue1,0.);
     41        lambda2 = max(md.results.strainrate.principalvalue2,0.);
     42        epse_2    = 1./2. *(lambda1.*lambda1 + lambda2.*lambda2);
     43        n=3;
     44        vm=sqrt(3.) * md.materials.rheology_B(1).* epse_2.^(1./(2.*n));
     45
     46end
    847
    948%Fields and tolerances to track changes

  • issm/trunk-jpl/test/NightlyRun/test308.m

    r21056 r23107  
    11%Test Name: SquareSheetConstrainedStressFS
    22md=triangle(model(),'../Exp/Square.exp',180000.);
     3%md=bamg(model(),'domain','../Exp/Square.exp','hmax',180000.);
    34md=setmask(md,'','');
    45md=parameterize(md,'../Par/SquareSheetConstrained.par');
    … …  
    67md=setflowequation(md,'FS','all');
    78md.cluster=generic('name',oshostname(),'np',3);
     9
     10md.flowequation.fe_FS = 'TaylorHood';
    811md=solve(md,'Stressbalance');
    912

  • issm/trunk-jpl/test/NightlyRun/test401.m

    r21056 r23107  
    11%Test Name: SquareSheetShelfStressSSA2d
    2 md=triangle(model(),'../Exp/Square.exp',150000.);
     2md=triangle(model(),'../Exp/Square.exp',50000.);
    33md=setmask(md,'../Exp/SquareShelf.exp','');
    44md=parameterize(md,'../Par/SquareSheetShelf.par');
Note: See TracChangeset for help on using the changeset viewer.