Changeset 28180


Ignore:
Timestamp:
03/25/24 10:14:53 (12 months ago)
Author:
jdquinn
Message:

CHG: Cleanup

Location:
issm/trunk-jpl/externalpackages/dakota
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-discover.sh

    r26776 r28180  
    2323export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
    2424export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
    25 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
     25
     26# Copy customized source and configuration files to 'src' directory
     27cp configs/${VER}/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp ${DAK_SRC}/packages/DDACE/src/Analyzer
     28cp configs/${VER}/packages/queso/src/misc/src/1DQuadrature.C ${DAK_SRC}/packages/queso/src/misc/src
     29cp configs/${VER}/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp ${DAK_SRC}/packages/surfpack/src/surfaces/nkm
     30cp configs/${VER}/packages/VPISparseGrid/src/sandia_rules.cpp ${DAK_SRC}/packages/VPISparseGrid/src
     31cp configs/${VER}/src/DakotaInterface.cpp ${DAK_SRC}/src
     32cp configs/${VER}/src/NonDLocalReliability.cpp ${DAK_SRC}/src
     33cp configs/${VER}/src/NonDSampling.cpp ${DAK_SRC}/src
     34cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
     35
     36#Apply patches
    2637patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.discover.patch
    27 patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
    2838patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.discover20.patch
    2939
    30 #Apply patches
    31 patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
    32 patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
    33 patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
    3440
    3541#Configure dakota
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux-static.sh

    r28179 r28180  
    5151cp configs/${VER}/src/NonDLocalReliability.cpp ${DAK_SRC}/src
    5252cp configs/${VER}/src/NonDSampling.cpp ${DAK_SRC}/src
    53 
    54 # Copy customized source and configuration files specific to Linux to 'src' directory
    5553cp configs/${VER}/static/cmake/BuildDakotaCustom.cmake ${DAK_SRC}/cmake
    5654cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-linux.sh

    r28162 r28180  
    4848cp configs/${VER}/src/NonDLocalReliability.cpp ${DAK_SRC}/src
    4949cp configs/${VER}/src/NonDSampling.cpp ${DAK_SRC}/src
    50 
    51 # Copy customized source and configuration files specific to Linux to 'src' directory
    5250cp configs/${VER}/cmake/BuildDakotaCustom.cmake ${DAK_SRC}/cmake
    5351cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-lonestar.sh

    r23626 r28180  
    2424export MPIHOME=/opt/cray/pe/mpt/7.7.3/gni/mpich-intel/16.0/
    2525
    26 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
    27 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
    28 patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
    29 patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.lonestar.patch
     26# Copy customized source and configuration files to 'src' directory
     27cp configs/${VER}/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp ${DAK_SRC}/packages/DDACE/src/Analyzer
     28cp configs/${VER}/packages/queso/src/misc/src/1DQuadrature.C ${DAK_SRC}/packages/queso/src/misc/src
     29cp configs/${VER}/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp ${DAK_SRC}/packages/surfpack/src/surfaces/nkm
     30cp configs/${VER}/packages/VPISparseGrid/src/sandia_rules.cpp ${DAK_SRC}/packages/VPISparseGrid/src
     31cp configs/${VER}/src/DakotaInterface.cpp ${DAK_SRC}/src
     32cp configs/${VER}/src/NonDLocalReliability.cpp ${DAK_SRC}/src
     33cp configs/${VER}/src/NonDSampling.cpp ${DAK_SRC}/src
     34cp configs/${VER}/cmake/BuildDakotaCustom.cmake ${DAK_SRC}/cmake
     35cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    3036
    3137#Apply patches
    32 patch src/src/NonDSampling.cpp configs/6.2/NonDSampling.cpp.patch
    33 patch src/src/NonDLocalReliability.cpp configs/6.2/NonDLocalReliability.cpp.patch
    34 patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.2/pecos_global_defs.hpp.patch
    35 patch src/packages/surfpack/src/surfaces/nkm/NKM_KrigingModel.cpp configs/6.2/NKM_KrigingModel.patch
    36 patch src/packages/DDACE/src/Analyzer/MainEffectsExcelOutput.cpp configs/6.2/MainEffectsExcelOutput.patch
     38patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.lonestar.patch
    3739patch src/src/DakotaInterface.cpp configs/6.2/DakotaInterface.patch
    3840
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh

    r28162 r28180  
    5252cp configs/${VER}/src/NonDLocalReliability.cpp ${DAK_SRC}/src
    5353cp configs/${VER}/src/NonDSampling.cpp ${DAK_SRC}/src
     54cp configs/${VER}/static/cmake/BuildDakotaCustom.cmake ${DAK_SRC}/cmake
     55cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    5456
    5557# Copy customized source and configuration files specific to Mac to 'src' directory
    56 cp configs/${VER}/static/cmake/BuildDakotaCustom.cmake ${DAK_SRC}/cmake
    57 cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    5858cp configs/${VER}/mac/cmake/InstallDarwinDylibs.cmake ${DAK_SRC}/cmake
    5959
  • issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

    r28162 r28180  
    4949cp configs/${VER}/src/NonDLocalReliability.cpp ${DAK_SRC}/src
    5050cp configs/${VER}/src/NonDSampling.cpp ${DAK_SRC}/src
     51cp configs/${VER}/cmake/BuildDakotaCustom.cmake ${DAK_SRC}/cmake
     52cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    5153
    5254# Copy customized source and configuration files specific to Mac to 'src' directory
    53 cp configs/${VER}/cmake/BuildDakotaCustom.cmake ${DAK_SRC}/cmake
    54 cp configs/${VER}/cmake/DakotaDev.cmake ${DAK_SRC}/cmake
    5555cp configs/${VER}/mac/cmake/InstallDarwinDylibs.cmake ${DAK_SRC}/cmake
    5656
Note: See TracChangeset for help on using the changeset viewer.