• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisão15f70245dcfd881d33b65b67342a3f97da46d5f2 (tree)
Hora2014-04-29 01:28:16
AutorMikiya Fujii <mikiya.fujii@gmai...>
CommiterMikiya Fujii

Mensagem de Log

F (fluorine) is added. #33721

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1667 1136aad2-a195-0410-b898-f5ea1d11b9d8

Mudança Sumário

Diff

--- a/doc/README.txt
+++ b/doc/README.txt
@@ -182,15 +182,18 @@ CAPABILITIES:
182182 i.e., MD(gs) and MD(es) mean Born-Oppenheimer Molecular Dynamics on ground and excited states, respectively.
183183
184184 -Elements
185- CNDO2 | H, Li, C, N, O, S
186- INDO | H, Li, C, N, O
187- ZINDO/S | H, C, N, O, S
188- MNDO | H, C, N, O, S, Zn
189- AM1 | H, C, N, O, S, Zn
190- AM1-D | H, C, N, O, S
191- PM3 | H, C, N, O, S, Zn
192- PM3-D | H, C, N, O, S
193- PM3/PDDG | H, C, N, O, S
185+ CNDO2 | H, Li, C, N, O, F, S
186+ INDO | H, Li, C, N, O, F,
187+ ZINDO/S | H, C, N, O, F, S
188+ MNDO | H, C, N, O, F, S, Zn
189+ AM1 | H, C, N, O, F, S, Zn
190+ AM1-D | H, C, N, O, F, S *
191+ PM3 | H, C, N, O, F, S, Zn
192+ PM3-D | H, C, N, O, F, S *
193+ PM3/PDDG | H, C, N, O, S
194+
195+ * For fluorine, semiempirical parameters used in the SCF of AM1-D and PM3-D are same with
196+ the original semiempirical parameters used in the SCF of AM1 and PM3, respectively.
194197
195198 -Parallelization
196199 Open MP parallelization: everywhere in MolDS
--- a/doc/refferences.txt
+++ b/doc/refferences.txt
@@ -38,6 +38,7 @@
3838 [DZHS_1985] M. J. S. Dewar, E. G. Zoebisch, E. F. Healy, and J. J. P. Stewart, J. Am. Chem. Soc. 107, 3902 (1985)
3939 [DR_1986] M. J. S. Dewar and C. H. Reynolds, J. Comp. Chem. 7, 140 (1986)
4040 [AEZ_1986] W. P. Anderson, W. D. Edwards, and M. C. Zerner, Inorg. Chem. 25, 2728 (1986)
41+[DZ_1988] M. J. S. Dewar and E. G. Zoebisch, J. Mol. Struc. (Theochem) 180, 1 (1988)
4142 [S_1989] J. J. P. Stewart, J. Comp. Chem. 10, 209 (1989)
4243 [S_1989-2] J. J. P. Stewart, J. Comp. Chem. 10, 221 (1989)
4344 [DL_1990] M. J. S. Dewar and D. A. Liotard, J. Mol. Struc.(Theochem) 206, 123(1990)
@@ -61,5 +62,6 @@
6162 [S_2007] J. J. P. Stewart, J. Mol. Model. 13, 1173 (2007)
6263 [MH_2007] J. P. McNamara and I. H. Hillier, Phys. Chem. Chem. Phys. 9, 2362 (2007)
6364 [MMHBV_2007] C. A. Morgado, J. P. McNamara, I. H. Hillier, N. A. Burton, and M. A. Vincent, J. Chem. Theory Comput. 3, 1656 (2007)
65+[MSVHM_2008] J. P. McNamara, R. Sharma, M. A. Vincent, I. H. Hillier, and C. A. Morgado, Phys. Chem. Chem. Phys. 10, 128 (2008)
6466 [F_2011] M. Fujii, J. Chem. Phys. 135, 114102-1 (2011)
6567
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,9 +38,9 @@ DEPFILE = obj/objfile.dep
3838 LDFLAGS = -Wl,-rpath=$(BOOST_LIB_DIR)
3939 THIS_MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
4040
41-ALL_CPP_FILES = base/Enums.cpp base/PrintController.cpp base/MolDSException.cpp base/MallocerFreer.cpp mpi/MpiProcess.cpp mpi/AsyncCommunicator.cpp wrappers/Blas.cpp wrappers/Lapack.cpp base/Utilities.cpp base/MathUtilities.cpp base/EularAngle.cpp base/Parameters.cpp base/RealSphericalHarmonicsIndex.cpp base/atoms/Atom.cpp base/atoms/Hatom.cpp base/atoms/Liatom.cpp base/atoms/Catom.cpp base/atoms/Natom.cpp base/atoms/Oatom.cpp base/atoms/Satom.cpp base/atoms/Znatom.cpp base/atoms/ghost/Ghost.cpp base/atoms/ghost/GhostHatom.cpp base/atoms/ghost/GhostLiatom.cpp base/atoms/ghost/GhostCatom.cpp base/atoms/ghost/GhostNatom.cpp base/atoms/ghost/GhostOatom.cpp base/atoms/ghost/GhostSatom.cpp base/atoms/ghost/GhostZnatom.cpp base/atoms/mm/EnvironmentalPointCharge.cpp base/factories/AtomFactory.cpp base/Molecule.cpp base/InputParser.cpp base/GTOExpansionSTO.cpp base/loggers/MOLogger.cpp base/loggers/DensityLogger.cpp base/loggers/HoleDensityLogger.cpp base/loggers/ParticleDensityLogger.cpp cndo/Cndo2.cpp indo/Indo.cpp zindo/ZindoS.cpp mndo/Mndo.cpp am1/Am1.cpp am1/Am1D.cpp pm3/Pm3.cpp pm3/Pm3D.cpp pm3/Pm3Pddg.cpp base/factories/ElectronicStructureFactory.cpp md/MD.cpp mc/MC.cpp rpmd/RPMD.cpp nasco/NASCO.cpp optimization/Optimizer.cpp optimization/ConjugateGradient.cpp optimization/SteepestDescent.cpp optimization/BFGS.cpp optimization/GEDIIS.cpp base/factories/OptimizerFactory.cpp base/MolDS.cpp Main.cpp
42-ALL_HEAD_FILES = config.h base/Enums.h base/Uncopyable.h base/PrintController.h base/MolDSException.h base/containers/ThreadSafeQueue.h base/MallocerFreer.h mpi/MpiInt.h mpi/MpiProcess.h mpi/AsyncCommunicator.h wrappers/Blas.h wrappers/Lapack.h base/Utilities.h base/MathUtilities.h base/EularAngle.h base/Parameters.h base/RealSphericalHarmonicsIndex.h base/atoms/Atom.h base/atoms/Hatom.h base/atoms/Liatom.h base/atoms/Catom.h base/atoms/Natom.h base/atoms/Oatom.h base/atoms/Satom.h base/atoms/Znatom.h base/atoms/ghost/Ghost.h base/atoms/ghost/GhostHatom.h base/atoms/ghost/GhostLiatom.h base/atoms/ghost/GhostCatom.h base/atoms/ghost/GhostNatom.h base/atoms/ghost/GhostOatom.h base/atoms/ghost/GhostSatom.h base/atoms/ghost/GhostZnatom.h base/atoms/mm/EnvironmentalPointCharge.h base/factories/AtomFactory.h base/Molecule.h base/InputParser.h base/GTOExpansionSTO.h base/loggers/MOLogger.h base/loggers/DensityLogger.h base/loggers/HoleDensityLogger.h base/loggers/ParticleDensityLogger.h base/ElectronicStructure.h cndo/Cndo2.h cndo/ReducedOverlapAOsParameters.h indo/Indo.h zindo/ZindoS.h mndo/Mndo.h am1/Am1.h am1/Am1D.h pm3/Pm3.h pm3/Pm3D.h pm3/Pm3Pddg.h base/factories/ElectronicStructureFactory.h md/MD.h mc/MC.h rpmd/RPMD.h nasco/NASCO.h optimization/Optimizer.h optimization/ConjugateGradient.h optimization/SteepestDescent.h optimization/BFGS.h optimization/GEDIIS.h base/factories/OptimizerFactory.h base/MolDS.h
43-ALL_OBJ_FILES = obj/Enums.o obj/PrintController.o obj/MolDSException.o obj/MallocerFreer.o obj/MpiProcess.o obj/AsyncCommunicator.o obj/Blas.o obj/Lapack.o obj/Utilities.o obj/MathUtilities.o obj/EularAngle.o obj/Parameters.o obj/RealSphericalHarmonicsIndex.o obj/Atom.o obj/Hatom.o obj/Liatom.o obj/Catom.o obj/Natom.o obj/Oatom.o obj/Satom.o obj/Znatom.o obj/Ghost.o obj/GhostHatom.o obj/GhostLiatom.o obj/GhostCatom.o obj/GhostNatom.o obj/GhostOatom.o obj/GhostSatom.o obj/GhostZnatom.o obj/EnvironmentalPointCharge.o obj/AtomFactory.o obj/Molecule.o obj/InputParser.o obj/GTOExpansionSTO.o obj/MOLogger.o obj/DensityLogger.o obj/HoleDensityLogger.o obj/ParticleDensityLogger.o obj/Cndo2.o obj/Indo.o obj/ZindoS.o obj/Mndo.o obj/Am1.o obj/Am1D.o obj/Pm3.o obj/Pm3D.o obj/Pm3Pddg.o obj/ElectronicStructureFactory.o obj/MD.o obj/MC.o obj/RPMD.o obj/NASCO.o obj/Optimizer.o obj/ConjugateGradient.o obj/SteepestDescent.o obj/BFGS.o obj/GEDIIS.o obj/OptimizerFactory.o obj/MolDS.o obj/Main.o
41+ALL_CPP_FILES = base/Enums.cpp base/PrintController.cpp base/MolDSException.cpp base/MallocerFreer.cpp mpi/MpiProcess.cpp mpi/AsyncCommunicator.cpp wrappers/Blas.cpp wrappers/Lapack.cpp base/Utilities.cpp base/MathUtilities.cpp base/EularAngle.cpp base/Parameters.cpp base/RealSphericalHarmonicsIndex.cpp base/atoms/Atom.cpp base/atoms/Hatom.cpp base/atoms/Liatom.cpp base/atoms/Catom.cpp base/atoms/Natom.cpp base/atoms/Oatom.cpp base/atoms/Fatom.cpp base/atoms/Satom.cpp base/atoms/Znatom.cpp base/atoms/ghost/Ghost.cpp base/atoms/ghost/GhostHatom.cpp base/atoms/ghost/GhostLiatom.cpp base/atoms/ghost/GhostCatom.cpp base/atoms/ghost/GhostNatom.cpp base/atoms/ghost/GhostOatom.cpp base/atoms/ghost/GhostFatom.cpp base/atoms/ghost/GhostSatom.cpp base/atoms/ghost/GhostZnatom.cpp base/atoms/mm/EnvironmentalPointCharge.cpp base/factories/AtomFactory.cpp base/Molecule.cpp base/InputParser.cpp base/GTOExpansionSTO.cpp base/loggers/MOLogger.cpp base/loggers/DensityLogger.cpp base/loggers/HoleDensityLogger.cpp base/loggers/ParticleDensityLogger.cpp cndo/Cndo2.cpp indo/Indo.cpp zindo/ZindoS.cpp mndo/Mndo.cpp am1/Am1.cpp am1/Am1D.cpp pm3/Pm3.cpp pm3/Pm3D.cpp pm3/Pm3Pddg.cpp base/factories/ElectronicStructureFactory.cpp md/MD.cpp mc/MC.cpp rpmd/RPMD.cpp nasco/NASCO.cpp optimization/Optimizer.cpp optimization/ConjugateGradient.cpp optimization/SteepestDescent.cpp optimization/BFGS.cpp optimization/GEDIIS.cpp base/factories/OptimizerFactory.cpp base/MolDS.cpp Main.cpp
42+ALL_HEAD_FILES = config.h base/Enums.h base/Uncopyable.h base/PrintController.h base/MolDSException.h base/containers/ThreadSafeQueue.h base/MallocerFreer.h mpi/MpiInt.h mpi/MpiProcess.h mpi/AsyncCommunicator.h wrappers/Blas.h wrappers/Lapack.h base/Utilities.h base/MathUtilities.h base/EularAngle.h base/Parameters.h base/RealSphericalHarmonicsIndex.h base/atoms/Atom.h base/atoms/Hatom.h base/atoms/Liatom.h base/atoms/Catom.h base/atoms/Natom.h base/atoms/Oatom.h base/atoms/Fatom.h base/atoms/Satom.h base/atoms/Znatom.h base/atoms/ghost/Ghost.h base/atoms/ghost/GhostHatom.h base/atoms/ghost/GhostLiatom.h base/atoms/ghost/GhostCatom.h base/atoms/ghost/GhostNatom.h base/atoms/ghost/GhostOatom.h base/atoms/ghost/GhostFatom.h base/atoms/ghost/GhostSatom.h base/atoms/ghost/GhostZnatom.h base/atoms/mm/EnvironmentalPointCharge.h base/factories/AtomFactory.h base/Molecule.h base/InputParser.h base/GTOExpansionSTO.h base/loggers/MOLogger.h base/loggers/DensityLogger.h base/loggers/HoleDensityLogger.h base/loggers/ParticleDensityLogger.h base/ElectronicStructure.h cndo/Cndo2.h cndo/ReducedOverlapAOsParameters.h indo/Indo.h zindo/ZindoS.h mndo/Mndo.h am1/Am1.h am1/Am1D.h pm3/Pm3.h pm3/Pm3D.h pm3/Pm3Pddg.h base/factories/ElectronicStructureFactory.h md/MD.h mc/MC.h rpmd/RPMD.h nasco/NASCO.h optimization/Optimizer.h optimization/ConjugateGradient.h optimization/SteepestDescent.h optimization/BFGS.h optimization/GEDIIS.h base/factories/OptimizerFactory.h base/MolDS.h
43+ALL_OBJ_FILES = obj/Enums.o obj/PrintController.o obj/MolDSException.o obj/MallocerFreer.o obj/MpiProcess.o obj/AsyncCommunicator.o obj/Blas.o obj/Lapack.o obj/Utilities.o obj/MathUtilities.o obj/EularAngle.o obj/Parameters.o obj/RealSphericalHarmonicsIndex.o obj/Atom.o obj/Hatom.o obj/Liatom.o obj/Catom.o obj/Natom.o obj/Oatom.o obj/Fatom.o obj/Satom.o obj/Znatom.o obj/Ghost.o obj/GhostHatom.o obj/GhostLiatom.o obj/GhostCatom.o obj/GhostNatom.o obj/GhostOatom.o obj/GhostFatom.o obj/GhostSatom.o obj/GhostZnatom.o obj/EnvironmentalPointCharge.o obj/AtomFactory.o obj/Molecule.o obj/InputParser.o obj/GTOExpansionSTO.o obj/MOLogger.o obj/DensityLogger.o obj/HoleDensityLogger.o obj/ParticleDensityLogger.o obj/Cndo2.o obj/Indo.o obj/ZindoS.o obj/Mndo.o obj/Am1.o obj/Am1D.o obj/Pm3.o obj/Pm3D.o obj/Pm3Pddg.o obj/ElectronicStructureFactory.o obj/MD.o obj/MC.o obj/RPMD.o obj/NASCO.o obj/Optimizer.o obj/ConjugateGradient.o obj/SteepestDescent.o obj/BFGS.o obj/GEDIIS.o obj/OptimizerFactory.o obj/MolDS.o obj/Main.o
4444
4545 $(EXENAME): $(DEPFILE) $(ALL_OBJ_FILES)
4646 $(CC) -o $@ $(LDFLAGS) -L$(BOOST_LIB_DIR) $(ALL_OBJ_FILES) $(LIBS)
--- a/src/Makefile_GNU
+++ b/src/Makefile_GNU
@@ -35,9 +35,9 @@ DEPFILE = obj/objfile.dep
3535 LDFLAGS = -Wl,-rpath=$(BOOST_LIB_DIR) -Wl,-rpath=$(OPENBLAS_LIB_DIR)
3636 THIS_MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
3737
38-ALL_CPP_FILES = base/Enums.cpp base/PrintController.cpp base/MolDSException.cpp base/MallocerFreer.cpp mpi/MpiProcess.cpp mpi/AsyncCommunicator.cpp wrappers/Blas.cpp wrappers/Lapack.cpp base/Utilities.cpp base/MathUtilities.cpp base/EularAngle.cpp base/Parameters.cpp base/atoms/Atom.cpp base/atoms/Hatom.cpp base/atoms/Liatom.cpp base/atoms/Catom.cpp base/atoms/Natom.cpp base/atoms/Oatom.cpp base/atoms/Satom.cpp base/atoms/Znatom.cpp base/atoms/ghost/Ghost.cpp base/atoms/ghost/GhostHatom.cpp base/atoms/ghost/GhostLiatom.cpp base/atoms/ghost/GhostCatom.cpp base/atoms/ghost/GhostNatom.cpp base/atoms/ghost/GhostOatom.cpp base/atoms/ghost/GhostSatom.cpp base/atoms/ghost/GhostZnatom.cpp base/atoms/mm/EnvironmentalPointCharge.cpp base/factories/AtomFactory.cpp base/Molecule.cpp base/InputParser.cpp base/GTOExpansionSTO.cpp base/RealSphericalHarmonicsIndex.cpp base/loggers/MOLogger.cpp base/loggers/DensityLogger.cpp base/loggers/HoleDensityLogger.cpp base/loggers/ParticleDensityLogger.cpp cndo/Cndo2.cpp indo/Indo.cpp zindo/ZindoS.cpp mndo/Mndo.cpp am1/Am1.cpp am1/Am1D.cpp pm3/Pm3.cpp pm3/Pm3D.cpp pm3/Pm3Pddg.cpp base/factories/ElectronicStructureFactory.cpp md/MD.cpp mc/MC.cpp rpmd/RPMD.cpp nasco/NASCO.cpp optimization/Optimizer.cpp optimization/ConjugateGradient.cpp optimization/SteepestDescent.cpp optimization/BFGS.cpp optimization/GEDIIS.cpp base/factories/OptimizerFactory.cpp base/MolDS.cpp Main.cpp
39-ALL_HEAD_FILES = config.h base/Enums.h base/Uncopyable.h base/PrintController.h base/MolDSException.h base/containers/ThreadSafeQueue.h base/MallocerFreer.h mpi/MpiInt.h mpi/MpiProcess.h mpi/AsyncCommunicator.h wrappers/Blas.h wrappers/Lapack.h base/Utilities.h base/MathUtilities.h base/EularAngle.h base/Parameters.h base/atoms/Atom.h base/atoms/Hatom.h base/atoms/Liatom.h base/atoms/Catom.h base/atoms/Natom.h base/atoms/Oatom.h base/atoms/Satom.h base/atoms/Znatom.h base/atoms/ghost/Ghost.h base/atoms/ghost/GhostHatom.h base/atoms/ghost/GhostLiatom.h base/atoms/ghost/GhostCatom.h base/atoms/ghost/GhostNatom.h base/atoms/ghost/GhostOatom.h base/atoms/ghost/GhostSatom.h base/atoms/ghost/GhostZnatom.h base/atoms/mm/EnvironmentalPointCharge.h base/factories/AtomFactory.h base/Molecule.h base/InputParser.h base/GTOExpansionSTO.h base/RealSphericalHarmonicsIndex.h base/loggers/MOLogger.h base/loggers/DensityLogger.h base/loggers/HoleDensityLogger.h base/loggers/ParticleDensityLogger.h base/ElectronicStructure.h cndo/Cndo2.h cndo/ReducedOverlapAOsParameters.h indo/Indo.h zindo/ZindoS.h mndo/Mndo.h am1/Am1.h am1/Am1D.h pm3/Pm3.h pm3/Pm3D.h pm3/Pm3Pddg.h base/factories/ElectronicStructureFactory.h md/MD.h mc/MC.h rpmd/RPMD.h nasco/NASCO.h optimization/Optimizer.h optimization/ConjugateGradient.h optimization/SteepestDescent.h optimization/BFGS.h optimization/GEDIIS.h base/factories/OptimizerFactory.h base/MolDS.h
40-ALL_OBJ_FILES = obj/Enums.o obj/PrintController.o obj/MolDSException.o obj/MallocerFreer.o obj/MpiProcess.o obj/AsyncCommunicator.o obj/Blas.o obj/Lapack.o obj/Utilities.o obj/MathUtilities.o obj/EularAngle.o obj/Parameters.o obj/Atom.o obj/Hatom.o obj/Liatom.o obj/Catom.o obj/Natom.o obj/Oatom.o obj/Satom.o obj/Znatom.o obj/Ghost.o obj/GhostHatom.o obj/GhostLiatom.o obj/GhostCatom.o obj/GhostNatom.o obj/GhostOatom.o obj/GhostSatom.o obj/GhostZnatom.o obj/EnvironmentalPointCharge.o obj/AtomFactory.o obj/Molecule.o obj/InputParser.o obj/GTOExpansionSTO.o obj/RealSphericalHarmonicsIndex.o obj/MOLogger.o obj/DensityLogger.o obj/HoleDensityLogger.o obj/ParticleDensityLogger.o obj/Cndo2.o obj/Indo.o obj/ZindoS.o obj/Mndo.o obj/Am1.o obj/Am1D.o obj/Pm3.o obj/Pm3D.o obj/Pm3Pddg.o obj/ElectronicStructureFactory.o obj/MD.o obj/MC.o obj/RPMD.o obj/NASCO.o obj/Optimizer.o obj/ConjugateGradient.o obj/SteepestDescent.o obj/BFGS.o obj/GEDIIS.o obj/OptimizerFactory.o obj/MolDS.o obj/Main.o
38+ALL_CPP_FILES = base/Enums.cpp base/PrintController.cpp base/MolDSException.cpp base/MallocerFreer.cpp mpi/MpiProcess.cpp mpi/AsyncCommunicator.cpp wrappers/Blas.cpp wrappers/Lapack.cpp base/Utilities.cpp base/MathUtilities.cpp base/EularAngle.cpp base/Parameters.cpp base/atoms/Atom.cpp base/atoms/Hatom.cpp base/atoms/Liatom.cpp base/atoms/Catom.cpp base/atoms/Natom.cpp base/atoms/Oatom.cpp base/atoms/Fatom.cpp base/atoms/Satom.cpp base/atoms/Znatom.cpp base/atoms/ghost/Ghost.cpp base/atoms/ghost/GhostHatom.cpp base/atoms/ghost/GhostLiatom.cpp base/atoms/ghost/GhostCatom.cpp base/atoms/ghost/GhostNatom.cpp base/atoms/ghost/GhostOatom.cpp base/atoms/ghost/GhostFatom.cpp base/atoms/ghost/GhostSatom.cpp base/atoms/ghost/GhostZnatom.cpp base/atoms/mm/EnvironmentalPointCharge.cpp base/factories/AtomFactory.cpp base/Molecule.cpp base/InputParser.cpp base/GTOExpansionSTO.cpp base/RealSphericalHarmonicsIndex.cpp base/loggers/MOLogger.cpp base/loggers/DensityLogger.cpp base/loggers/HoleDensityLogger.cpp base/loggers/ParticleDensityLogger.cpp cndo/Cndo2.cpp indo/Indo.cpp zindo/ZindoS.cpp mndo/Mndo.cpp am1/Am1.cpp am1/Am1D.cpp pm3/Pm3.cpp pm3/Pm3D.cpp pm3/Pm3Pddg.cpp base/factories/ElectronicStructureFactory.cpp md/MD.cpp mc/MC.cpp rpmd/RPMD.cpp nasco/NASCO.cpp optimization/Optimizer.cpp optimization/ConjugateGradient.cpp optimization/SteepestDescent.cpp optimization/BFGS.cpp optimization/GEDIIS.cpp base/factories/OptimizerFactory.cpp base/MolDS.cpp Main.cpp
39+ALL_HEAD_FILES = config.h base/Enums.h base/Uncopyable.h base/PrintController.h base/MolDSException.h base/containers/ThreadSafeQueue.h base/MallocerFreer.h mpi/MpiInt.h mpi/MpiProcess.h mpi/AsyncCommunicator.h wrappers/Blas.h wrappers/Lapack.h base/Utilities.h base/MathUtilities.h base/EularAngle.h base/Parameters.h base/atoms/Atom.h base/atoms/Hatom.h base/atoms/Liatom.h base/atoms/Catom.h base/atoms/Natom.h base/atoms/Oatom.h base/atoms/Fatom.h base/atoms/Satom.h base/atoms/Znatom.h base/atoms/ghost/Ghost.h base/atoms/ghost/GhostHatom.h base/atoms/ghost/GhostLiatom.h base/atoms/ghost/GhostCatom.h base/atoms/ghost/GhostNatom.h base/atoms/ghost/GhostOatom.h base/atoms/ghost/GhostFatom.h base/atoms/ghost/GhostSatom.h base/atoms/ghost/GhostZnatom.h base/atoms/mm/EnvironmentalPointCharge.h base/factories/AtomFactory.h base/Molecule.h base/InputParser.h base/GTOExpansionSTO.h base/RealSphericalHarmonicsIndex.h base/loggers/MOLogger.h base/loggers/DensityLogger.h base/loggers/HoleDensityLogger.h base/loggers/ParticleDensityLogger.h base/ElectronicStructure.h cndo/Cndo2.h cndo/ReducedOverlapAOsParameters.h indo/Indo.h zindo/ZindoS.h mndo/Mndo.h am1/Am1.h am1/Am1D.h pm3/Pm3.h pm3/Pm3D.h pm3/Pm3Pddg.h base/factories/ElectronicStructureFactory.h md/MD.h mc/MC.h rpmd/RPMD.h nasco/NASCO.h optimization/Optimizer.h optimization/ConjugateGradient.h optimization/SteepestDescent.h optimization/BFGS.h optimization/GEDIIS.h base/factories/OptimizerFactory.h base/MolDS.h
40+ALL_OBJ_FILES = obj/Enums.o obj/PrintController.o obj/MolDSException.o obj/MallocerFreer.o obj/MpiProcess.o obj/AsyncCommunicator.o obj/Blas.o obj/Lapack.o obj/Utilities.o obj/MathUtilities.o obj/EularAngle.o obj/Parameters.o obj/Atom.o obj/Hatom.o obj/Liatom.o obj/Catom.o obj/Natom.o obj/Oatom.o obj/Fatom.o obj/Satom.o obj/Znatom.o obj/Ghost.o obj/GhostHatom.o obj/GhostLiatom.o obj/GhostCatom.o obj/GhostNatom.o obj/GhostOatom.o obj/GhostFatom.o obj/GhostSatom.o obj/GhostZnatom.o obj/EnvironmentalPointCharge.o obj/AtomFactory.o obj/Molecule.o obj/InputParser.o obj/GTOExpansionSTO.o obj/RealSphericalHarmonicsIndex.o obj/MOLogger.o obj/DensityLogger.o obj/HoleDensityLogger.o obj/ParticleDensityLogger.o obj/Cndo2.o obj/Indo.o obj/ZindoS.o obj/Mndo.o obj/Am1.o obj/Am1D.o obj/Pm3.o obj/Pm3D.o obj/Pm3Pddg.o obj/ElectronicStructureFactory.o obj/MD.o obj/MC.o obj/RPMD.o obj/NASCO.o obj/Optimizer.o obj/ConjugateGradient.o obj/SteepestDescent.o obj/BFGS.o obj/GEDIIS.o obj/OptimizerFactory.o obj/MolDS.o obj/Main.o
4141
4242 $(EXENAME): $(DEPFILE) $(ALL_OBJ_FILES)
4343 $(CC) -o $@ $(LDFLAGS) $(ALL_OBJ_FILES) -L$(BOOST_LIB_DIR) -L$(OPENBLAS_LIB_DIR) $(LIBS)
--- a/src/am1/Am1.cpp
+++ b/src/am1/Am1.cpp
@@ -40,6 +40,7 @@
4040 #include"../base/atoms/Catom.h"
4141 #include"../base/atoms/Natom.h"
4242 #include"../base/atoms/Oatom.h"
43+#include"../base/atoms/Fatom.h"
4344 #include"../base/atoms/Satom.h"
4445 #include"../base/Molecule.h"
4546 #include"../base/ElectronicStructure.h"
@@ -132,6 +133,7 @@ void Am1::SetEnableAtomTypes(){
132133 this->enableAtomTypes.push_back(C);
133134 this->enableAtomTypes.push_back(N);
134135 this->enableAtomTypes.push_back(O);
136+ this->enableAtomTypes.push_back(F);
135137 this->enableAtomTypes.push_back(S);
136138 this->enableAtomTypes.push_back(Zn);
137139 }
--- a/src/am1/Am1D.cpp
+++ b/src/am1/Am1D.cpp
@@ -40,6 +40,7 @@
4040 #include"../base/atoms/Catom.h"
4141 #include"../base/atoms/Natom.h"
4242 #include"../base/atoms/Oatom.h"
43+#include"../base/atoms/Fatom.h"
4344 #include"../base/atoms/Satom.h"
4445 #include"../base/Molecule.h"
4546 #include"../base/ElectronicStructure.h"
@@ -134,6 +135,7 @@ void Am1D::SetEnableAtomTypes(){
134135 this->enableAtomTypes.push_back(C);
135136 this->enableAtomTypes.push_back(N);
136137 this->enableAtomTypes.push_back(O);
138+ this->enableAtomTypes.push_back(F);
137139 this->enableAtomTypes.push_back(S);
138140 }
139141
--- a/src/base/InputParser.cpp
+++ b/src/base/InputParser.cpp
@@ -490,6 +490,9 @@ int InputParser::ParseMolecularConfiguration(Molecule* molecule, vector<string>*
490490 else if((*inputTerms)[parseIndex] == "o"){
491491 atomType = O;
492492 }
493+ else if((*inputTerms)[parseIndex] == "f"){
494+ atomType = F;
495+ }
493496 else if((*inputTerms)[parseIndex] == "s"){
494497 atomType = S;
495498 }
@@ -526,6 +529,9 @@ int InputParser::ParseGhostsConfiguration(Molecule* molecule, vector<string>* in
526529 else if((*inputTerms)[parseIndex] == "o"){
527530 atomType = ghostO;
528531 }
532+ else if((*inputTerms)[parseIndex] == "f"){
533+ atomType = ghostF;
534+ }
529535 else if((*inputTerms)[parseIndex] == "s"){
530536 atomType = ghostS;
531537 }
--- a/src/base/atoms/Atom.h
+++ b/src/base/atoms/Atom.h
@@ -65,45 +65,45 @@ public:
6565 MolDS_base::TheoryType theory) const;
6666 inline double GetIndoF2() const{return this->indoF2;}
6767 inline double GetIndoG1() const{return this->indoG1;}
68- inline double GetZindoF0ss() const{return this->zindoF0ss;} // Table 1 in ref. [RZ_1976], Table 1 in [AEZ_1986], or Table 1 in [GD_1972]
68+ inline double GetZindoF0ss() const{return this->zindoF0ss;} // Table 1 in [RZ_1976], Table 1 in [AEZ_1986], or Table 1 in [GD_1972]
6969 inline double GetZindoF0sd() const{return this->zindoF0sd;} // Table 1 in [AEZ_1986]
7070 inline double GetZindoF0dd() const{return this->zindoF0dd;} // Table 1 in [AEZ_1986]
71- inline double GetZindoG1sp() const{return this->zindoG1sp;} // Table 3 in ref. [BZ_1979]
72- inline double GetZindoF2pp() const{return this->zindoF2pp;} // Table 3 in ref. [BZ_1979]
73- inline double GetZindoG2sd() const{return this->zindoG2sd;} // Table 3 in ref. [BZ_1979]
74- inline double GetZindoG1pd() const{return this->zindoG1pd;} // Table 3 in ref. [BZ_1979]
75- inline double GetZindoF2pd() const{return this->zindoF2pd;} // Table 3 in ref. [BZ_1979]
76- inline double GetZindoG3pd() const{return this->zindoG3pd;} // Table 3 in ref. [BZ_1979]
77- inline double GetZindoF2dd() const{return this->zindoF2dd;} // Table 3 in ref. [BZ_1979]
78- inline double GetZindoF4dd() const{return this->zindoF4dd;} // Table 3 in ref. [BZ_1979]
79- inline double GetZindoF0ssLower() const{return this->zindoF0ss;} // Apendix in ref. [BZ_1979]
80- inline double GetZindoF0sdLower() const{return this->zindoF0sd;} // Apendix in ref. [BZ_1979]
81- inline double GetZindoF0ddLower() const{return this->zindoF0dd;} // Apendix in ref. [BZ_1979]
82- inline double GetZindoG1spLower() const{return this->zindoG1sp/3.0; } // Apendix in ref. [BZ_1979]
83- inline double GetZindoF2ppLower() const{return this->zindoF2pp/25.0; } // Apendix in ref. [BZ_1979]
84- inline double GetZindoG2sdLower() const{return this->zindoG2sd/5.0; } // Apendix in ref. [BZ_1979]
85- inline double GetZindoG1pdLower() const{return this->zindoG1pd/15.0; } // Apendix in ref. [BZ_1979]
86- inline double GetZindoF2pdLower() const{return this->zindoF2pd/35.0; } // Apendix in ref. [BZ_1979]
87- inline double GetZindoG3pdLower() const{return this->zindoG3pd/245.0;} // Apendix in ref. [BZ_1979]
88- inline double GetZindoF2ddLower() const{return this->zindoF2dd/49.0; } // Apendix in ref. [BZ_1979]
89- inline double GetZindoF4ddLower() const{return this->zindoF4dd/441.0;} // Apendix in ref. [BZ_1979]
71+ inline double GetZindoG1sp() const{return this->zindoG1sp;} // Table 3 in [BZ_1979]
72+ inline double GetZindoF2pp() const{return this->zindoF2pp;} // Table 3 in [BZ_1979]
73+ inline double GetZindoG2sd() const{return this->zindoG2sd;} // Table 3 in [BZ_1979]
74+ inline double GetZindoG1pd() const{return this->zindoG1pd;} // Table 3 in [BZ_1979]
75+ inline double GetZindoF2pd() const{return this->zindoF2pd;} // Table 3 in [BZ_1979]
76+ inline double GetZindoG3pd() const{return this->zindoG3pd;} // Table 3 in [BZ_1979]
77+ inline double GetZindoF2dd() const{return this->zindoF2dd;} // Table 3 in [BZ_1979]
78+ inline double GetZindoF4dd() const{return this->zindoF4dd;} // Table 3 in [BZ_1979]
79+ inline double GetZindoF0ssLower() const{return this->zindoF0ss;} // Apendix in [BZ_1979]
80+ inline double GetZindoF0sdLower() const{return this->zindoF0sd;} // Apendix in [BZ_1979]
81+ inline double GetZindoF0ddLower() const{return this->zindoF0dd;} // Apendix in [BZ_1979]
82+ inline double GetZindoG1spLower() const{return this->zindoG1sp/3.0; } // Apendix in [BZ_1979]
83+ inline double GetZindoF2ppLower() const{return this->zindoF2pp/25.0; } // Apendix in [BZ_1979]
84+ inline double GetZindoG2sdLower() const{return this->zindoG2sd/5.0; } // Apendix in [BZ_1979]
85+ inline double GetZindoG1pdLower() const{return this->zindoG1pd/15.0; } // Apendix in [BZ_1979]
86+ inline double GetZindoF2pdLower() const{return this->zindoF2pd/35.0; } // Apendix in [BZ_1979]
87+ inline double GetZindoG3pdLower() const{return this->zindoG3pd/245.0;} // Apendix in [BZ_1979]
88+ inline double GetZindoF2ddLower() const{return this->zindoF2dd/49.0; } // Apendix in [BZ_1979]
89+ inline double GetZindoF4ddLower() const{return this->zindoF4dd/441.0;} // Apendix in [BZ_1979]
9090 double GetZindoIonPot(MolDS_base::OrbitalType orbital) const;
91- double GetNddoAlpha(MolDS_base::TheoryType theory) const; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S for MNDO. Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
91+ double GetNddoAlpha(MolDS_base::TheoryType theory) const; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S for MNDO. Table I in [DZHS_1985] for H, C, N, and O. Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
9292 double GetNddoDerivedParameterD(MolDS_base::TheoryType theory,
93- MolDS_base::MultipoleType multipole) const; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S. Or, calculated in tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
93+ MolDS_base::MultipoleType multipole) const; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S. Or, calculated in tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
9494 double GetNddoDerivedParameterRho(MolDS_base::TheoryType theory,
95- MolDS_base::MultipoleType multipole) const; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S. Or, calculated in tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
96- double GetMndoElecEnergyAtom() const; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
97- double GetMndoHeatsFormAtom() const; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
95+ MolDS_base::MultipoleType multipole) const; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S. Or, calculated in tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
96+ double GetMndoElecEnergyAtom() const; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
97+ double GetMndoHeatsFormAtom() const; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
9898 double GetNddoGss(MolDS_base::TheoryType theory) const;
9999 double GetNddoGpp(MolDS_base::TheoryType theory) const;
100100 double GetNddoGsp(MolDS_base::TheoryType theory) const;
101101 double GetNddoGpp2(MolDS_base::TheoryType theory) const;
102102 double GetNddoHsp(MolDS_base::TheoryType theory) const;
103103 double GetNddoHpp(MolDS_base::TheoryType theory) const;
104- double GetNddoParameterK(MolDS_base::TheoryType theory, int kIndex) const;//Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
105- double GetNddoParameterL(MolDS_base::TheoryType theory, int lIndex) const;//Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
106- double GetNddoParameterM(MolDS_base::TheoryType theory, int mIndex) const;//Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
104+ double GetNddoParameterK(MolDS_base::TheoryType theory, int kIndex) const;//Table I in [DZHS_1985] for H, C, N, and O. Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
105+ double GetNddoParameterL(MolDS_base::TheoryType theory, int lIndex) const;//Table I in [DZHS_1985] for H, C, N, and O. Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
106+ double GetNddoParameterM(MolDS_base::TheoryType theory, int mIndex) const;//Table I in [DZHS_1985] for H, C, N, and O. Table I in re. [DY_1990] for S for AM1. [S_1989] for PM3.
107107 double GetPm3PddgParameterPa(int paIndex) const;
108108 double GetPm3PddgParameterDa(int daIndex) const;
109109 protected:
@@ -116,8 +116,8 @@ protected:
116116 MolDS_base::ShellType valenceShellType;
117117 int firstAOIndex;
118118 int numberValenceElectrons;
119- double vdWCoefficient; // Table 1 in [G_2004] and [G_2006]
120- double vdWRadii; // Table 1 in [G_2004] and [G_2006]
119+ double vdWCoefficient; // Table 1 in [G_2004] for H, C, N, O, F, and Ne. And also [G_2006]. Table 1 in [MSVHM_2008] for H, C, N, O, and Cl.
120+ double vdWRadii; // Table 1 in [G_2004] for H, C, N, O, F, and Ne. And also [G_2006]. Table 1 in [MSVHM_2008] for H, C, N, O, and Cl.
121121 double imuAmuS; // Table 3.4 or 3.5 in J. A. Pople book
122122 double imuAmuP; // Table 3.4 or 3.5 in J. A. Pople book
123123 double imuAmuD; // Table 3.4 or 3.5 in J. A. Pople book
@@ -138,97 +138,97 @@ protected:
138138 double indoF2CoefficientP; // (3.93-3.99) in J. A. Pople book
139139 double zindoBondingParameterS; // Table 1 in [RZ_1976], table 1 in [HKLWNZ_1982], or table 3 in [AEZ_1986]
140140 double zindoBondingParameterD; // Table 1 in [RZ_1976], table 1 in [HKLWNZ_1982], or table 3 in [AEZ_1986]
141- double zindoF0ss; // Table 1 in ref. [RZ_1976], Table 1 in [AEZ_1986], or Table 1 in [GD_1972]
141+ double zindoF0ss; // Table 1 in [RZ_1976], Table 1 in [AEZ_1986], or Table 1 in [GD_1972]
142142 double zindoF0sd; // Table 1 in [AEZ_1986]
143143 double zindoF0dd; // Table 1 in [AEZ_1986]
144- double zindoG1sp; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
145- double zindoF2pp; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
146- double zindoG2sd; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
147- double zindoG1pd; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
148- double zindoF2pd; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
149- double zindoG3pd; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
150- double zindoF2dd; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
151- double zindoF4dd; // Table 3 in ref. [BZ_1979] or table 1 in [HKLWNZ_1982]
144+ double zindoG1sp; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
145+ double zindoF2pp; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
146+ double zindoG2sd; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
147+ double zindoG1pd; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
148+ double zindoF2pd; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
149+ double zindoG3pd; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
150+ double zindoF2dd; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
151+ double zindoF4dd; // Table 3 in [BZ_1979] or table 1 in [HKLWNZ_1982]
152152 int zindoL; // see l of (13) in [BZ_1979]
153153 int zindoM; // see m of (13) in [BZ_1979]
154154 int zindoN; // see n (13) in [BZ_1979]
155155 double zindoIonPotS; // Ionization potential, Table 4 in [BZ_1979]
156156 double zindoIonPotP; // Ionization potential, Table 4 in [BZ_1979]
157157 double zindoIonPotD; // Ionization potential, Table 4 in [BZ_1979]
158- double mndoCoreintegralS; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
159- double mndoCoreintegralP; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
160- double mndoOrbitalExponentS; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
161- double mndoOrbitalExponentP; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
162- double mndoBondingParameterS; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
163- double mndoBondingParameterP; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
164- double mndoAlpha; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
165- double mndoDerivedParameterD[3]; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S. Or, calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
166- double mndoDerivedParameterRho[3]; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S. Or, calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
167- double mndoElecEnergyAtom; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
168- double mndoHeatsFormAtom; // Table III in ref. [DT_1977-2] for H, B, C, N, O, and F. Table I & II in ref. [DMR_1978] and Table I in ref. [DR_1986] for S.
169- double mndoGss; //Table I in ref. [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
170- double mndoGpp; //Table I in ref. [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
171- double mndoGsp; //Table I in ref. [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
172- double mndoGpp2; //Table I in ref. [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
173- double mndoHsp; //Table I in ref. [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
174- double am1CoreintegralS; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
175- double am1CoreintegralP; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
176- double am1OrbitalExponentS;// Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
177- double am1OrbitalExponentP;// Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
178- double am1BondingParameterS; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
179- double am1BondingParameterP; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
180- double am1Alpha;// Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
181- double am1Gss; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
182- double am1Gpp; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
183- double am1Gsp; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
184- double am1Gpp2; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
185- double am1Hsp; // Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
158+ double mndoCoreintegralS; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
159+ double mndoCoreintegralP; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
160+ double mndoOrbitalExponentS; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
161+ double mndoOrbitalExponentP; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
162+ double mndoBondingParameterS; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
163+ double mndoBondingParameterP; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
164+ double mndoAlpha; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
165+ double mndoDerivedParameterD[3]; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S. Or, calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
166+ double mndoDerivedParameterRho[3];// Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S. Or, calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
167+ double mndoElecEnergyAtom; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
168+ double mndoHeatsFormAtom; // Table III in [DT_1977-2] for H, B, C, N, O, and F. Table I & II in [DMR_1978] and Table I in [DR_1986] for S.
169+ double mndoGss; //Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
170+ double mndoGpp; //Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
171+ double mndoGsp; //Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
172+ double mndoGpp2; //Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
173+ double mndoHsp; //Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl.
174+ double am1CoreintegralS; // Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
175+ double am1CoreintegralP; // Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
176+ double am1OrbitalExponentS; // Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
177+ double am1OrbitalExponentP; // Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
178+ double am1BondingParameterS; // Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
179+ double am1BondingParameterP; // Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
180+ double am1Alpha; // Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
181+ double am1Gss; // See the section "Parameters" in [DZHS_1985]. Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl. Table I in re. [DY_1990] for S.
182+ double am1Gpp; // See the section "Parameters" in [DZHS_1985]. Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl. Table I in re. [DY_1990] for S.
183+ double am1Gsp; // See the section "Parameters" in [DZHS_1985]. Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl. Table I in re. [DY_1990] for S.
184+ double am1Gpp2; // See the section "Parameters" in [DZHS_1985]. Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl. Table I in re. [DY_1990] for S.
185+ double am1Hsp; // See the section "Parameters" in [DZHS_1985]. Table I in [BDL_1975] for H, B, C, N, O, F, Si, P, S, and Cl. Table I in re. [DY_1990] for S.
186186 double am1DerivedParameterD[3]; // Calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
187187 double am1DerivedParameterRho[3]; // Calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
188- double am1ParameterK[4];// Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
189- double am1ParameterL[4];// Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
190- double am1ParameterM[4];// Table I in ref. [DZHS_1985] for H, C, N, O, and Table I in re. [DY_1990] for S.
191- double am1DCoreintegralS; // Table II in ref. [MH_2007] for H, C, N, and O and Table IV in ref. [MMHBV_2007] for S.
192- double am1DCoreintegralP; // Table II in ref. [MH_2007] for H, C, N, and O and Table IV in ref. [MMHBV_2007] for S.
193- double am1DBondingParameterS; // Table II in ref. [MH_2007] for H, C, N, O, and Table IV in re. [MMHBV_2007] for S.
194- double am1DBondingParameterP; // Table II in ref. [MH_2007] for H, C, N, O, and Table IV in re. [MMHBV_2007] for S.
195- double am1DAlpha; // Table II in ref. [MH_2007] for H, C, N, O, and Table IV in re. [MMHBV_2007] for S.
196- double pm3CoreintegralS; // Table II in ref. [S_1989].
197- double pm3CoreintegralP; // Table II in ref. [S_1989].
198- double pm3OrbitalExponentS;// Table II in ref. [S_1989].
199- double pm3OrbitalExponentP;// Table II in ref. [S_1989].
200- double pm3BondingParameterS; // Table II in ref. [S_1989].
201- double pm3BondingParameterP; // Table II in ref. [S_1989].
202- double pm3Alpha;// Table II in ref. [S_1989].
188+ double am1ParameterK[4];// Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
189+ double am1ParameterL[4];// Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
190+ double am1ParameterM[4];// Table I in [DZHS_1985] for H, C, N, and O. Table I in [DZ_1988] for F, Cl, Br, and I. Table I in re. [DY_1990] for S.
191+ double am1DCoreintegralS; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
192+ double am1DCoreintegralP; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
193+ double am1DBondingParameterS; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
194+ double am1DBondingParameterP; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
195+ double am1DAlpha; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
196+ double pm3CoreintegralS; // Table II in [S_1989].
197+ double pm3CoreintegralP; // Table II in [S_1989].
198+ double pm3OrbitalExponentS; // Table II in [S_1989].
199+ double pm3OrbitalExponentP; // Table II in [S_1989].
200+ double pm3BondingParameterS; // Table II in [S_1989].
201+ double pm3BondingParameterP; // Table II in [S_1989].
202+ double pm3Alpha; // Table II in [S_1989].
203203 double pm3DerivedParameterD[3]; // Calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
204204 double pm3DerivedParameterRho[3]; // Calculated by tools/deriveParametersNDDO/deriveParametersNDDO.cpp.
205- double pm3ParameterK[4];// Table II in ref. [S_1989].
206- double pm3ParameterL[4];// Table II in ref. [S_1989].
207- double pm3ParameterM[4];// Table II in ref. [S_1989].
208- double pm3Gss; // Table II in ref. [S_1989].
209- double pm3Gpp; // Table II in ref. [S_1989].
210- double pm3Gsp; // Table II in ref. [S_1989].
211- double pm3Gpp2; // Table II in ref. [S_1989].
212- double pm3Hsp; // Table II in ref. [S_1989].
213- double pm3PddgCoreintegralS; // Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
214- double pm3PddgCoreintegralP; // Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
215- double pm3PddgOrbitalExponentS;// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
216- double pm3PddgOrbitalExponentP;// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
217- double pm3PddgBondingParameterS; // Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
218- double pm3PddgBondingParameterP; // Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
219- double pm3PddgAlpha;// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
220- double pm3PddgDerivedParameterD[3]; // Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
221- double pm3PddgDerivedParameterRho[3]; // Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
222- double pm3PddgParameterK[4];// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
223- double pm3PddgParameterL[4];// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
224- double pm3PddgParameterM[4];// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
225- double pm3PddgParameterPa[2];// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
226- double pm3PddgParameterDa[2];// Table II in ref. [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
227- double pm3DCoreintegralS; // Table II in ref. [MH_2007] for H, C, N, and O and Table IV in ref. [MMHBV_2007] for S.
228- double pm3DCoreintegralP; // Table II in ref. [MH_2007] for H, C, N, and O and Table IV in ref. [MMHBV_2007] for S.
229- double pm3DBondingParameterS; // Table II in ref. [MH_2007] for H, C, N, O, and Table IV in re. [MMHBV_2007] for S.
230- double pm3DBondingParameterP; // Table II in ref. [MH_2007] for H, C, N, O, and Table IV in re. [MMHBV_2007] for S.
231- double pm3DAlpha; // Table II in ref. [MH_2007] for H, C, N, O, and Table IV in re. [MMHBV_2007] for S.
205+ double pm3ParameterK[4];// Table II in [S_1989].
206+ double pm3ParameterL[4];// Table II in [S_1989].
207+ double pm3ParameterM[4];// Table II in [S_1989].
208+ double pm3Gss; // Table II in [S_1989].
209+ double pm3Gpp; // Table II in [S_1989].
210+ double pm3Gsp; // Table II in [S_1989].
211+ double pm3Gpp2;// Table II in [S_1989].
212+ double pm3Hsp; // Table II in [S_1989].
213+ double pm3PddgCoreintegralS; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
214+ double pm3PddgCoreintegralP; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
215+ double pm3PddgOrbitalExponentS; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
216+ double pm3PddgOrbitalExponentP; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
217+ double pm3PddgBondingParameterS; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
218+ double pm3PddgBondingParameterP; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
219+ double pm3PddgAlpha; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
220+ double pm3PddgDerivedParameterD[3]; // Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
221+ double pm3PddgDerivedParameterRho[3];// Table II in [RCJ_2002] for H, C, N, O, and Table II in re. [BGJ_2003] for S.
222+ double pm3PddgParameterK[4]; // Table II in [RCJ_2002] for H, C, N, and O. Table II in re. [BGJ_2003] for S.
223+ double pm3PddgParameterL[4]; // Table II in [RCJ_2002] for H, C, N, and O. Table II in re. [BGJ_2003] for S.
224+ double pm3PddgParameterM[4]; // Table II in [RCJ_2002] for H, C, N, and O. Table II in re. [BGJ_2003] for S.
225+ double pm3PddgParameterPa[2];// Table II in [RCJ_2002] for H, C, N, and O. Table II in re. [BGJ_2003] for S.
226+ double pm3PddgParameterDa[2];// Table II in [RCJ_2002] for H, C, N, and O. Table II in re. [BGJ_2003] for S.
227+ double pm3DCoreintegralS; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
228+ double pm3DCoreintegralP; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
229+ double pm3DBondingParameterS; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
230+ double pm3DBondingParameterP; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
231+ double pm3DAlpha; // Table II in [MH_2007] for H, C, N, and O. Table IV in [MMHBV_2007] for S.
232232 virtual void SetAtomicParameters() = 0;
233233 private:
234234 Atom();
--- /dev/null
+++ b/src/base/atoms/Fatom.cpp
@@ -0,0 +1,219 @@
1+//************************************************************************//
2+// Copyright (C) 2011-2014 Mikiya Fujii //
3+// //
4+// This file is part of MolDS. //
5+// //
6+// MolDS is free software: you can redistribute it and/or modify //
7+// it under the terms of the GNU General Public License as published by //
8+// the Free Software Foundation, either version 3 of the License, or //
9+// (at your option) any later version. //
10+// //
11+// MolDS is distributed in the hope that it will be useful, //
12+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
13+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
14+// GNU General Public License for more details. //
15+// //
16+// You should have received a copy of the GNU General Public License //
17+// along with MolDS. If not, see <http://www.gnu.org/licenses/>. //
18+//************************************************************************//
19+#include<stdio.h>
20+#include<stdlib.h>
21+#include<iostream>
22+#include<sstream>
23+#include<math.h>
24+#include<vector>
25+#include<boost/format.hpp>
26+#include"../Enums.h"
27+#include"../Uncopyable.h"
28+#include"../PrintController.h"
29+#include"../MolDSException.h"
30+#include"../MallocerFreer.h"
31+#include"../../mpi/MpiInt.h"
32+#include"../../mpi/MpiProcess.h"
33+#include"../EularAngle.h"
34+#include"../Parameters.h"
35+#include"../RealSphericalHarmonicsIndex.h"
36+#include"Atom.h"
37+#include"Fatom.h"
38+using namespace std;
39+using namespace MolDS_base;
40+namespace MolDS_base_atoms{
41+Fatom::Fatom(int index) : Atom(index){
42+ this->SetAtomicParameters();
43+}
44+
45+Fatom::~Fatom(){}
46+
47+void Fatom::SetAtomicParameters(){
48+ this->atomType = F;
49+ this->atomicMass = 18.9984032*Parameters::GetInstance()->GetGMolin2AU();
50+ this->coreCharge = 7.0;
51+ this->numberValenceElectrons = 7;
52+ this->valenceShellType = lShell;
53+ this->valence.push_back(s);
54+ this->valence.push_back(py);
55+ this->valence.push_back(pz);
56+ this->valence.push_back(px);
57+ for(int i=0; i<this->valence.size();i++){
58+ this->realSphericalHarmonicsIndeces.push_back(new RealSphericalHarmonicsIndex(this->valence[i]));
59+ }
60+ this->vdWCoefficient = 0.57*Parameters::GetInstance()->GetJ2AU()
61+ *pow(Parameters::GetInstance()->GetNm2AU(),6.0)
62+ /Parameters::GetInstance()->GetAvogadro();
63+ this->vdWRadii = 1.430*Parameters::GetInstance()->GetAngstrom2AU();
64+ this->bondingParameter = -39.0*Parameters::GetInstance()->GetEV2AU();
65+ this->imuAmuS = 32.272*Parameters::GetInstance()->GetEV2AU();
66+ this->imuAmuP = 11.080*Parameters::GetInstance()->GetEV2AU();
67+ this->imuAmuD = 0.0;
68+ this->effectiveNuclearChargeK = 8.7;
69+ this->effectiveNuclearChargeL = 5.20;
70+ this->effectiveNuclearChargeMsp = 0.0;
71+ this->effectiveNuclearChargeMd = 0.0;
72+ this->indoG1 = 0.532305;
73+ this->indoF2 = 0.31580;
74+ this->indoF0CoefficientS = (this->coreCharge - 0.5);
75+ this->indoF0CoefficientP = (this->coreCharge - 0.5);
76+ this->indoG1CoefficientS = -1.0*(this->coreCharge - 1.5)/6.0;
77+ this->indoG1CoefficientP = -1.0/3.0;
78+ this->indoF2CoefficientS = 0.0;
79+ this->indoF2CoefficientP = -2.0*(this->coreCharge - 2.5)/25.0;
80+ this->zindoBondingParameterS = -44.0*Parameters::GetInstance()->GetEV2AU(); //from orca3.0.1
81+ this->zindoBondingParameterD = 0.0;
82+ this->zindoF0ss = 14.00 * Parameters::GetInstance()->GetEV2AU(); // from orca3.0.1
83+ this->zindoF0sd = 0.0;
84+ this->zindoF0dd = 0.0;
85+ this->zindoG1sp = 116828*Parameters::GetInstance()->GetKayser2AU();
86+ this->zindoF2pp = 69310*Parameters::GetInstance()->GetKayser2AU();
87+ this->zindoG2sd = 0.0;
88+ this->zindoG1pd = 0.0;
89+ this->zindoF2pd = 0.0;
90+ this->zindoG3pd = 0.0;
91+ this->zindoF2dd = 0.0;
92+ this->zindoF4dd = 0.0;
93+ this->zindoL = 2;
94+ this->zindoM = 5;
95+ this->zindoN = 0;
96+ this->zindoIonPotS = 39.39 * Parameters::GetInstance()->GetEV2AU();
97+ this->zindoIonPotP = 20.86 * Parameters::GetInstance()->GetEV2AU();
98+ this->zindoIonPotD = 0.0 * Parameters::GetInstance()->GetEV2AU();
99+ this->mndoCoreintegralS = -131.071548 * Parameters::GetInstance()->GetEV2AU();
100+ this->mndoCoreintegralP = -105.782137 * Parameters::GetInstance()->GetEV2AU();
101+ this->mndoOrbitalExponentS = 2.848487;
102+ this->mndoOrbitalExponentP = 2.848487;
103+ this->mndoBondingParameterS = -48.290460 * Parameters::GetInstance()->GetEV2AU();
104+ this->mndoBondingParameterP = -36.508540 * Parameters::GetInstance()->GetEV2AU();
105+ this->mndoAlpha = 3.419661 / Parameters::GetInstance()->GetAngstrom2AU();
106+ this->mndoElecEnergyAtom = -476.683781 * Parameters::GetInstance()->GetEV2AU();
107+ this->mndoHeatsFormAtom = 18.86 * Parameters::GetInstance()->GetKcalMolin2AU();
108+ this->mndoGss = 16.92 * Parameters::GetInstance()->GetEV2AU();
109+ this->mndoGpp = 16.71 * Parameters::GetInstance()->GetEV2AU();
110+ this->mndoGsp = 17.25 * Parameters::GetInstance()->GetEV2AU();
111+ this->mndoGpp2 = 14.91 * Parameters::GetInstance()->GetEV2AU();
112+ this->mndoHsp = 4.83 * Parameters::GetInstance()->GetEV2AU();
113+ this->mndoDerivedParameterD[0] = 0.0;
114+ this->mndoDerivedParameterD[1] = 0.5067166088;
115+ this->mndoDerivedParameterD[2] = 0.4299633003;
116+ this->mndoDerivedParameterRho[0] = 0.5/0.6217935876;
117+ this->mndoDerivedParameterRho[1] = 0.5/1.0850000098;
118+ this->mndoDerivedParameterRho[2] = 0.5/1.0343451703;
119+ this->am1CoreintegralS = -136.105579 * Parameters::GetInstance()->GetEV2AU();
120+ this->am1CoreintegralP = -104.889885 * Parameters::GetInstance()->GetEV2AU();
121+ this->am1OrbitalExponentS = 3.770082;
122+ this->am1OrbitalExponentP = 2.494670;
123+ this->am1BondingParameterS = -69.590277 * Parameters::GetInstance()->GetEV2AU();
124+ this->am1BondingParameterP = -27.922360 * Parameters::GetInstance()->GetEV2AU();
125+ this->am1Alpha = 5.517800/ Parameters::GetInstance()->GetAngstrom2AU();
126+ this->am1Gss = this->mndoGss;
127+ this->am1Gpp = this->mndoGpp;
128+ this->am1Gsp = this->mndoGsp;
129+ this->am1Gpp2 = this->mndoGpp2;
130+ this->am1Hsp = this->mndoHsp;
131+ this->am1DerivedParameterD[0] = 0.0;
132+ this->am1DerivedParameterD[1] = 0.4145203025;
133+ this->am1DerivedParameterD[2] = 0.4909446425;
134+ this->am1DerivedParameterRho[0] = 0.5/0.6217935876;
135+ this->am1DerivedParameterRho[1] = 0.5/1.2088469198;
136+ this->am1DerivedParameterRho[2] = 0.5/0.9449175360;
137+ this->am1ParameterK[0] = 0.242079 * Parameters::GetInstance()->GetEV2AU();
138+ this->am1ParameterK[1] = 0.003607 * Parameters::GetInstance()->GetEV2AU();
139+ this->am1ParameterK[2] = 0.0 * Parameters::GetInstance()->GetEV2AU();
140+ this->am1ParameterK[3] = 0.0 * Parameters::GetInstance()->GetEV2AU();
141+ this->am1ParameterL[0] = 4.80 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
142+ this->am1ParameterL[1] = 4.60 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
143+ this->am1ParameterL[2] = 0.00 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
144+ this->am1ParameterL[3] = 0.00 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
145+ this->am1ParameterM[0] = 0.930 * Parameters::GetInstance()->GetAngstrom2AU();
146+ this->am1ParameterM[1] = 1.660 * Parameters::GetInstance()->GetAngstrom2AU();
147+ this->am1ParameterM[2] = 0.00 * Parameters::GetInstance()->GetAngstrom2AU();
148+ this->am1ParameterM[3] = 0.00 * Parameters::GetInstance()->GetAngstrom2AU();
149+ this->am1DCoreintegralS = this->am1CoreintegralS;
150+ this->am1DCoreintegralP = this->am1CoreintegralP;
151+ this->am1DBondingParameterS = this->am1BondingParameterS;
152+ this->am1DBondingParameterP = this->am1BondingParameterP;
153+ this->am1DAlpha = this->am1DAlpha;
154+ this->pm3CoreintegralS = -110.435303 * Parameters::GetInstance()->GetEV2AU();
155+ this->pm3CoreintegralP = -105.685047 * Parameters::GetInstance()->GetEV2AU();
156+ this->pm3OrbitalExponentS = 4.708555;
157+ this->pm3OrbitalExponentP = 2.491178;
158+ this->pm3BondingParameterS = -48.405939 * Parameters::GetInstance()->GetEV2AU();
159+ this->pm3BondingParameterP = -27.744660 * Parameters::GetInstance()->GetEV2AU();
160+ this->pm3Alpha = 3.358921 / Parameters::GetInstance()->GetAngstrom2AU();
161+ this->pm3DerivedParameterD[0] = 0.0;
162+ this->pm3DerivedParameterD[1] = 0.3125302275;
163+ this->pm3DerivedParameterD[2] = 0.4916328225;
164+ this->pm3DerivedParameterRho[0] = 0.5/0.3857423305;
165+ this->pm3DerivedParameterRho[1] = 0.5/0.6768359077;
166+ this->pm3DerivedParameterRho[2] = 0.5/0.6119953427;
167+ this->pm3ParameterK[0] = -0.012166 * Parameters::GetInstance()->GetEV2AU();
168+ this->pm3ParameterK[1] = -0.002852 * Parameters::GetInstance()->GetEV2AU();
169+ this->pm3ParameterK[2] = 0.0;
170+ this->pm3ParameterK[3] = 0.0;
171+ this->pm3ParameterL[0] = 6.023574 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
172+ this->pm3ParameterL[1] = 6.003717 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
173+ this->pm3ParameterL[2] = 0.00;
174+ this->pm3ParameterL[3] = 0.00;
175+ this->pm3ParameterM[0] = 1.856859 * Parameters::GetInstance()->GetAngstrom2AU();
176+ this->pm3ParameterM[1] = 2.636158 * Parameters::GetInstance()->GetAngstrom2AU();
177+ this->pm3ParameterM[2] = 0.00;
178+ this->pm3ParameterM[3] = 0.00;
179+ this->pm3Gss = 10.496667 * Parameters::GetInstance()->GetEV2AU();
180+ this->pm3Gpp = 14.817256 * Parameters::GetInstance()->GetEV2AU();
181+ this->pm3Gsp = 16.073689 * Parameters::GetInstance()->GetEV2AU();
182+ this->pm3Gpp2= 14.418393 * Parameters::GetInstance()->GetEV2AU();
183+ this->pm3Hsp = 0.727763 * Parameters::GetInstance()->GetEV2AU();
184+ //this->pm3PddgCoreintegralS = -48.241241 * Parameters::GetInstance()->GetEV2AU();
185+ //this->pm3PddgCoreintegralP = -36.461256 * Parameters::GetInstance()->GetEV2AU();
186+ //this->pm3PddgOrbitalExponentS = 1.567864;
187+ //this->pm3PddgOrbitalExponentP = 1.846659;
188+ //this->pm3PddgBondingParameterS = -11.952818 * Parameters::GetInstance()->GetEV2AU();
189+ //this->pm3PddgBondingParameterP = -9.922411 * Parameters::GetInstance()->GetEV2AU();
190+ //this->pm3PddgAlpha = 2.725772 / Parameters::GetInstance()->GetAngstrom2AU();
191+ //this->pm3PddgDerivedParameterD[0] = 0.0;
192+ //this->pm3PddgDerivedParameterD[1] = 0.831413;
193+ //this->pm3PddgDerivedParameterD[2] = 0.663222;
194+ //this->pm3PddgDerivedParameterRho[0] = 1.214657;
195+ //this->pm3PddgDerivedParameterRho[1] = 0.848467;
196+ //this->pm3PddgDerivedParameterRho[2] = 0.652785;
197+ //this->pm3PddgParameterK[0] = 0.048906 * Parameters::GetInstance()->GetEV2AU();
198+ //this->pm3PddgParameterK[1] = 0.047697 * Parameters::GetInstance()->GetEV2AU();
199+ //this->pm3PddgParameterK[2] = 0.0;
200+ //this->pm3PddgParameterK[3] = 0.0;
201+ //this->pm3PddgParameterL[0] = 5.765340 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
202+ //this->pm3PddgParameterL[1] = 5.973721 / pow(Parameters::GetInstance()->GetAngstrom2AU(),2.0);
203+ //this->pm3PddgParameterL[2] = 0.00;
204+ //this->pm3PddgParameterL[3] = 0.00;
205+ //this->pm3PddgParameterM[0] = 1.682232 * Parameters::GetInstance()->GetAngstrom2AU();
206+ //this->pm3PddgParameterM[1] = 0.894406 * Parameters::GetInstance()->GetAngstrom2AU();
207+ //this->pm3PddgParameterM[2] = 0.00;
208+ //this->pm3PddgParameterM[3] = 0.00;
209+ //this->pm3PddgParameterPa[0] =-0.000743 * Parameters::GetInstance()->GetEV2AU();
210+ //this->pm3PddgParameterPa[1] = 0.000985 * Parameters::GetInstance()->GetEV2AU();
211+ //this->pm3PddgParameterDa[0] = 0.836915 * Parameters::GetInstance()->GetAngstrom2AU();
212+ //this->pm3PddgParameterDa[1] = 1.585236 * Parameters::GetInstance()->GetAngstrom2AU();
213+ this->pm3DCoreintegralS = this->pm3CoreintegralS;
214+ this->pm3DCoreintegralP = this->pm3CoreintegralP;
215+ this->pm3DBondingParameterS = this->pm3BondingParameterS;
216+ this->pm3DBondingParameterP = this->pm3BondingParameterP;
217+ this->pm3DAlpha = this->pm3Alpha;
218+}
219+}
--- /dev/null
+++ b/src/base/atoms/Fatom.h
@@ -0,0 +1,32 @@
1+//************************************************************************//
2+// Copyright (C) 2011-2014 Mikiya Fujii //
3+// //
4+// This file is part of MolDS. //
5+// //
6+// MolDS is free software: you can redistribute it and/or modify //
7+// it under the terms of the GNU General Public License as published by //
8+// the Free Software Foundation, either version 3 of the License, or //
9+// (at your option) any later version. //
10+// //
11+// MolDS is distributed in the hope that it will be useful, //
12+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
13+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
14+// GNU General Public License for more details. //
15+// //
16+// You should have received a copy of the GNU General Public License //
17+// along with MolDS. If not, see <http://www.gnu.org/licenses/>. //
18+//************************************************************************//
19+#ifndef INCLUDED_FATOM
20+#define INCLUDED_FATOM
21+namespace MolDS_base_atoms{
22+class Fatom : virtual public Atom {
23+public:
24+ Fatom(int index);
25+ virtual ~Fatom();
26+protected:
27+ void virtual SetAtomicParameters();
28+private:
29+ Fatom();
30+};
31+}
32+#endif
--- a/src/base/atoms/Znatom.cpp
+++ b/src/base/atoms/Znatom.cpp
@@ -93,19 +93,19 @@ void Znatom::SetAtomicParameters(){
9393 this->indoF2CoefficientS = 0.0;
9494 this->indoF2CoefficientP = -2.0*(this->coreCharge - 2.5)/25.0;
9595 */
96- this->zindoBondingParameterS = -10.0*Parameters::GetInstance()->GetEV2AU(); // orca 3.1
97- this->zindoBondingParameterD = -34.0*Parameters::GetInstance()->GetEV2AU(); // orca 3.1
96+ this->zindoBondingParameterS = -10.0*Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
97+ this->zindoBondingParameterD = -34.0*Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
9898 this->zindoF0ss = 7.98 * Parameters::GetInstance()->GetEV2AU(); // ZHKW_1980
9999 this->zindoF0sd = 9.39 * Parameters::GetInstance()->GetEV2AU(); // ZHKW_1980
100100 this->zindoF0dd = 14.55 * Parameters::GetInstance()->GetEV2AU(); // ZHKW_1980
101101 this->zindoG1sp = 20400 * Parameters::GetInstance()->GetKayser2AU(); // BZ_1979
102102 this->zindoF2pp = 9500 * Parameters::GetInstance()->GetKayser2AU(); // BZ_1979
103- this->zindoG2sd = 0.6199 * Parameters::GetInstance()->GetEV2AU(); // orca 3.1
104- this->zindoG1pd = 0.8679 * Parameters::GetInstance()->GetEV2AU(); // orca 3.1
105- this->zindoF2pd = 1.4878 * Parameters::GetInstance()->GetEV2AU(); // orca 3.1
106- this->zindoG3pd = 0.9919 * Parameters::GetInstance()->GetEV2AU(); // orca 3.1
107- this->zindoF2dd =11.4063 * Parameters::GetInstance()->GetEV2AU(); // orca 3.1
108- this->zindoF4dd = 7.6249 * Parameters::GetInstance()->GetEV2AU(); // orca 3.1
103+ this->zindoG2sd = 0.6199 * Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
104+ this->zindoG1pd = 0.8679 * Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
105+ this->zindoF2pd = 1.4878 * Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
106+ this->zindoG3pd = 0.9919 * Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
107+ this->zindoF2dd =11.4063 * Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
108+ this->zindoF4dd = 7.6249 * Parameters::GetInstance()->GetEV2AU(); // orca 3.0.1
109109 this->zindoL = 2;
110110 this->zindoM = 0;
111111 this->zindoN = 10;
--- /dev/null
+++ b/src/base/atoms/ghost/GhostFatom.cpp
@@ -0,0 +1,53 @@
1+//************************************************************************//
2+// Copyright (C) 2011-2014 Mikiya Fujii //
3+// //
4+// This file is part of MolDS. //
5+// //
6+// MolDS is free software: you can redistribute it and/or modify //
7+// it under the terms of the GNU General Public License as published by //
8+// the Free Software Foundation, either version 3 of the License, or //
9+// (at your option) any later version. //
10+// //
11+// MolDS is distributed in the hope that it will be useful, //
12+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
13+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
14+// GNU General Public License for more details. //
15+// //
16+// You should have received a copy of the GNU General Public License //
17+// along with MolDS. If not, see <http://www.gnu.org/licenses/>. //
18+//************************************************************************//
19+#include<stdio.h>
20+#include<stdlib.h>
21+#include<iostream>
22+#include<sstream>
23+#include<math.h>
24+#include<vector>
25+#include<boost/format.hpp>
26+#include"../../Enums.h"
27+#include"../../Uncopyable.h"
28+#include"../../PrintController.h"
29+#include"../../MolDSException.h"
30+#include"../../MallocerFreer.h"
31+#include"../../../mpi/MpiInt.h"
32+#include"../../../mpi/MpiProcess.h"
33+#include"../../EularAngle.h"
34+#include"../../Parameters.h"
35+#include"../../RealSphericalHarmonicsIndex.h"
36+#include"../Atom.h"
37+#include"../Fatom.h"
38+#include"Ghost.h"
39+#include"GhostFatom.h"
40+using namespace std;
41+using namespace MolDS_base;
42+using namespace MolDS_base_atoms;
43+namespace MolDS_base_atoms_ghost{
44+GhostFatom::GhostFatom(int index) : Atom(index),Fatom(index),Ghost(index){
45+ this->SetAtomicParameters();
46+}
47+
48+GhostFatom::~GhostFatom(){}
49+
50+void GhostFatom::SetAtomicParameters(){
51+ this->atomType = ghostF;
52+}
53+}
--- /dev/null
+++ b/src/base/atoms/ghost/GhostFatom.h
@@ -0,0 +1,32 @@
1+//************************************************************************//
2+// Copyright (C) 2011-2014 Mikiya Fujii //
3+// //
4+// This file is part of MolDS. //
5+// //
6+// MolDS is free software: you can redistribute it and/or modify //
7+// it under the terms of the GNU General Public License as published by //
8+// the Free Software Foundation, either version 3 of the License, or //
9+// (at your option) any later version. //
10+// //
11+// MolDS is distributed in the hope that it will be useful, //
12+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
13+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
14+// GNU General Public License for more details. //
15+// //
16+// You should have received a copy of the GNU General Public License //
17+// along with MolDS. If not, see <http://www.gnu.org/licenses/>. //
18+//************************************************************************//
19+#ifndef INCLUDED_GHOSTFATOM
20+#define INCLUDED_GHOSTFATOM
21+namespace MolDS_base_atoms_ghost{
22+class GhostFatom : public MolDS_base_atoms::Fatom, public Ghost {
23+public:
24+ GhostFatom(int index);
25+ ~GhostFatom();
26+protected:
27+ void virtual SetAtomicParameters();
28+private:
29+ GhostFatom();
30+};
31+}
32+#endif
--- a/src/base/factories/AtomFactory.cpp
+++ b/src/base/factories/AtomFactory.cpp
@@ -37,6 +37,7 @@
3737 #include"../atoms/Catom.h"
3838 #include"../atoms/Natom.h"
3939 #include"../atoms/Oatom.h"
40+#include"../atoms/Fatom.h"
4041 #include"../atoms/Satom.h"
4142 #include"../atoms/Znatom.h"
4243 #include"../atoms/ghost/Ghost.h"
@@ -45,6 +46,7 @@
4546 #include"../atoms/ghost/GhostCatom.h"
4647 #include"../atoms/ghost/GhostNatom.h"
4748 #include"../atoms/ghost/GhostOatom.h"
49+#include"../atoms/ghost/GhostFatom.h"
4850 #include"../atoms/ghost/GhostSatom.h"
4951 #include"../atoms/ghost/GhostZnatom.h"
5052 #include"../atoms/mm/EnvironmentalPointCharge.h"
@@ -77,6 +79,9 @@ Atom* AtomFactory::Create(AtomType atomType, int index, double x, double y, doub
7779 else if(atomType == O){
7880 atom = new Oatom(index);
7981 }
82+ else if(atomType == F){
83+ atom = new Fatom(index);
84+ }
8085 else if(atomType == S){
8186 atom = new Satom(index);
8287 }
@@ -98,6 +103,9 @@ Atom* AtomFactory::Create(AtomType atomType, int index, double x, double y, doub
98103 else if(atomType == ghostO){
99104 atom = new GhostOatom(index);
100105 }
106+ else if(atomType == ghostF){
107+ atom = new GhostFatom(index);
108+ }
101109 else if(atomType == ghostS){
102110 atom = new GhostSatom(index);
103111 }
--- a/src/cndo/Cndo2.cpp
+++ b/src/cndo/Cndo2.cpp
@@ -52,6 +52,7 @@
5252 #include"../base/atoms/Catom.h"
5353 #include"../base/atoms/Natom.h"
5454 #include"../base/atoms/Oatom.h"
55+#include"../base/atoms/Fatom.h"
5556 #include"../base/atoms/Satom.h"
5657 #include"../base/Molecule.h"
5758 #include"../base/GTOExpansionSTO.h"
@@ -269,7 +270,7 @@ void Cndo2::SetEnableAtomTypes(){
269270 this->enableAtomTypes.push_back(C);
270271 this->enableAtomTypes.push_back(N);
271272 this->enableAtomTypes.push_back(O);
272- //this->enableAtomTypes.push_back(F);
273+ this->enableAtomTypes.push_back(F);
273274 //this->enableAtomTypes.push_back(Na);
274275 //this->enableAtomTypes.push_back(Mg);
275276 //this->enableAtomTypes.push_back(Al);
--- a/src/indo/Indo.cpp
+++ b/src/indo/Indo.cpp
@@ -41,6 +41,7 @@
4141 #include"../base/atoms/Catom.h"
4242 #include"../base/atoms/Natom.h"
4343 #include"../base/atoms/Oatom.h"
44+#include"../base/atoms/Fatom.h"
4445 #include"../base/atoms/Satom.h"
4546 #include"../base/Molecule.h"
4647 #include"../base/ElectronicStructure.h"
@@ -103,7 +104,7 @@ void Indo::SetEnableAtomTypes(){
103104 this->enableAtomTypes.push_back(C);
104105 this->enableAtomTypes.push_back(N);
105106 this->enableAtomTypes.push_back(O);
106- //this->enableAtomTypes.push_back(F);
107+ this->enableAtomTypes.push_back(F);
107108 }
108109
109110 double Indo::GetFockDiagElement(const Atom& atomA,
--- a/src/mndo/Mndo.cpp
+++ b/src/mndo/Mndo.cpp
@@ -48,6 +48,7 @@
4848 #include"../base/atoms/Catom.h"
4949 #include"../base/atoms/Natom.h"
5050 #include"../base/atoms/Oatom.h"
51+#include"../base/atoms/Fatom.h"
5152 #include"../base/atoms/Satom.h"
5253 #include"../base/atoms/mm/EnvironmentalPointCharge.h"
5354 #include"../base/Molecule.h"
@@ -215,6 +216,7 @@ void Mndo::SetEnableAtomTypes(){
215216 this->enableAtomTypes.push_back(C);
216217 this->enableAtomTypes.push_back(N);
217218 this->enableAtomTypes.push_back(O);
219+ this->enableAtomTypes.push_back(F);
218220 this->enableAtomTypes.push_back(S);
219221 this->enableAtomTypes.push_back(Zn);
220222 }
--- a/src/pm3/Pm3.cpp
+++ b/src/pm3/Pm3.cpp
@@ -40,6 +40,7 @@
4040 #include"../base/atoms/Catom.h"
4141 #include"../base/atoms/Natom.h"
4242 #include"../base/atoms/Oatom.h"
43+#include"../base/atoms/Fatom.h"
4344 #include"../base/atoms/Satom.h"
4445 #include"../base/Molecule.h"
4546 #include"../base/ElectronicStructure.h"
@@ -134,6 +135,7 @@ void Pm3::SetEnableAtomTypes(){
134135 this->enableAtomTypes.push_back(C);
135136 this->enableAtomTypes.push_back(N);
136137 this->enableAtomTypes.push_back(O);
138+ this->enableAtomTypes.push_back(F);
137139 this->enableAtomTypes.push_back(S);
138140 this->enableAtomTypes.push_back(Zn);
139141 }
--- a/src/pm3/Pm3D.cpp
+++ b/src/pm3/Pm3D.cpp
@@ -40,6 +40,7 @@
4040 #include"../base/atoms/Catom.h"
4141 #include"../base/atoms/Natom.h"
4242 #include"../base/atoms/Oatom.h"
43+#include"../base/atoms/Fatom.h"
4344 #include"../base/atoms/Satom.h"
4445 #include"../base/Molecule.h"
4546 #include"../base/ElectronicStructure.h"
@@ -135,6 +136,7 @@ void Pm3D::SetEnableAtomTypes(){
135136 this->enableAtomTypes.push_back(C);
136137 this->enableAtomTypes.push_back(N);
137138 this->enableAtomTypes.push_back(O);
139+ this->enableAtomTypes.push_back(F);
138140 this->enableAtomTypes.push_back(S);
139141 }
140142
--- /dev/null
+++ b/src/tools/deriveParametersNDDO/data/AM1_Fatom.dat
@@ -0,0 +1,57 @@
1+===== NDDO parameters =====
2+orbital exponent S in [a.u.] = 3.7700820000
3+orbital exponent P in [a.u.] = 2.4946700000
4+Gss in [a.u.] = 0.6217935876
5+Gpp in [a.u.] = 0.6140762913
6+Gsp in [a.u.] = 0.6339207675
7+Gpp2 in [a.u.] = 0.5479280373
8+Hsp in [a.u.] = 0.1774978149
9+Hpp = 0.5*(Gpp - Gpp2)
10+
11+
12+===== NDDO derived parameters =====
13+D1 in [a.u.] = 0.4145203025
14+D2 in [a.u.] = 0.4909446425
15+AM in [a.u.] = 0.6217935876
16+
17+iter=0 AD in [a.u.] = 1.2283236244
18+iter=1 AD in [a.u.] = 1.2073444405
19+iter=2 AD in [a.u.] = 1.2088371512
20+iter=3 AD in [a.u.] = 1.2088469248
21+iter=4 AD in [a.u.] = 1.2088469198
22+iter=5 AD in [a.u.] = 1.2088469198
23+iter=6 AD in [a.u.] = 1.2088469198
24+iter=7 AD in [a.u.] = 1.2088469198
25+iter=8 AD in [a.u.] = 1.2088469198
26+iter=9 AD in [a.u.] = nan
27+iter=10 AD in [a.u.] = nan
28+iter=11 AD in [a.u.] = nan
29+iter=12 AD in [a.u.] = nan
30+iter=13 AD in [a.u.] = nan
31+iter=14 AD in [a.u.] = nan
32+iter=15 AD in [a.u.] = nan
33+iter=16 AD in [a.u.] = nan
34+iter=17 AD in [a.u.] = nan
35+iter=18 AD in [a.u.] = nan
36+iter=19 AD in [a.u.] = nan
37+
38+iter=0 AQ in [a.u.] = 0.9174540993
39+iter=1 AQ in [a.u.] = 0.9603487201
40+iter=2 AQ in [a.u.] = 0.9445669865
41+iter=3 AQ in [a.u.] = 0.9449131918
42+iter=4 AQ in [a.u.] = 0.9449175372
43+iter=5 AQ in [a.u.] = 0.9449175360
44+iter=6 AQ in [a.u.] = 0.9449175360
45+iter=7 AQ in [a.u.] = 0.9449175360
46+iter=8 AQ in [a.u.] = 0.9449175360
47+iter=9 AQ in [a.u.] = 0.9449175360
48+iter=10 AQ in [a.u.] = 0.9449175360
49+iter=11 AQ in [a.u.] = 0.9449175360
50+iter=12 AQ in [a.u.] = 0.9449175360
51+iter=13 AQ in [a.u.] = nan
52+iter=14 AQ in [a.u.] = nan
53+iter=15 AQ in [a.u.] = nan
54+iter=16 AQ in [a.u.] = nan
55+iter=17 AQ in [a.u.] = nan
56+iter=18 AQ in [a.u.] = nan
57+iter=19 AQ in [a.u.] = nan
--- /dev/null
+++ b/src/tools/deriveParametersNDDO/data/MNDO_Fatom.dat
@@ -0,0 +1,57 @@
1+===== NDDO parameters =====
2+orbital exponent S in [a.u.] = 2.8484870000
3+orbital exponent P in [a.u.] = 2.8484870000
4+Gss in [a.u.] = 0.6217935876
5+Gpp in [a.u.] = 0.6140762913
6+Gsp in [a.u.] = 0.6339207675
7+Gpp2 in [a.u.] = 0.5479280373
8+Hsp in [a.u.] = 0.1774978149
9+Hpp = 0.5*(Gpp - Gpp2)
10+
11+
12+===== NDDO derived parameters =====
13+D1 in [a.u.] = 0.5067166088
14+D2 in [a.u.] = 0.4299633003
15+AM in [a.u.] = 0.6217935876
16+
17+iter=0 AD in [a.u.] = 1.0923581507
18+iter=1 AD in [a.u.] = 1.0844153173
19+iter=2 AD in [a.u.] = 1.0849985924
20+iter=3 AD in [a.u.] = 1.0850000101
21+iter=4 AD in [a.u.] = 1.0850000098
22+iter=5 AD in [a.u.] = 1.0850000098
23+iter=6 AD in [a.u.] = 1.0850000098
24+iter=7 AD in [a.u.] = 1.0850000098
25+iter=8 AD in [a.u.] = nan
26+iter=9 AD in [a.u.] = nan
27+iter=10 AD in [a.u.] = nan
28+iter=11 AD in [a.u.] = nan
29+iter=12 AD in [a.u.] = nan
30+iter=13 AD in [a.u.] = nan
31+iter=14 AD in [a.u.] = nan
32+iter=15 AD in [a.u.] = nan
33+iter=16 AD in [a.u.] = nan
34+iter=17 AD in [a.u.] = nan
35+iter=18 AD in [a.u.] = nan
36+iter=19 AD in [a.u.] = nan
37+
38+iter=0 AQ in [a.u.] = 1.0563037502
39+iter=1 AQ in [a.u.] = 1.0213602694
40+iter=2 AQ in [a.u.] = 1.0341225934
41+iter=3 AQ in [a.u.] = 1.0343474767
42+iter=4 AQ in [a.u.] = 1.0343451699
43+iter=5 AQ in [a.u.] = 1.0343451703
44+iter=6 AQ in [a.u.] = 1.0343451703
45+iter=7 AQ in [a.u.] = 1.0343451703
46+iter=8 AQ in [a.u.] = 1.0343451703
47+iter=9 AQ in [a.u.] = 1.0343451703
48+iter=10 AQ in [a.u.] = 1.0343451703
49+iter=11 AQ in [a.u.] = nan
50+iter=12 AQ in [a.u.] = nan
51+iter=13 AQ in [a.u.] = nan
52+iter=14 AQ in [a.u.] = nan
53+iter=15 AQ in [a.u.] = nan
54+iter=16 AQ in [a.u.] = nan
55+iter=17 AQ in [a.u.] = nan
56+iter=18 AQ in [a.u.] = nan
57+iter=19 AQ in [a.u.] = nan
--- /dev/null
+++ b/src/tools/deriveParametersNDDO/data/PM3_Fatom.dat
@@ -0,0 +1,57 @@
1+===== NDDO parameters =====
2+orbital exponent S in [a.u.] = 4.7085550000
3+orbital exponent P in [a.u.] = 2.4911780000
4+Gss in [a.u.] = 0.3857423305
5+Gpp in [a.u.] = 0.5445197853
6+Gsp in [a.u.] = 0.5906924793
7+Gpp2 in [a.u.] = 0.5298619569
8+Hsp in [a.u.] = 0.0267445843
9+Hpp = 0.5*(Gpp - Gpp2)
10+
11+
12+===== NDDO derived parameters =====
13+D1 in [a.u.] = 0.3125302275
14+D2 in [a.u.] = 0.4916328225
15+AM in [a.u.] = 0.3857423305
16+
17+iter=0 AD in [a.u.] = 0.6688994415
18+iter=1 AD in [a.u.] = 0.6771081714
19+iter=2 AD in [a.u.] = 0.6768332910
20+iter=3 AD in [a.u.] = 0.6768359068
21+iter=4 AD in [a.u.] = 0.6768359077
22+iter=5 AD in [a.u.] = 0.6768359077
23+iter=6 AD in [a.u.] = 0.6768359077
24+iter=7 AD in [a.u.] = 0.6768359077
25+iter=8 AD in [a.u.] = 0.6768359077
26+iter=9 AD in [a.u.] = 0.6768359077
27+iter=10 AD in [a.u.] = 0.6768359077
28+iter=11 AD in [a.u.] = 0.6768359077
29+iter=12 AD in [a.u.] = 0.6768359077
30+iter=13 AD in [a.u.] = 0.6768359077
31+iter=14 AD in [a.u.] = nan
32+iter=15 AD in [a.u.] = nan
33+iter=16 AD in [a.u.] = nan
34+iter=17 AD in [a.u.] = nan
35+iter=18 AD in [a.u.] = nan
36+iter=19 AD in [a.u.] = nan
37+
38+iter=0 AQ in [a.u.] = 0.4945714241
39+iter=1 AQ in [a.u.] = 0.7079622968
40+iter=2 AQ in [a.u.] = 0.5891692549
41+iter=3 AQ in [a.u.] = 0.6081313939
42+iter=4 AQ in [a.u.] = 0.6121786715
43+iter=5 AQ in [a.u.] = 0.6119939256
44+iter=6 AQ in [a.u.] = 0.6119953422
45+iter=7 AQ in [a.u.] = 0.6119953427
46+iter=8 AQ in [a.u.] = 0.6119953427
47+iter=9 AQ in [a.u.] = 0.6119953427
48+iter=10 AQ in [a.u.] = 0.6119953427
49+iter=11 AQ in [a.u.] = 0.6119953427
50+iter=12 AQ in [a.u.] = 0.6119953427
51+iter=13 AQ in [a.u.] = 0.6119953427
52+iter=14 AQ in [a.u.] = 0.6119953427
53+iter=15 AQ in [a.u.] = 0.6119953427
54+iter=16 AQ in [a.u.] = 0.6119953427
55+iter=17 AQ in [a.u.] = 0.6119953427
56+iter=18 AQ in [a.u.] = 0.6119953427
57+iter=19 AQ in [a.u.] = 0.6119953427
--- a/src/tools/deriveParametersNDDO/deriveParametersNDDO.cpp
+++ b/src/tools/deriveParametersNDDO/deriveParametersNDDO.cpp
@@ -66,18 +66,18 @@ int main(){
6666
6767 // following variables should be set as input
6868 double eV2AU = 0.03674903;
69- long double orbitalExponentS=2.0473590;
70- long double orbitalExponentP=1.4609460;
71- long double Gss = 11.800000* eV2AU;
72- long double Gpp = 13.300000* eV2AU;
73- long double Gsp = 11.182018* eV2AU;
74- long double Gpp2= 12.930520* eV2AU;
75- long double Hsp = 0.484606* eV2AU;
69+ long double orbitalExponentS=4.708555;
70+ long double orbitalExponentP=2.491178;
71+ long double Gss = 10.496667 * eV2AU;
72+ long double Gpp = 14.817256 * eV2AU;
73+ long double Gsp = 16.073689 * eV2AU;
74+ long double Gpp2= 14.418393 * eV2AU;
75+ long double Hsp = 0.727763 * eV2AU;
7676 long double Hpp = 0.5*(Gpp - Gpp2);
7777 // n=2 for l-shell (C, N, O and etc.)
7878 // n=3 for m-shell (S and etc.)
7979 // n=4 for n-shell (Zn and etc.)
80- double n=4;
80+ double n=2;
8181
8282 // following variables are output
8383 long double D1=0.0;
--- a/src/zindo/ZindoS.cpp
+++ b/src/zindo/ZindoS.cpp
@@ -50,6 +50,7 @@
5050 #include"../base/atoms/Catom.h"
5151 #include"../base/atoms/Natom.h"
5252 #include"../base/atoms/Oatom.h"
53+#include"../base/atoms/Fatom.h"
5354 #include"../base/atoms/Satom.h"
5455 #include"../base/Molecule.h"
5556 #include"../base/ElectronicStructure.h"
@@ -214,6 +215,7 @@ void ZindoS::SetEnableAtomTypes(){
214215 this->enableAtomTypes.push_back(C);
215216 this->enableAtomTypes.push_back(N);
216217 this->enableAtomTypes.push_back(O);
218+ this->enableAtomTypes.push_back(F);
217219 this->enableAtomTypes.push_back(S);
218220 }
219221
--- a/test/Test_Of_MolDS.rb
+++ b/test/Test_Of_MolDS.rb
@@ -432,6 +432,20 @@ mklNumThreads = "4"
432432 ompNumThreads = "2"
433433 tester.doesTestMpi(mklNumThreads,ompNumThreads)
434434
435+prefix = "ch3f_mndo"
436+tester = Tester.new(prefix, <<"TITLE")
437+\t\t\t>>> CH3F <<<
438+TITLE
439+mklNumThreads = "1"
440+ompNumThreads = "1"
441+tester.doesTestOmp(mklNumThreads,ompNumThreads)
442+mklNumThreads = "2"
443+ompNumThreads = "2"
444+tester.doesTestOmp(mklNumThreads,ompNumThreads)
445+mklNumThreads = "4"
446+ompNumThreads = "2"
447+tester.doesTestMpi(mklNumThreads,ompNumThreads)
448+
435449 prefix = "ch4_mndo_directCIS_singlet"
436450 tester = Tester.new(prefix, <<"SECTION", <<"TITLE")
437451 ---------------------------------------------------
@@ -586,6 +600,20 @@ mklNumThreads = "4"
586600 ompNumThreads = "2"
587601 tester.doesTestMpi(mklNumThreads,ompNumThreads)
588602
603+prefix = "ch3f_am1"
604+tester = Tester.new(prefix, <<"TITLE")
605+\t\t\t>>> CH3F <<<
606+TITLE
607+mklNumThreads = "1"
608+ompNumThreads = "1"
609+tester.doesTestOmp(mklNumThreads,ompNumThreads)
610+mklNumThreads = "2"
611+ompNumThreads = "2"
612+tester.doesTestOmp(mklNumThreads,ompNumThreads)
613+mklNumThreads = "4"
614+ompNumThreads = "2"
615+tester.doesTestMpi(mklNumThreads,ompNumThreads)
616+
589617 prefix = "ch4_am1_directCIS_singlet"
590618 tester = Tester.new(prefix, <<"SECTION", <<"TITLE")
591619 ---------------------------------------------------
@@ -740,6 +768,20 @@ mklNumThreads = "4"
740768 ompNumThreads = "2"
741769 tester.doesTestMpi(mklNumThreads,ompNumThreads)
742770
771+prefix = "ch3f_pm3"
772+tester = Tester.new(prefix, <<"TITLE")
773+\t\t\t>>> CH3F <<<
774+TITLE
775+mklNumThreads = "1"
776+ompNumThreads = "1"
777+tester.doesTestOmp(mklNumThreads,ompNumThreads)
778+mklNumThreads = "2"
779+ompNumThreads = "2"
780+tester.doesTestOmp(mklNumThreads,ompNumThreads)
781+mklNumThreads = "4"
782+ompNumThreads = "2"
783+tester.doesTestMpi(mklNumThreads,ompNumThreads)
784+
743785 prefix = "ch4_pm3_directCIS_singlet"
744786 tester = Tester.new(prefix, <<"SECTION", <<"TITLE")
745787 ---------------------------------------------------
--- /dev/null
+++ b/test/ch3f_am1.dat
@@ -0,0 +1,119 @@
1+
2+
3+ >>>>> Welcome to the MolDS world at 2014/4/29(Thu.) 0:48:18 <<<<<
4+
5+
6+********** START: Parse input **********
7+ Total number of atoms: 5
8+ Total number of valence AOs: 11
9+ Total number of valence electrons: 14
10+
11+ | i-th | atom type | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
12+ Atom coordinates: 0 C -4.533892e-01 1.142541e+00 0.000000e+00 -2.399232e-01 6.046065e-01 0.000000e+00
13+ Atom coordinates: 1 H 2.205900e-01 -7.638339e-01 0.000000e+00 1.167312e-01 -4.042035e-01 0.000000e+00
14+ Atom coordinates: 2 H 2.206248e-01 2.095715e+00 -1.650962e+00 1.167496e-01 1.109005e+00 -8.736515e-01
15+ Atom coordinates: 3 H -2.475396e+00 1.142566e+00 0.000000e+00 -1.309923e+00 6.046197e-01 0.000000e+00
16+ Atom coordinates: 4 F 3.970023e-01 2.345144e+00 2.082990e+00 2.100846e-01 1.240997e+00 1.102271e+00
17+
18+ | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
19+ Center of Mass: 1.367960e-03 1.785647e+00 1.113904e+00 7.238933e-04 9.449239e-01 5.894525e-01
20+
21+ | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
22+ Center of Core: 1.385500e-03 1.785672e+00 1.113947e+00 7.331749e-04 9.449370e-01 5.894753e-01
23+
24+ SCF conditions:
25+ Max iterations: 500
26+ RMS density: 1.000000e-08
27+ Damping threshold: 1.000000e+00
28+ Damping weight: 0.000000e+00
29+ DIIS number of error vectors: 5
30+ DIIS starting error: 1.000000e-01
31+ DIIS ending error: 0.000000e+00
32+ van der Waals (vdW) correction: no
33+
34+ Memory conditions:
35+ Heap limit: 2.560000e+02[MB]
36+
37+Input terms:
38+theory | am1 | theory_end | scf | max_iter | 500 | rms_density | 1e-8 | damping_thresh | 1.0 |
39+damping_weight | 0.0 | diis_num_error_vect | 5 | diis_start_error | 0.1 | diis_end_error | 0.0 | scf_end | geometry |
40+c | -0.23992322 | 0.60460652 | 0.00000000 | h | 0.11673121 | -0.40420349 | 0.00000000 | h | 0.11674962 |
41+1.10900471 | -0.87365150 | h | -1.30992322 | 0.60461970 | 0.00000000 | f | 0.21008457 | 1.24099676 | 1.10227059 |
42+geometry_end |
43+
44+********** DONE: Parse input ***********
45+
46+
47+********** START: AM1-SCF **********
48+ | RMS density | DIIS error | DIIS on/off | damping on/off |
49+ SCF iter 0 4.810457e-01 0.000000e+00
50+ SCF iter 1 1.813094e-01 0.000000e+00
51+ SCF iter 2 7.213805e-02 4.688753e-01
52+ SCF iter 3 3.219608e-02 2.545192e-01
53+ SCF iter 4 1.498908e-02 1.265996e-01
54+ SCF iter 5 7.162861e-03 6.338147e-02
55+ SCF iter 6 1.124795e-04 3.133790e-02 on
56+ SCF iter 7 2.684330e-05 3.452097e-04 on
57+ SCF iter 8 4.101758e-06 8.013624e-05 on
58+ SCF iter 9 2.948782e-07 1.063658e-05 on
59+ SCF iter 10 7.151809e-08 7.402140e-07 on
60+ SCF iter 11 1.141598e-08 1.901341e-07 on
61+ SCF iter 12 3.270105e-09 4.867728e-08 on
62+
63+
64+
65+ AM1-SCF met convergence criterion(^^b
66+
67+
68+ | i-th | occ/unocc | e[a.u.] | e[eV] |
69+ Energy of MO: 0 occ -1.818706e+00 -4.948991e+01
70+ Energy of MO: 1 occ -1.047475e+00 -2.850348e+01
71+ Energy of MO: 2 occ -6.243858e-01 -1.699054e+01
72+ Energy of MO: 3 occ -6.243858e-01 -1.699054e+01
73+ Energy of MO: 4 occ -6.101224e-01 -1.660241e+01
74+ Energy of MO: 5 occ -4.468290e-01 -1.215893e+01
75+ Energy of MO: 6 occ -4.468290e-01 -1.215893e+01
76+ Energy of MO: 7 unocc 1.469798e-01 3.999556e+00
77+ Energy of MO: 8 unocc 1.469798e-01 3.999556e+00
78+ Energy of MO: 9 unocc 1.560625e-01 4.246711e+00
79+ Energy of MO: 10 unocc 1.814507e-01 4.937564e+00
80+
81+ | [a.u.] | [eV] |
82+ Electronic energy(SCF): -2.406211e+01 -6.547686e+02
83+ Note that this electronic energy includes core-repulsions.
84+
85+ | [a.u.] | [eV] |
86+ Core repulsion energy: 1.944773e+01 5.292038e+02
87+
88+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
89+ Total Dipole moment(SCF): 2.153315e+00 3.045095e+00 5.274389e+00 6.459764e+00 5.473183e+00 7.739862e+00 1.340616e+01 1.641909e+01
90+
91+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
92+ Electronic Dipole moment(SCF): 3.241434e+00 4.583888e+00 7.939680e+00 9.724065e+00 8.238906e+00 1.165108e+01 2.018066e+01 2.471611e+01
93+
94+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
95+ Core Dipole moment: -1.088119e+00 -1.538792e+00 -2.665291e+00 3.264301e+00 -2.765723e+00 -3.911221e+00 -6.774495e+00 8.297027e+00
96+
97+ | k-th eigenstate | i-th atom | atom type | core charge[a.u.] | Mulliken charge[a.u.]|
98+ Mulliken charge(SCF): 0 0 C 4.000000e+00 -1.819333e-02
99+ Mulliken charge(SCF): 0 1 H 1.000000e+00 6.494912e-02
100+ Mulliken charge(SCF): 0 2 H 1.000000e+00 6.494916e-02
101+ Mulliken charge(SCF): 0 3 H 1.000000e+00 6.494917e-02
102+ Mulliken charge(SCF): 0 4 F 7.000000e+00 -1.766541e-01
103+
104+ Elapsed time(omp) for the SCF = 0.010500[s].
105+********** DONE: AM1-SCF **********
106+
107+
108+ Summary for memory usage:
109+ Max Heap: 0.121728[MB].
110+ Current Heap(Leaked): 0.000000[MB].
111+
112+
113+ >>>>> The MolDS finished normally! <<<<<
114+ >>>>> CPU time: 0.012938[s]. <<<<<
115+ >>>>> Elapsed time: 0[s]. <<<<<
116+ >>>>> Elapsed time(OMP): 0.0125909[s]. <<<<<
117+ >>>>> See you. <<<<<
118+
119+
--- /dev/null
+++ b/test/ch3f_am1.in
@@ -0,0 +1,22 @@
1+THEORY
2+ am1
3+THEORY_END
4+
5+SCF
6+ max_iter 500
7+ rms_density 1e-8
8+ damping_thresh 1.0
9+ damping_weight 0.0
10+ diis_num_error_vect 5
11+ diis_start_error 0.1
12+ diis_end_error 0.0
13+SCF_END
14+
15+GEOMETRY
16+ C -0.23992322 0.60460652 0.00000000
17+ H 0.11673121 -0.40420349 0.00000000
18+ H 0.11674962 1.10900471 -0.87365150
19+ H -1.30992322 0.60461970 0.00000000
20+ F 0.21008457 1.24099676 1.10227059
21+GEOMETRY_END
22+
--- /dev/null
+++ b/test/ch3f_mndo.dat
@@ -0,0 +1,121 @@
1+
2+
3+ >>>>> Welcome to the MolDS world at 2014/4/29(Thu.) 0:49:40 <<<<<
4+
5+
6+********** START: Parse input **********
7+ Total number of atoms: 5
8+ Total number of valence AOs: 11
9+ Total number of valence electrons: 14
10+
11+ | i-th | atom type | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
12+ Atom coordinates: 0 C -4.533892e-01 1.142541e+00 0.000000e+00 -2.399232e-01 6.046065e-01 0.000000e+00
13+ Atom coordinates: 1 H 2.205900e-01 -7.638339e-01 0.000000e+00 1.167312e-01 -4.042035e-01 0.000000e+00
14+ Atom coordinates: 2 H 2.206248e-01 2.095715e+00 -1.650962e+00 1.167496e-01 1.109005e+00 -8.736515e-01
15+ Atom coordinates: 3 H -2.475396e+00 1.142566e+00 0.000000e+00 -1.309923e+00 6.046197e-01 0.000000e+00
16+ Atom coordinates: 4 F 3.970023e-01 2.345144e+00 2.082990e+00 2.100846e-01 1.240997e+00 1.102271e+00
17+
18+ | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
19+ Center of Mass: 1.367960e-03 1.785647e+00 1.113904e+00 7.238933e-04 9.449239e-01 5.894525e-01
20+
21+ | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
22+ Center of Core: 1.385500e-03 1.785672e+00 1.113947e+00 7.331749e-04 9.449370e-01 5.894753e-01
23+
24+ SCF conditions:
25+ Max iterations: 500
26+ RMS density: 1.000000e-08
27+ Damping threshold: 1.000000e+00
28+ Damping weight: 0.000000e+00
29+ DIIS number of error vectors: 5
30+ DIIS starting error: 1.000000e-01
31+ DIIS ending error: 0.000000e+00
32+ van der Waals (vdW) correction: no
33+
34+ Memory conditions:
35+ Heap limit: 2.560000e+02[MB]
36+
37+Input terms:
38+theory | mndo | theory_end | scf | max_iter | 500 | rms_density | 1e-8 | damping_thresh | 1.0 |
39+damping_weight | 0.0 | diis_num_error_vect | 5 | diis_start_error | 0.1 | diis_end_error | 0.0 | scf_end | geometry |
40+c | -0.23992322 | 0.60460652 | 0.00000000 | h | 0.11673121 | -0.40420349 | 0.00000000 | h | 0.11674962 |
41+1.10900471 | -0.87365150 | h | -1.30992322 | 0.60461970 | 0.00000000 | f | 0.21008457 | 1.24099676 | 1.10227059 |
42+geometry_end |
43+
44+********** DONE: Parse input ***********
45+
46+
47+********** START: MNDO-SCF **********
48+ | RMS density | DIIS error | DIIS on/off | damping on/off |
49+ SCF iter 0 4.810457e-01 0.000000e+00
50+ SCF iter 1 1.871189e-01 0.000000e+00
51+ SCF iter 2 7.178292e-02 4.945442e-01
52+ SCF iter 3 3.117400e-02 2.689719e-01
53+ SCF iter 4 1.435152e-02 1.327763e-01
54+ SCF iter 5 6.810611e-03 6.433879e-02
55+ SCF iter 6 9.009495e-05 3.110174e-02 on
56+ SCF iter 7 1.844529e-05 2.778082e-04 on
57+ SCF iter 8 4.231855e-06 5.901048e-05 on
58+ SCF iter 9 3.240228e-07 1.081522e-05 on
59+ SCF iter 10 4.527847e-08 7.584081e-07 on
60+ SCF iter 11 4.828388e-09 1.288712e-07 on
61+
62+
63+
64+ MNDO-SCF met convergence criterion(^^b
65+
66+
67+ | i-th | occ/unocc | e[a.u.] | e[eV] |
68+ Energy of MO: 0 occ -1.702786e+00 -4.633555e+01
69+ Energy of MO: 1 occ -1.033510e+00 -2.812347e+01
70+ Energy of MO: 2 occ -6.385986e-01 -1.737729e+01
71+ Energy of MO: 3 occ -6.355261e-01 -1.729368e+01
72+ Energy of MO: 4 occ -6.355261e-01 -1.729368e+01
73+ Energy of MO: 5 occ -4.851277e-01 -1.320110e+01
74+ Energy of MO: 6 occ -4.851277e-01 -1.320110e+01
75+ Energy of MO: 7 unocc 1.357296e-01 3.693421e+00
76+ Energy of MO: 8 unocc 1.357297e-01 3.693421e+00
77+ Energy of MO: 9 unocc 1.797346e-01 4.890867e+00
78+ Energy of MO: 10 unocc 1.885824e-01 5.131629e+00
79+
80+ | [a.u.] | [eV] |
81+ Electronic energy(SCF): -2.390179e+01 -6.504060e+02
82+ Note that this electronic energy includes core-repulsions.
83+
84+ | [a.u.] | [eV] |
85+ Core repulsion energy: 1.955890e+01 5.322291e+02
86+
87+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
88+ Total Dipole moment(SCF): 1.960721e+00 2.772694e+00 4.802614e+00 5.881952e+00 4.983657e+00 7.047486e+00 1.220703e+01 1.495043e+01
89+
90+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
91+ Electronic Dipole moment(SCF): 3.048840e+00 4.311486e+00 7.467905e+00 9.146253e+00 7.749380e+00 1.095871e+01 1.898153e+01 2.324746e+01
92+
93+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
94+ Core Dipole moment: -1.088119e+00 -1.538792e+00 -2.665291e+00 3.264301e+00 -2.765723e+00 -3.911221e+00 -6.774495e+00 8.297027e+00
95+
96+ | k-th eigenstate | i-th atom | atom type | core charge[a.u.] | Mulliken charge[a.u.]|
97+ Mulliken charge(SCF): 0 0 C 4.000000e+00 2.761804e-01
98+ Mulliken charge(SCF): 0 1 H 1.000000e+00 -7.596358e-03
99+ Mulliken charge(SCF): 0 2 H 1.000000e+00 -7.596306e-03
100+ Mulliken charge(SCF): 0 3 H 1.000000e+00 -7.596308e-03
101+ Mulliken charge(SCF): 0 4 F 7.000000e+00 -2.533914e-01
102+
103+ | [a.u.] | [Kcal/mol] |
104+ Heats of formation: -9.173557e-02 -5.756493e+01
105+
106+ Elapsed time(omp) for the SCF = 0.009764[s].
107+********** DONE: MNDO-SCF **********
108+
109+
110+ Summary for memory usage:
111+ Max Heap: 0.121728[MB].
112+ Current Heap(Leaked): 0.000000[MB].
113+
114+
115+ >>>>> The MolDS finished normally! <<<<<
116+ >>>>> CPU time: 0.012207[s]. <<<<<
117+ >>>>> Elapsed time: 0[s]. <<<<<
118+ >>>>> Elapsed time(OMP): 0.010814[s]. <<<<<
119+ >>>>> See you. <<<<<
120+
121+
--- /dev/null
+++ b/test/ch3f_mndo.in
@@ -0,0 +1,22 @@
1+THEORY
2+ mndo
3+THEORY_END
4+
5+SCF
6+ max_iter 500
7+ rms_density 1e-8
8+ damping_thresh 1.0
9+ damping_weight 0.0
10+ diis_num_error_vect 5
11+ diis_start_error 0.1
12+ diis_end_error 0.0
13+SCF_END
14+
15+GEOMETRY
16+ C -0.23992322 0.60460652 0.00000000
17+ H 0.11673121 -0.40420349 0.00000000
18+ H 0.11674962 1.10900471 -0.87365150
19+ H -1.30992322 0.60461970 0.00000000
20+ F 0.21008457 1.24099676 1.10227059
21+GEOMETRY_END
22+
--- /dev/null
+++ b/test/ch3f_pm3.dat
@@ -0,0 +1,120 @@
1+
2+
3+ >>>>> Welcome to the MolDS world at 2014/4/29(Thu.) 0:44:48 <<<<<
4+
5+
6+********** START: Parse input **********
7+ Total number of atoms: 5
8+ Total number of valence AOs: 11
9+ Total number of valence electrons: 14
10+
11+ | i-th | atom type | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
12+ Atom coordinates: 0 C -4.533892e-01 1.142541e+00 0.000000e+00 -2.399232e-01 6.046065e-01 0.000000e+00
13+ Atom coordinates: 1 H 2.205900e-01 -7.638339e-01 0.000000e+00 1.167312e-01 -4.042035e-01 0.000000e+00
14+ Atom coordinates: 2 H 2.206248e-01 2.095715e+00 -1.650962e+00 1.167496e-01 1.109005e+00 -8.736515e-01
15+ Atom coordinates: 3 H -2.475396e+00 1.142566e+00 0.000000e+00 -1.309923e+00 6.046197e-01 0.000000e+00
16+ Atom coordinates: 4 F 3.970023e-01 2.345144e+00 2.082990e+00 2.100846e-01 1.240997e+00 1.102271e+00
17+
18+ | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
19+ Center of Mass: 1.367960e-03 1.785647e+00 1.113904e+00 7.238933e-04 9.449239e-01 5.894525e-01
20+
21+ | x[a.u.] | y[a.u.] | z[a.u.] | | x[angst.] | y[angst.] | z[angst.] |
22+ Center of Core: 1.385500e-03 1.785672e+00 1.113947e+00 7.331749e-04 9.449370e-01 5.894753e-01
23+
24+ SCF conditions:
25+ Max iterations: 500
26+ RMS density: 1.000000e-08
27+ Damping threshold: 1.000000e+00
28+ Damping weight: 0.000000e+00
29+ DIIS number of error vectors: 5
30+ DIIS starting error: 1.000000e-01
31+ DIIS ending error: 0.000000e+00
32+ van der Waals (vdW) correction: no
33+
34+ Memory conditions:
35+ Heap limit: 2.560000e+02[MB]
36+
37+Input terms:
38+theory | pm3 | theory_end | scf | max_iter | 500 | rms_density | 1e-8 | damping_thresh | 1.0 |
39+damping_weight | 0.0 | diis_num_error_vect | 5 | diis_start_error | 0.1 | diis_end_error | 0.0 | scf_end | geometry |
40+c | -0.23992322 | 0.60460652 | 0.00000000 | h | 0.11673121 | -0.40420349 | 0.00000000 | h | 0.11674962 |
41+1.10900471 | -0.87365150 | h | -1.30992322 | 0.60461970 | 0.00000000 | f | 0.21008457 | 1.24099676 | 1.10227059 |
42+geometry_end |
43+
44+********** DONE: Parse input ***********
45+
46+
47+********** START: PM3-SCF **********
48+ | RMS density | DIIS error | DIIS on/off | damping on/off |
49+ SCF iter 0 4.810457e-01 0.000000e+00
50+ SCF iter 1 1.867170e-01 0.000000e+00
51+ SCF iter 2 6.730937e-02 4.641583e-01
52+ SCF iter 3 3.389793e-02 2.377993e-01
53+ SCF iter 4 1.857022e-02 1.407733e-01
54+ SCF iter 5 1.039733e-02 8.234052e-02
55+ SCF iter 6 7.581158e-05 4.696825e-02 on
56+ SCF iter 7 1.723006e-05 1.718827e-04 on
57+ SCF iter 8 6.769747e-06 6.121626e-05 on
58+ SCF iter 9 3.123328e-06 2.309953e-05 on
59+ SCF iter 10 6.924853e-07 1.126421e-05 on
60+ SCF iter 11 8.205988e-08 2.477657e-06 on
61+ SCF iter 12 2.568285e-08 2.749173e-07 on
62+ SCF iter 13 5.739182e-09 1.126507e-07 on
63+
64+
65+
66+ PM3-SCF met convergence criterion(^^b
67+
68+
69+ | i-th | occ/unocc | e[a.u.] | e[eV] |
70+ Energy of MO: 0 occ -1.173782e+00 -3.194049e+01
71+ Energy of MO: 1 occ -7.481778e-01 -2.035912e+01
72+ Energy of MO: 2 occ -6.584337e-01 -1.791704e+01
73+ Energy of MO: 3 occ -6.584336e-01 -1.791703e+01
74+ Energy of MO: 4 occ -6.368305e-01 -1.732918e+01
75+ Energy of MO: 5 occ -4.768455e-01 -1.297573e+01
76+ Energy of MO: 6 occ -4.768455e-01 -1.297573e+01
77+ Energy of MO: 7 unocc 1.094050e-01 2.977086e+00
78+ Energy of MO: 8 unocc 1.428529e-01 3.887258e+00
79+ Energy of MO: 9 unocc 1.428530e-01 3.887258e+00
80+ Energy of MO: 10 unocc 1.558753e-01 4.241617e+00
81+
82+ | [a.u.] | [eV] |
83+ Electronic energy(SCF): -2.224335e+01 -6.052773e+02
84+ Note that this electronic energy includes core-repulsions.
85+
86+ | [a.u.] | [eV] |
87+ Core repulsion energy: 1.828033e+01 4.974371e+02
88+
89+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
90+ Total Dipole moment(SCF): 2.146407e+00 3.035505e+00 5.257579e+00 6.439215e+00 5.455624e+00 7.715485e+00 1.336344e+01 1.636686e+01
91+
92+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
93+ Electronic Dipole moment(SCF): 3.234526e+00 4.574297e+00 7.922870e+00 9.703516e+00 8.221347e+00 1.162671e+01 2.013793e+01 2.466388e+01
94+
95+ | x[a.u.] | y[a.u.] | z[a.u.] | magnitude[a.u.] | | x[debye] | y[debye] | z[debye] | magnitude[debye] |
96+ Core Dipole moment: -1.088119e+00 -1.538792e+00 -2.665291e+00 3.264301e+00 -2.765723e+00 -3.911221e+00 -6.774495e+00 8.297027e+00
97+
98+ | k-th eigenstate | i-th atom | atom type | core charge[a.u.] | Mulliken charge[a.u.]|
99+ Mulliken charge(SCF): 0 0 C 4.000000e+00 6.107371e-02
100+ Mulliken charge(SCF): 0 1 H 1.000000e+00 2.909550e-02
101+ Mulliken charge(SCF): 0 2 H 1.000000e+00 2.909555e-02
102+ Mulliken charge(SCF): 0 3 H 1.000000e+00 2.909555e-02
103+ Mulliken charge(SCF): 0 4 F 7.000000e+00 -1.483603e-01
104+
105+ Elapsed time(omp) for the SCF = 0.078902[s].
106+********** DONE: PM3-SCF **********
107+
108+
109+ Summary for memory usage:
110+ Max Heap: 0.121728[MB].
111+ Current Heap(Leaked): 0.000000[MB].
112+
113+
114+ >>>>> The MolDS finished normally! <<<<<
115+ >>>>> CPU time: 0.025291[s]. <<<<<
116+ >>>>> Elapsed time: 0[s]. <<<<<
117+ >>>>> Elapsed time(OMP): 0.079946[s]. <<<<<
118+ >>>>> See you. <<<<<
119+
120+
--- /dev/null
+++ b/test/ch3f_pm3.in
@@ -0,0 +1,22 @@
1+THEORY
2+ pm3
3+THEORY_END
4+
5+SCF
6+ max_iter 500
7+ rms_density 1e-8
8+ damping_thresh 1.0
9+ damping_weight 0.0
10+ diis_num_error_vect 5
11+ diis_start_error 0.1
12+ diis_end_error 0.0
13+SCF_END
14+
15+GEOMETRY
16+ C -0.23992322 0.60460652 0.00000000
17+ H 0.11673121 -0.40420349 0.00000000
18+ H 0.11674962 1.10900471 -0.87365150
19+ H -1.30992322 0.60461970 0.00000000
20+ F 0.21008457 1.24099676 1.10227059
21+GEOMETRY_END
22+