Changeset 21857


Ignore:
Timestamp:
07/24/17 16:26:38 (8 years ago)
Author:
Mathieu Morlighem
Message:

CHG: shielding AMR stuff from adolc

Location:
issm/trunk-jpl/src/c/classes
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/FemModel.cpp

    r21854 r21857  
    24282428
    24292429/*AMR*/
     2430#if !defined(_HAVE_ADOLC_)
    24302431void FemModel::BedrockFromMismipPlus(void){/*{{{*/
    24312432
    … …  
    36163617}
    36173618/*}}}*/
     3619#endif
    36183620
    36193621#ifdef  _HAVE_DAKOTA_

  • issm/trunk-jpl/src/c/classes/FemModel.h

    r21850 r21857  
    157157
    158158                /*AMR*/
     159                #if !defined(_HAVE_ADOLC_)
    159160                void BedrockFromMismipPlus(void);
    160161                void AdjustBaseThicknessAndMask(void);
    … …  
    176177                void ThicknessZZErrorEstimator(IssmDouble** pelementerror);
    177178                void MeanGroundedIceLevelSet(IssmDouble** pmasklevelset);
     179                #endif
    178180
    179181                #if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
Note: See TracChangeset for help on using the changeset viewer.