Changeset 567


Ignore:
Timestamp:
Nov 1, 2005 6:27:11 PM (14 years ago)
Author:
andreasw
Message:

adapted for Portland compilers

Location:
branches/dev
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Algorithm/IpAdaptiveMuUpdate.cpp

    r542 r567  
    419419      break;
    420420      case FILTER_KKT_ERROR : {
    421         DBG_ASSERT("Unknown adaptive_mu_globalization value.");
     421        DBG_ASSERT(false && "Unknown adaptive_mu_globalization value.");
    422422      }
    423423      break;
     
    426426      break;
    427427      default:
    428       DBG_ASSERT("Unknown adaptive_mu_globalization value.");
     428      DBG_ASSERT(false && "Unknown adaptive_mu_globalization value.");
    429429    }
    430430
     
    471471      break;
    472472      case FILTER_KKT_ERROR : {
    473         DBG_ASSERT("Unknown corrector_type value.");
     473        DBG_ASSERT(false && "Unknown corrector_type value.");
    474474      }
    475475      break;
    476476      default:
    477       DBG_ASSERT("Unknown corrector_type value.");
     477      DBG_ASSERT(false && "Unknown corrector_type value.");
    478478    }
    479479
     
    650650        break;
    651651        default:
    652         DBG_ASSERT("Unknown value for adaptive_mu_kkt_centrality_");
     652        DBG_ASSERT(false && "Unknown value for adaptive_mu_kkt_centrality_");
    653653      }
    654654    }
     
    663663      break;
    664664      default:
    665       DBG_ASSERT("Unknown value for adaptive_mu_kkt_balancing_term");
     665      DBG_ASSERT(false && "Unknown value for adaptive_mu_kkt_balancing_term");
    666666    }
    667667
  • branches/dev/Algorithm/IpBacktrackingLineSearch.cpp

    r546 r567  
    959959    // original filter
    960960
    961     Number trial_barr;
    962     Number trial_theta;
    963961    try {
    964       trial_barr = IpCq().trial_barrier_obj();
    965       trial_theta = IpCq().trial_constraint_violation();
     962      IpCq().trial_barrier_obj();
     963      IpCq().trial_constraint_violation();
    966964    }
    967965    catch(IpoptNLP::Eval_Error& e) {
  • branches/dev/Algorithm/IpFilterLSAcceptor.cpp

    r543 r567  
    636636      break;
    637637      default:
    638       DBG_ASSERT("Unknown corrector_type value.");
     638      DBG_ASSERT(false && "Unknown corrector_type value.");
    639639    }
    640640
  • branches/dev/Algorithm/IpIpoptCalculatedQuantities.cpp

    r544 r567  
    20822082      return Max(vec1.Amax(), vec2.Amax());
    20832083      default:
    2084       DBG_ASSERT("Unknown NormType.");
     2084      DBG_ASSERT(false && "Unknown NormType.");
    20852085      return 0.0;
    20862086    }
     
    21132113      break;
    21142114      default:
    2115       DBG_ASSERT("Unknown NormType.");
     2115      DBG_ASSERT(false && "Unknown NormType.");
    21162116    }
    21172117
  • branches/dev/Algorithm/IpIpoptData.cpp

    r521 r567  
    1212namespace Ipopt
    1313{
    14 
    15 #ifdef IP_DEBUG
    16   static const Index dbg_verbosity = 0;
    17 #endif
    1814
    1915  IpoptData::IpoptData()
  • branches/dev/Algorithm/IpIteratesVector.cpp

    r501 r567  
    1111namespace Ipopt
    1212{
    13 
    14 #ifdef IP_DEBUG
    15   static const Index dbg_verbosity = 0;
    16 #endif
    1713
    1814  IteratesVector::IteratesVector(const IteratesVectorSpace* owner_space, bool create_new)
  • branches/dev/Algorithm/IpOrigIterationOutput.cpp

    r546 r567  
    2121namespace Ipopt
    2222{
    23 #ifdef IP_DEBUG
    24   static const Index dbg_verbosity = 0;
    25 #endif
    26 
    2723  OrigIterationOutput::OrigIterationOutput()
    2824  {}
  • branches/dev/Algorithm/IpPDPerturbationHandler.cpp

    r547 r567  
    379379      case NO_TEST:
    380380      return;
    381       break;
    382381      case TEST_DELTA_C_EQ_0_DELTA_X_EQ_0:
    383382      if (hess_degenerate_ == NOT_YET_DETERMINED &&
  • branches/dev/Algorithm/IpQualityFunctionMuOracle.cpp

    r529 r567  
    773773      break;
    774774      default:
    775       DBG_ASSERT("Unknown value for quality_function_centrality_");
     775      DBG_ASSERT(false && "Unknown value for quality_function_centrality_");
    776776    }
    777777
     
    784784      break;
    785785      default:
    786       DBG_ASSERT("Unknown value for quality_function_balancing term_");
     786      DBG_ASSERT(false && "Unknown value for quality_function_balancing term_");
    787787    }
    788788
  • branches/dev/Algorithm/IpRestoIterationOutput.cpp

    r546 r567  
    2222namespace Ipopt
    2323{
    24 #ifdef IP_DEBUG
    25   static const Index dbg_verbosity = 0;
    26 #endif
    27 
    2824  RestoIterationOutput::RestoIterationOutput(const SmartPtr<OrigIterationOutput>& resto_orig_iteration_output)
    2925      :
  • branches/dev/Algorithm/IpRestoMinC_1Nrm.cpp

    r546 r567  
    190190    else if (resto_status == MAXITER_EXCEEDED) {
    191191      THROW_EXCEPTION(IpoptException, "Maximal number of iterations exceeded in restoration phase.");
    192       retval = 1;
    193192    }
    194193    else if (resto_status == LOCAL_INFEASIBILITY) {
  • branches/dev/Algorithm/IpStdAugSystemSolver.cpp

    r517 r567  
    108108    // yet been created - It is assumed that the structure will not change
    109109    // after this call
    110     bool debug_first_time_through = false;
     110    DBG_DO(bool debug_first_time_through = false;)
    111111    if (!IsValid(augmented_system_)) {
    112112      // pass in the information to form the structure of the augmented system
     
    118118                            *J_c, D_c, delta_c, *J_d, D_d, delta_d,
    119119                            rhs_x, rhs_s, rhs_c, rhs_d);
    120       debug_first_time_through = true;
     120      DBG_DO(debug_first_time_through = true;)
    121121    }
    122122
  • branches/dev/Common/IpJournalist.cpp

    r501 r567  
    99#include "IpJournalist.hpp"
    1010#include "IpDebug.hpp"
    11 
    12 #ifdef HAVE_CSTDIO
    13 # include <cstdio>
    14 #else
    15 # ifdef HAVE_STDIO_H
    16 #  include <stdio.h>
    17 # else
    18 #  error "don't have header file for stdio"
    19 # endif
    20 #endif
    2111
    2212namespace Ipopt
  • branches/dev/Common/IpJournalist.hpp

    r546 r567  
    2323# else
    2424#  error "don't have header file for stdarg"
     25# endif
     26#endif
     27
     28#ifdef HAVE_CSTDIO
     29# include <cstdio>
     30#else
     31# ifdef HAVE_STDIO_H
     32#  include <stdio.h>
     33# else
     34#  error "don't have header file for stdio"
    2535# endif
    2636#endif
  • branches/dev/Common/IpOptionsList.cpp

    r501 r567  
    346346    else {
    347347      THROW_EXCEPTION(OPTION_INVALID, "Tried to get a boolean from an option and failed.");
    348       ret = false;
    349348    }
    350349
  • branches/dev/Common/IpSmartPtr.hpp

    r510 r567  
    353353#endif
    354354
     355#ifndef __PGI
    355356    const ReferencedObject* trying_to_use_SmartPtr_with_an_object_that_does_not_inherit_from_ReferencedObject_
    356357    = ptr_;
    357358    trying_to_use_SmartPtr_with_an_object_that_does_not_inherit_from_ReferencedObject_ = NULL;
     359#endif
    358360
    359361  }
     
    369371#endif
    370372
     373#ifndef __PGI
    371374    const ReferencedObject* trying_to_use_SmartPtr_with_an_object_that_does_not_inherit_from_ReferencedObject_
    372375    = ptr_;
    373376    trying_to_use_SmartPtr_with_an_object_that_does_not_inherit_from_ReferencedObject_ = NULL;
     377#endif
    374378
    375379    (void) SetFromSmartPtr_(copy);
     
    409413#endif
    410414
     415#ifndef __PGI
    411416    const ReferencedObject* trying_to_use_SmartPtr_with_an_object_that_does_not_inherit_from_ReferencedObject_
    412417    = ptr_;
    413418    trying_to_use_SmartPtr_with_an_object_that_does_not_inherit_from_ReferencedObject_ = NULL;
     419#endif
    414420
    415421    (void) SetFromRawPtr_(ptr);
  • branches/dev/LinAlg/TMatrices/IpTripletHelper.cpp

    r501 r567  
    9494
    9595    THROW_EXCEPTION(UNKNOWN_MATRIX_TYPE,"Unknown matrix type passed to TripletHelper::GetNumberEntries");
    96     return 0;
    9796  }
    9897
     
    251250
    252251    THROW_EXCEPTION(UNKNOWN_MATRIX_TYPE,"Unknown matrix type passed to TripletHelper::FillValues");
    253     return;
    254252  }
    255253
  • branches/dev/configure

    r555 r567  
    14951495case $build in
    14961496  *-cygwin) comps="g++" ;;
    1497   *)        comps="xlC aCC CC g++ c++ icpc" ;;
     1497  *)        comps="xlC aCC CC g++ c++ pgCC icpc" ;;
    14981498esac
    14991499ac_ext=cc
     
    22652265      conftest$ac_exeext conftest.$ac_ext
    22662266             ;;
     2267      pgCC | */pgCC)
     2268             opt_cxxflags="-fast"
     2269             add_cxxflags="-Kieee -pc 64"
     2270             dbg_cxxflags="-g";;
    22672271      esac;;
    22682272    *-ibm-*)
     
    24772481        CXXLIBS=""
    24782482             ;;
     2483      pgCC | */pgCC)
     2484        CXXLIBS="-lstd -lC -lc"
     2485             ;;
    24792486      esac;;
    24802487    *-ibm-*)
     
    25652572case $build in
    25662573  *-cygwin) comps="gcc" ;;
    2567   *)        comps="xlc cc gcc icc" ;;
     2574  *)        comps="xlc cc gcc pgcc icc" ;;
    25682575esac
    25692576ac_ext=c
     
    32953302      pgcc | */pgcc)
    32963303             opt_cflags="-fast"
    3297              add_cflags="-Kieee -Mstabs -pc 64"
     3304             add_cflags="-Kieee -pc 64"
    32983305             dbg_cflags="-g" ;;
    32993306      esac;;
     
    35083515case $build in
    35093516  *-cygwin) comps="gfortran g77" ;;
    3510   *)        comps="xlf fort77 gfortran f77 g77 ifort ifc" ;;
     3517  *)        comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc" ;;
    35113518esac
    35123519ac_ext=f
     
    36023609
    36033610# Provide some information about the compiler.
    3604 echo "$as_me:3604:" \
     3611echo "$as_me:3611:" \
    36053612     "checking for Fortran 77 compiler version" >&5
    36063613ac_compiler=`set X $ac_compile; echo $2`
     
    39463953      conftest$ac_exeext conftest.$ac_ext
    39473954             ;;
    3948       pgf77 | */pgf77)
     3955      pgf77 | */pgf77 | pgf90 | */pgf90)
    39493956             opt_fflags="-fast"
    3950              add_fflags="-Kieee -Mstabs -pc 64"
     3957             add_fflags="-Kieee -pc 64"
    39513958             dbg_fflags="-g" ;;
    39523959      esac;;
     
    41694176ac_save_FFLAGS=$FFLAGS
    41704177FFLAGS="$FFLAGS $ac_verb"
    4171 (eval echo $as_me:4171: \"$ac_link\") >&5
     4178(eval echo $as_me:4178: \"$ac_link\") >&5
    41724179ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    41734180echo "$ac_f77_v_output" >&5
     
    42474254ac_save_FFLAGS=$FFLAGS
    42484255FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4249 (eval echo $as_me:4249: \"$ac_link\") >&5
     4256(eval echo $as_me:4256: \"$ac_link\") >&5
    42504257ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    42514258echo "$ac_f77_v_output" >&5
     
    49414948   *-ibm-*)
    49424949       FLIBS=`echo $FLIBS | sed 's/-lc)/-lc/g'` ;;
     4950   *-linux-*)
     4951     case "$F77" in
     4952       pgf77 | */pgf77 | pgf90 | */pgf90)
     4953# ask linker to go through the archives multiple times
     4954# (the Fortran compiler seems to do that automatically...
     4955         FLIBS="-Wl,--start-group $FLIBS -Wl,--end-group" ;;
     4956     esac
    49434957esac
    49444958
     
    1060210616      xlc* | */xlc* | mpxlc* | */mpxlc*)
    1060310617        ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed 's/-qtune=auto//g' | sed 's/-qarch=auto//g' | sed 's/-qcache=auto//g' | sed 's/-qhot//g' | sed 's/-O3/-O/g'`
     10618      ;;
     10619      pgcc | */pgcc)
     10620        ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed 's/-fast/-O1/g'`
    1060410621      ;;
    1060510622    esac
  • branches/dev/configure.ac

    r555 r567  
    4444case $build in
    4545  *-cygwin) comps="g++" ;;
    46   *)        comps="xlC aCC CC g++ c++ icpc" ;;
     46  *)        comps="xlC aCC CC g++ c++ pgCC icpc" ;;
    4747esac
    4848AC_PROG_CXX([$comps])
     
    166166                               add_cxxflags="-i_dynamic $add_cxxflags"])
    167167             ;;
     168      pgCC | */pgCC)
     169             opt_cxxflags="-fast"
     170             add_cxxflags="-Kieee -pc 64"
     171             dbg_cxxflags="-g";;
    168172      esac;;
    169173    *-ibm-*)
     
    238242        CXXLIBS=""
    239243             ;;
     244      pgCC | */pgCC)
     245        CXXLIBS="-lstd -lC -lc"
     246             ;;
    240247      esac;;
    241248    *-ibm-*)
     
    311318case $build in
    312319  *-cygwin) comps="gcc" ;;
    313   *)        comps="xlc cc gcc icc" ;;
     320  *)        comps="xlc cc gcc pgcc icc" ;;
    314321esac
    315322AC_PROG_CC([$comps])
     
    437444      pgcc | */pgcc)
    438445             opt_cflags="-fast"
    439              add_cflags="-Kieee -Mstabs -pc 64"
     446             add_cflags="-Kieee -pc 64"
    440447             dbg_cflags="-g" ;;
    441448      esac;;
     
    501508case $build in
    502509  *-cygwin) comps="gfortran g77" ;;
    503   *)        comps="xlf fort77 gfortran f77 g77 ifort ifc" ;;
     510  *)        comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc" ;;
    504511esac
    505512AC_PROG_F77($comps)
     
    632639                               add_fflags="-i_dynamic $add_fflags"])
    633640             ;;
    634       pgf77 | */pgf77)
     641      pgf77 | */pgf77 | pgf90 | */pgf90)
    635642             opt_fflags="-fast"
    636              add_fflags="-Kieee -Mstabs -pc 64"
     643             add_fflags="-Kieee -pc 64"
    637644             dbg_fflags="-g" ;;
    638645      esac;;
     
    703710   *-ibm-*)
    704711       FLIBS=`echo $FLIBS | sed 's/-lc)/-lc/g'` ;;
     712   *-linux-*)
     713     case "$F77" in
     714       pgf77 | */pgf77 | pgf90 | */pgf90)
     715# ask linker to go through the archives multiple times
     716# (the Fortran compiler seems to do that automatically...
     717         FLIBS="-Wl,--start-group $FLIBS -Wl,--end-group" ;;
     718     esac
    705719esac
    706720
     
    11621176        ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed 's/-qtune=auto//g' | sed 's/-qarch=auto//g' | sed 's/-qcache=auto//g' | sed 's/-qhot//g' | sed 's/-O3/-O/g'`
    11631177      ;;
     1178      pgcc | */pgcc)
     1179        ASLMAKEFLAGS=`echo $ASLMAKEFLAGS | sed 's/-fast/-O1/g'`
     1180      ;;
    11641181    esac
    11651182
Note: See TracChangeset for help on using the changeset viewer.