Changeset 23255


Ignore:
Timestamp:
09/11/18 13:07:03 (7 years ago)
Author:
Mathieu Morlighem
Message:

CHG: fixing some more errors related to CoDiPack compilation

Location:
issm/trunk-jpl/src/c
Files:
12 edited

Legend:

Unmodified
Added
Removed

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

    r23252 r23255  
    17621762        if(X) Xcount=*pXcount;
    17631763
    1764         #ifdef _HAVE_ADOLC_ //cannot come here unless you are running AD mode, from DeclaredIndependents:
     1764        #ifdef _HAVE_AD_ //cannot come here unless you are running AD mode, from DeclaredIndependents:
    17651765
    17661766        /*Intermediaries*/

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

    r23066 r23255  
    1111#include "../solutionsequences/solutionsequences.h"
    1212
     13/*This file is probably never used!*/
    1314#if defined (_HAVE_M1QN3_)  & defined (_HAVE_ADOLC_)
    1415/*m1qn3 prototypes {{{*/

  • issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp

    r23066 r23255  
    7878                IssmDouble val=sqrt(dmax_basin[i]/dist_max)*(maxbox-1);
    7979
    80                 #ifdef _HAVE_ADOLC_
     80                #ifdef _HAVE_AD_
     81                _error_("Check the implementation of floor below");
    8182                /*Do not use floor when AD is on*/
    8283                int k=0; while(k<val+.5){k++;}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

    r23240 r23255  
    135135void UpdateElementsAndMaterialsControlAD(Elements* elements,Parameters* parameters,Materials* materials, IoModel* iomodel){
    136136
    137         #if defined(_HAVE_ADOLC_)
     137        #if defined(_HAVE_AD_)
    138138        /*Intermediaries*/
    139139        int                             num_independent_objects,M,N,M_par,N_par;

  • issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp

    r23043 r23255  
    1212        _printf_("\n");
    1313}
    14 #ifdef _HAVE_ADOLC_
     14#ifdef _HAVE_AD_
    1515void printarray(IssmDouble* array,int lines,int cols){
    1616        _printf_("\n");

  • issm/trunk-jpl/src/c/shared/Elements/elements.h

    r23048 r23255  
    4242/*Print arrays*/
    4343void printarray(IssmPDouble* array,int lines,int cols=1);
    44 #if _HAVE_ADOLC_  && !defined(_WRAPPERS_)
     44#if _HAVE_AD_  && !defined(_WRAPPERS_)
    4545void printarray(IssmDouble* array,int lines,int cols=1);
    4646#endif

  • issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h

    r23254 r23255  
    9898template <class T> ISSM_MPI_Datatype TypeToMPIType(){assert(false);};
    9999template <> inline ISSM_MPI_Datatype TypeToMPIType<IssmDouble>(){return ISSM_MPI_DOUBLE;};
    100 #if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_)
     100#if defined(_HAVE_AD_) && !defined(_WRAPPERS_)
    101101template <> inline ISSM_MPI_Datatype TypeToMPIType<IssmPDouble>(){return ISSM_MPI_PDOUBLE;};
    102102#endif

  • issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp

    r23251 r23255  
    616616    dataHandler->addData(parameters); // we assume here that parameters is still intact when the reverse run is called
    617617
    618     tape.pushExternalFunction(&MumpsSolve_codi_b, dataHandler, &MumpsSolve_codi_delete);
     618         tape.pushExternalFunction(&MumpsSolve_codi_b, dataHandler, &MumpsSolve_codi_delete);
     619    //tape.pushExternalFunctionHandle(&MumpsSolve_codi_b, dataHandler, &MumpsSolve_codi_delete);
    619620  } else {
    620621    // if the tape is active valueB is stored in the dataHandler and deleted in the reverse sweep

  • issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp

    r19178 r23255  
    2121PetscMat::PetscMat(){/*{{{*/
    2222        this->matrix=NULL;
    23         #ifdef _HAVE_ADOLC_
     23        #ifdef _HAVE_AD_
    2424        this->amatrix=NULL;
    2525        #endif

  • issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h

    r14915 r23255  
    2727                Mat matrix;
    2828
    29                 #ifdef _HAVE_ADOLC_
     29                #ifdef _HAVE_AD_
    3030                IssmDouble* amatrix;
    3131                #endif

  • issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp

    r19977 r23255  
    2121PetscVec::PetscVec(){/*{{{*/
    2222        this->vector=NULL;
    23         #ifdef _HAVE_ADOLC_
     23        #ifdef _HAVE_AD_
    2424        this->avector=NULL;
    2525        #endif

  • issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.h

    r19977 r23255  
    2525                Vec vector;
    2626
    27                 #ifdef _HAVE_ADOLC_
     27                #ifdef _HAVE_AD_
    2828                IssmDouble* avector;
    2929                #endif
Note: See TracChangeset for help on using the changeset viewer.