Skip to content

Commit

Permalink
Merge branch 'master' into lbfgs
Browse files Browse the repository at this point in the history
  • Loading branch information
conradhuebler committed Oct 13, 2023
2 parents 4aba1b4 + 51487d3 commit fffbdda
Show file tree
Hide file tree
Showing 23 changed files with 793 additions and 518 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ if(USE_XTB)
)
FetchContent_MakeAvailable("mctc-lib")
endif()
include_directories(SYSTEM ${PROJECT_BINARY_DIR}/_deps/tblite-src/include/)

if(HELPERS)
add_executable(xtb_helper
Expand Down
2 changes: 1 addition & 1 deletion external/xtb
Submodule xtb updated 95 files
+90 −14 .github/workflows/fortran-build.yml
+8 −1 .gitignore
+10 −3 CMakeLists.txt
+12 −3 README.md
+1 −0 cmake/CMakeLists.txt
+91 −0 cmake/modules/Findcpcmx.cmake
+21 −0 man/xcontrol.7.adoc
+35 −9 man/xtb.1.adoc
+3 −2 meson.build
+14 −0 meson/meson.build
+8 −0 meson_options.txt
+3 −0 src/CMakeLists.txt
+28 −0 src/aespot.f90
+1 −1 src/bias_path.f90
+9 −7 src/cube.f90
+503 −0 src/dipro.F90
+28 −0 src/dipro/CMakeLists.txt
+65 −0 src/dipro/bondorder.F90
+88 −0 src/dipro/fragment.f90
+25 −0 src/dipro/meson.build
+123 −0 src/dipro/output.f90
+60 −0 src/dipro/version.f90
+62 −0 src/dipro/xtb.F90
+1 −1 src/docking/param.f90
+16 −19 src/docking/search_nci.f90
+17 −6 src/docking/set_module.f90
+23 −7 src/dynamic.f90
+26 −4 src/extern/driver.f90
+97 −30 src/extern/orca.f90
+219 −42 src/extern/turbomole.f90
+7 −0 src/features.F90
+0 −1 src/filetools.F90
+48 −15 src/geoopt_driver.f90
+51 −20 src/gfnff/calculator.f90
+3,118 −2,856 src/gfnff/gfnff_eg.f90
+137 −12 src/gfnff/gfnff_ini.f90
+5 −2 src/gfnff/gfnff_setup.f90
+5 −2 src/gfnff/topology.f90
+17 −7 src/header.f90
+2 −0 src/iff/iff_energy.f90
+13 −4 src/io/writer.f90
+6 −5 src/local.f90
+10 −1 src/main/json.f90
+19 −0 src/main/property.F90
+14 −9 src/main/setup.f90
+5 −0 src/mctc/systools.F90
+3 −0 src/meson.build
+1,162 −277 src/oniom.f90
+27 −7 src/optimizer.f90
+25 −4 src/peeq_module.f90
+34 −12 src/prog/dock.f90
+187 −74 src/prog/main.F90
+1 −1 src/prog/primary.f90
+2 −2 src/prog/thermo.f90
+1 −1 src/qsort.f90
+21 −9 src/readin.f90
+46 −2 src/scc_core.f90
+27 −7 src/scf_module.F90
+190 −28 src/set_module.f90
+54 −1 src/setparam.f90
+2 −0 src/solv/CMakeLists.txt
+23 −4 src/solv/cosmo.f90
+164 −0 src/solv/cpx.F90
+200 −0 src/solv/ddvolume.f90
+6 −0 src/solv/input.F90
+2 −0 src/solv/meson.build
+4 −0 src/solv/model.f90
+37 −12 src/tblite/calculator.F90
+1 −1 src/type/anc.f90
+7 −7 src/type/atomlist.f90
+6 −6 src/type/calculator.f90
+8 −2 src/type/iohandler.f90
+29 −6 src/type/molecule.f90
+13 −0 src/type/restart.F90
+157 −14 src/type/timer.f90
+30 −12 src/type/wavefunction.f90
+84 −0 src/vertical.f90
+35 −1 src/xhelp.f90
+32 −3 src/xtb/calculator.f90
+4 −0 subprojects/cpx.wrap
+1 −1 subprojects/dftd4.wrap
+4 −0 subprojects/numsa.wrap
+1 −1 subprojects/s-dftd3.wrap
+1 −1 subprojects/test-drive.wrap
+1 −1 subprojects/toml-f.wrap
+4 −0 test/unit/CMakeLists.txt
+9 −1 test/unit/main.f90
+4 −0 test/unit/meson.build
+50 −0 test/unit/molstock.f90
+101 −0 test/unit/test_cpx.f90
+119 −0 test/unit/test_dipro.f90
+108 −2 test/unit/test_gfn2.f90
+2 −2 test/unit/test_gfnff.f90
+331 −0 test/unit/test_oniom.f90
+151 −0 test/unit/test_vertical.f90
2 changes: 0 additions & 2 deletions src/capabilities/analysenciplot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ void AnalyseNCIPlot::start()
std::vector<double> distances_1, distances_2;
std::map<int, std::map<double, double>::iterator> index_mapper_1, index_mapper_2;
for (auto iter = m_NCI1.begin(); iter != m_NCI1.end(); ++iter) {

if (index_mapper_1.find(int(iter->first * scaling)) == index_mapper_1.end())
index_mapper_1.insert(std::pair<int, std::map<double, double>::iterator>(int(iter->first * scaling), iter));

Expand All @@ -66,7 +65,6 @@ void AnalyseNCIPlot::start()
index_mapper_1.insert(std::pair<int, std::map<double, double>::iterator>(index_mapper_1.size(), m_NCI1.end()));

for (auto iter = m_NCI2.begin(); iter != m_NCI2.end(); ++iter) {

if (index_mapper_2.find(int(iter->first * scaling)) == index_mapper_2.end())
index_mapper_2.insert(std::pair<int, std::map<double, double>::iterator>(int(iter->first * scaling), iter));

Expand Down
Loading

0 comments on commit fffbdda

Please sign in to comment.