Merge remote-tracking branch 'origin/develop'

usgs · Sep 21, 2019 · 0b4bd23 · 0b4bd23
2 parents 24d191f + eac4de8
commit 0b4bd23
Show file tree

Hide file tree

Showing 124 changed files with 3,390 additions and 6,527 deletions.
diff --git a/benchmarks/basic_tests.py b/benchmarks/basic_tests.py
diff --git a/bin/iwin/ipestpp-glm.exe b/bin/iwin/ipestpp-glm.exe
diff --git a/bin/iwin/ipestpp-ies.exe b/bin/iwin/ipestpp-ies.exe
diff --git a/bin/iwin/ipestpp-opt.exe b/bin/iwin/ipestpp-opt.exe
diff --git a/bin/iwin/ipestpp-sen.exe b/bin/iwin/ipestpp-sen.exe
diff --git a/bin/iwin/ipestpp-swp.exe b/bin/iwin/ipestpp-swp.exe
diff --git a/bin/mac/ascii2pbin b/bin/mac/ascii2pbin
diff --git a/bin/mac/pbin2ascii b/bin/mac/pbin2ascii
diff --git a/bin/mac/pbin_dump b/bin/mac/pbin_dump
diff --git a/bin/mac/pestpp-glm b/bin/mac/pestpp-glm
diff --git a/bin/mac/pestpp-ies b/bin/mac/pestpp-ies
diff --git a/bin/mac/pestpp-opt b/bin/mac/pestpp-opt
diff --git a/bin/mac/pestpp-pso b/bin/mac/pestpp-pso
diff --git a/bin/mac/pestpp-sen b/bin/mac/pestpp-sen
diff --git a/bin/mac/pestpp-swp b/bin/mac/pestpp-swp
diff --git a/bin/win/ascii2pbin.exe b/bin/win/ascii2pbin.exe
diff --git a/bin/win/inschekpp.exe b/bin/win/inschekpp.exe
diff --git a/bin/win/pbin2ascii.exe b/bin/win/pbin2ascii.exe
diff --git a/bin/win/pbin_dump.exe b/bin/win/pbin_dump.exe
diff --git a/bin/win/pestpp-glm.exe b/bin/win/pestpp-glm.exe
diff --git a/bin/win/pestpp-ies.exe b/bin/win/pestpp-ies.exe
diff --git a/bin/win/pestpp-opt.exe b/bin/win/pestpp-opt.exe
diff --git a/bin/win/pestpp-pso.exe b/bin/win/pestpp-pso.exe
diff --git a/bin/win/pestpp-sen.exe b/bin/win/pestpp-sen.exe
diff --git a/bin/win/pestpp-swp.exe b/bin/win/pestpp-swp.exe
diff --git a/documentation/pestpp4.2.14.docx b/documentation/pestpp4.2.14.docx
diff --git a/src/Makefile b/src/Makefile
diff --git a/src/global.mak b/src/global.mak
diff --git a/src/libs/Makefile b/src/libs/Makefile
diff --git a/src/libs/common/common.vcxproj b/src/libs/common/common.vcxproj
diff --git a/src/libs/common/common_intel.vcxproj b/src/libs/common/common_intel.vcxproj
diff --git a/src/libs/common/config_os.h b/src/libs/common/config_os.h
diff --git a/src/libs/common/utilities.cpp b/src/libs/common/utilities.cpp
diff --git a/src/libs/linear_analysis/Makefile b/src/libs/linear_analysis/Makefile
diff --git a/src/libs/linear_analysis/ReadMe.txt b/src/libs/linear_analysis/ReadMe.txt
diff --git a/src/libs/linear_analysis/linear_analysis.vcxproj b/src/libs/linear_analysis/linear_analysis.vcxproj
diff --git a/src/libs/linear_analysis/linear_analysis.vcxproj.filters b/src/libs/linear_analysis/linear_analysis.vcxproj.filters
diff --git a/src/libs/linear_analysis/linear_analysis.vcxproj.user b/src/libs/linear_analysis/linear_analysis.vcxproj.user
diff --git a/src/libs/linear_analysis/linear_analysis_intel.vcxproj b/src/libs/linear_analysis/linear_analysis_intel.vcxproj
diff --git a/src/libs/mio/mio_intel.vfproj b/src/libs/mio/mio_intel.vfproj
diff --git a/src/libs/opt/libopt/libopt.vcxproj b/src/libs/opt/libopt/libopt.vcxproj
diff --git a/src/libs/opt/libopt/libopt_intel.vcxproj b/src/libs/opt/libopt/libopt_intel.vcxproj
diff --git a/src/libs/pest_routines/Makefile b/src/libs/pest_routines/Makefile
diff --git a/src/libs/pest_routines/io_utils.for b/src/libs/pest_routines/io_utils.for
diff --git a/src/libs/pest_routines/pest_routines.u2d b/src/libs/pest_routines/pest_routines.u2d
diff --git a/src/libs/pest_routines/readins.for b/src/libs/pest_routines/readins.for
diff --git a/src/libs/pest_routines/vc100.pdb b/src/libs/pest_routines/vc100.pdb
diff --git a/src/libs/pest_routines/writtpl.for b/src/libs/pest_routines/writtpl.for
diff --git a/src/libs/pestpp_common/Makefile b/src/libs/pestpp_common/Makefile
diff --git a/src/libs/linear_analysis/covariance.cpp → src/libs/pestpp_common/covariance.cpp b/src/libs/linear_analysis/covariance.cpp → src/libs/pestpp_common/covariance.cpp
diff --git a/src/libs/linear_analysis/covariance.h → src/libs/pestpp_common/covariance.h b/src/libs/linear_analysis/covariance.h → src/libs/pestpp_common/covariance.h
diff --git a/src/libs/linear_analysis/linear_analysis.cpp → src/libs/pestpp_common/linear_analysis.cpp b/src/libs/linear_analysis/linear_analysis.cpp → src/libs/pestpp_common/linear_analysis.cpp
diff --git a/src/libs/linear_analysis/linear_analysis.h → src/libs/pestpp_common/linear_analysis.h b/src/libs/linear_analysis/linear_analysis.h → src/libs/pestpp_common/linear_analysis.h
diff --git a/src/libs/linear_analysis/logger.cpp → src/libs/pestpp_common/logger.cpp b/src/libs/linear_analysis/logger.cpp → src/libs/pestpp_common/logger.cpp
diff --git a/src/libs/linear_analysis/logger.h → src/libs/pestpp_common/logger.h b/src/libs/linear_analysis/logger.h → src/libs/pestpp_common/logger.h
diff --git a/src/libs/pestpp_common/pestpp_common.vcxproj b/src/libs/pestpp_common/pestpp_common.vcxproj
diff --git a/src/libs/pestpp_common/pestpp_common_intel.vcxproj b/src/libs/pestpp_common/pestpp_common_intel.vcxproj
diff --git a/src/libs/propack/propack.vfproj b/src/libs/propack/propack.vfproj
diff --git a/src/libs/pest_routines/pest_routines.vfproj → src/libs/propack/propack_intel.vfproj b/src/libs/pest_routines/pest_routines.vfproj → src/libs/propack/propack_intel.vfproj
diff --git a/src/libs/run_managers/abstract_base/abstract_base.vcxproj b/src/libs/run_managers/abstract_base/abstract_base.vcxproj
diff --git a/src/libs/run_managers/abstract_base/abstract_base_intel.vcxproj b/src/libs/run_managers/abstract_base/abstract_base_intel.vcxproj
diff --git a/src/libs/run_managers/external/external.vcxproj b/src/libs/run_managers/external/external.vcxproj
diff --git a/src/libs/run_managers/external/external_intel.vcxproj b/src/libs/run_managers/external/external_intel.vcxproj
diff --git a/src/libs/run_managers/serial/serial.vcxproj b/src/libs/run_managers/serial/serial.vcxproj
diff --git a/src/libs/run_managers/serial/serial_intel.vcxproj b/src/libs/run_managers/serial/serial_intel.vcxproj
diff --git a/src/libs/run_managers/wrappers/wrappers.vcxproj b/src/libs/run_managers/wrappers/wrappers.vcxproj
diff --git a/src/libs/run_managers/wrappers/wrappers_intel.vcxproj b/src/libs/run_managers/wrappers/wrappers_intel.vcxproj
diff --git a/src/libs/run_managers/yamr/yamr.vcxproj b/src/libs/run_managers/yamr/yamr.vcxproj
diff --git a/src/libs/run_managers/yamr/yamr_intel.vcxproj b/src/libs/run_managers/yamr/yamr_intel.vcxproj
diff --git a/src/pestpp.sln b/src/pestpp.sln
diff --git a/src/pestpp_intel.sln b/src/pestpp_intel.sln
diff --git a/src/programs/Makefile b/src/programs/Makefile
diff --git a/src/programs/gsa/gsa.vcxproj b/src/programs/gsa/gsa.vcxproj
diff --git a/src/programs/gsa/gsa_intel.vcxproj b/src/programs/gsa/gsa_intel.vcxproj
diff --git a/src/programs/pest++/pest++.vcxproj b/src/programs/pest++/pest++.vcxproj
diff --git a/src/programs/pest++/pest++.vcxproj.user b/src/programs/pest++/pest++.vcxproj.user
diff --git a/src/programs/pest++/pest++_intel.vcxproj b/src/programs/pest++/pest++_intel.vcxproj
diff --git a/src/programs/pestpp-ies/pestpp-ies.vcxproj b/src/programs/pestpp-ies/pestpp-ies.vcxproj
diff --git a/src/programs/pestpp-ies/pestpp-ies_intel.vcxproj b/src/programs/pestpp-ies/pestpp-ies_intel.vcxproj
diff --git a/src/programs/pestpp-opt/pestpp-opt.vcxproj b/src/programs/pestpp-opt/pestpp-opt.vcxproj
diff --git a/src/programs/pestpp-opt/pestpp-opt_intel.vcxproj b/src/programs/pestpp-opt/pestpp-opt_intel.vcxproj
diff --git a/src/programs/pestpp-pso/Makefile b/src/programs/pestpp-pso/Makefile
diff --git a/src/programs/pestpp-pso/bestsubs.f90 b/src/programs/pestpp-pso/bestsubs.f90
diff --git a/src/programs/pestpp-pso/estimation.f90 b/src/programs/pestpp-pso/estimation.f90
diff --git a/src/programs/pestpp-pso/objsubs.f90 b/src/programs/pestpp-pso/objsubs.f90
diff --git a/src/programs/pestpp-pso/pareto.f90 b/src/programs/pestpp-pso/pareto.f90
diff --git a/src/programs/pestpp-pso/paretosubs.f90 b/src/programs/pestpp-pso/paretosubs.f90
diff --git a/src/programs/pestpp-pso/parsubs.f90 b/src/programs/pestpp-pso/parsubs.f90
diff --git a/src/programs/pestpp-pso/parunc.f90 b/src/programs/pestpp-pso/parunc.f90
diff --git a/src/programs/pestpp-pso/pertsubs.f90 b/src/programs/pestpp-pso/pertsubs.f90
diff --git a/src/programs/pestpp-pso/pestpp-pso.u2d b/src/programs/pestpp-pso/pestpp-pso.u2d
diff --git a/src/programs/pestpp-pso/pestpp-pso.vfproj b/src/programs/pestpp-pso/pestpp-pso.vfproj
diff --git a/src/programs/pestpp-pso/psomain.f90 b/src/programs/pestpp-pso/psomain.f90
diff --git a/src/programs/pestpp-pso/readsubs.f90 b/src/programs/pestpp-pso/readsubs.f90
diff --git a/src/programs/pestpp-pso/rmsubs.f90 b/src/programs/pestpp-pso/rmsubs.f90
diff --git a/src/programs/pestpp-pso/utilsubs.f90 b/src/programs/pestpp-pso/utilsubs.f90
diff --git a/src/programs/pestpp-pso/writesubs.f90 b/src/programs/pestpp-pso/writesubs.f90
diff --git a/src/utilities/sweep/Makefile → src/programs/sweep/Makefile b/src/utilities/sweep/Makefile → src/programs/sweep/Makefile
diff --git a/src/utilities/sweep/ReadMe.txt → src/programs/sweep/ReadMe.txt b/src/utilities/sweep/ReadMe.txt → src/programs/sweep/ReadMe.txt
diff --git a/src/programs/sweep/pestpp-swp.vcxproj b/src/programs/sweep/pestpp-swp.vcxproj
diff --git a/src/programs/sweep/pestpp-swp.vcxproj.user b/src/programs/sweep/pestpp-swp.vcxproj.user
diff --git a/src/utilities/sweep/sweep.cpp → src/programs/sweep/sweep.cpp b/src/utilities/sweep/sweep.cpp → src/programs/sweep/sweep.cpp
diff --git a/src/utilities/sweep/sweep.vcxproj → src/programs/sweep/sweep.vcxproj b/src/utilities/sweep/sweep.vcxproj → src/programs/sweep/sweep.vcxproj
diff --git a/src/programs/sweep/sweep.vcxproj.user b/src/programs/sweep/sweep.vcxproj.user
diff --git a/src/utilities/sweep/sweep_intel.vcxproj → src/programs/sweep/sweep_intel.vcxproj b/src/utilities/sweep/sweep_intel.vcxproj → src/programs/sweep/sweep_intel.vcxproj
diff --git a/src/utilities/Makefile b/src/utilities/Makefile
diff --git a/src/utilities/ascii2pbin/Makefile b/src/utilities/ascii2pbin/Makefile
diff --git a/src/utilities/ascii2pbin/ascii2pbin.cpp b/src/utilities/ascii2pbin/ascii2pbin.cpp
diff --git a/src/utilities/ascii2pbin/ascii2pbin.vcxproj b/src/utilities/ascii2pbin/ascii2pbin.vcxproj
diff --git a/src/utilities/ascii2pbin/ascii2pbin.vcxproj.filters b/src/utilities/ascii2pbin/ascii2pbin.vcxproj.filters
diff --git a/src/utilities/ascii2pbin/ascii2pbin_intel.vcxproj b/src/utilities/ascii2pbin/ascii2pbin_intel.vcxproj
diff --git a/src/utilities/pbin2ascii/Makefile b/src/utilities/pbin2ascii/Makefile
diff --git a/src/utilities/pbin2ascii/pbin2ascii.vcxproj b/src/utilities/pbin2ascii/pbin2ascii.vcxproj
diff --git a/src/utilities/pbin2ascii/pbin2ascii.vcxproj.filters b/src/utilities/pbin2ascii/pbin2ascii.vcxproj.filters
diff --git a/src/utilities/pbin2ascii/pbin2ascii.vcxproj.user b/src/utilities/pbin2ascii/pbin2ascii.vcxproj.user
diff --git a/src/utilities/pbin2ascii/pbin2ascii_intel.vcxproj b/src/utilities/pbin2ascii/pbin2ascii_intel.vcxproj
diff --git a/src/utilities/pbin2ascii/pbin2asciicpp.cpp b/src/utilities/pbin2ascii/pbin2asciicpp.cpp
diff --git a/src/utilities/pbin_dump/Makefile b/src/utilities/pbin_dump/Makefile
diff --git a/src/utilities/pbin_dump/pbin_dump.cpp b/src/utilities/pbin_dump/pbin_dump.cpp
diff --git a/src/utilities/pbin_dump/pbin_dump.vcxproj b/src/utilities/pbin_dump/pbin_dump.vcxproj
diff --git a/src/utilities/pbin_dump/pbin_dump.vcxproj.filters b/src/utilities/pbin_dump/pbin_dump.vcxproj.filters
diff --git a/src/utilities/pbin_dump/pbin_dump.vcxproj.user b/src/utilities/pbin_dump/pbin_dump.vcxproj.user
diff --git a/src/utilities/pbin_dump/pbin_dump_intel.vcxproj b/src/utilities/pbin_dump/pbin_dump_intel.vcxproj
diff --git a/src/utilities/sweep/sweep.vcxproj.filters b/src/utilities/sweep/sweep.vcxproj.filters