Revisão | 0d86a14e0ef50a4826a2534e9c3eb18e4fc6eb4a (tree) |
---|---|
Hora | 2011-01-27 19:34:07 |
Autor | Mikiya Fujii <mikiya.fujii@gmai...> |
Commiter | Mikiya Fujii |
type again
git-svn-id: https://svn.sourceforge.jp/svnroot/molds/MolDS/trunk@66 1136aad2-a195-0410-b898-f5ea1d11b9d8
@@ -47,9 +47,9 @@ Catom::Catom(double x, double y, double z) : Atom(x, y, z){ | ||
47 | 47 | this->zindoG3pd = 0.0; |
48 | 48 | this->zindoF2dd = 0.0; |
49 | 49 | this->zindoF4dd = 0.0; |
50 | - this->IonPotS = 19.84 * Parameters::GetInstance()->GetEV2AU(); | |
51 | - this->IonPotP = 10.93 * Parameters::GetInstance()->GetEV2AU(); | |
52 | - this->IonPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
50 | + this->ionPotS = 19.84 * Parameters::GetInstance()->GetEV2AU(); | |
51 | + this->ionPotP = 10.93 * Parameters::GetInstance()->GetEV2AU(); | |
52 | + this->ionPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
53 | 53 | } |
54 | 54 | |
55 | 55 | double Catom::GetCoreIntegral(OrbitalType orbital, double gamma, bool isGuess, TheoryType theory){ |
@@ -45,9 +45,9 @@ Hatom::Hatom(double x, double y, double z) : Atom(x, y, z){ | ||
45 | 45 | this->zindoG3pd = 0.0; |
46 | 46 | this->zindoF2dd = 0.0; |
47 | 47 | this->zindoF4dd = 0.0; |
48 | - this->IonPotS = 13.06 * Parameters::GetInstance()->GetEV2AU(); | |
49 | - this->IonPotP = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
50 | - this->IonPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
48 | + this->ionPotS = 13.06 * Parameters::GetInstance()->GetEV2AU(); | |
49 | + this->ionPotP = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
50 | + this->ionPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
51 | 51 | } |
52 | 52 | |
53 | 53 | double Hatom::GetCoreIntegral(OrbitalType orbital, double gamma, bool isGuess, TheoryType theory){ |
@@ -48,9 +48,9 @@ Liatom::Liatom(double x, double y, double z) : Atom(x, y, z){ | ||
48 | 48 | this->zindoG3pd = 0.0; |
49 | 49 | this->zindoF2dd = 0.0; |
50 | 50 | this->zindoF4dd = 0.0; |
51 | - this->IonPotS = 5.39 * Parameters::GetInstance()->GetEV2AU(); | |
52 | - this->IonPotP = 3.54 * Parameters::GetInstance()->GetEV2AU(); | |
53 | - this->IonPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
51 | + this->ionPotS = 5.39 * Parameters::GetInstance()->GetEV2AU(); | |
52 | + this->ionPotP = 3.54 * Parameters::GetInstance()->GetEV2AU(); | |
53 | + this->ionPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
54 | 54 | } |
55 | 55 | |
56 | 56 | double Liatom::GetCoreIntegral(OrbitalType orbital, double gamma, bool isGuess, TheoryType theory){ |
@@ -47,9 +47,9 @@ Natom::Natom(double x, double y, double z) : Atom(x, y, z){ | ||
47 | 47 | this->zindoG3pd = 0.0; |
48 | 48 | this->zindoF2dd = 0.0; |
49 | 49 | this->zindoF4dd = 0.0; |
50 | - this->IonPotS = 25.69 * Parameters::GetInstance()->GetEV2AU(); | |
51 | - this->IonPotP = 14.05 * Parameters::GetInstance()->GetEV2AU(); | |
52 | - this->IonPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
50 | + this->ionPotS = 25.69 * Parameters::GetInstance()->GetEV2AU(); | |
51 | + this->ionPotP = 14.05 * Parameters::GetInstance()->GetEV2AU(); | |
52 | + this->ionPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
53 | 53 | } |
54 | 54 | |
55 | 55 | double Natom::GetCoreIntegral(OrbitalType orbital, double gamma, bool isGuess, TheoryType theory){ |
@@ -47,9 +47,9 @@ Oatom::Oatom(double x, double y, double z) : Atom(x, y, z){ | ||
47 | 47 | this->zindoG3pd = 0.0; |
48 | 48 | this->zindoF2dd = 0.0; |
49 | 49 | this->zindoF4dd = 0.0; |
50 | - this->IonPotS = 32.90 * Parameters::GetInstance()->GetEV2AU(); | |
51 | - this->IonPotP = 17.28 * Parameters::GetInstance()->GetEV2AU(); | |
52 | - this->IonPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
50 | + this->ionPotS = 32.90 * Parameters::GetInstance()->GetEV2AU(); | |
51 | + this->ionPotP = 17.28 * Parameters::GetInstance()->GetEV2AU(); | |
52 | + this->ionPotD = 0.0 * Parameters::GetInstance()->GetEV2AU(); | |
53 | 53 | } |
54 | 54 | |
55 | 55 | double Oatom::GetCoreIntegral(OrbitalType orbital, double gamma, bool isGuess, TheoryType theory){ |
@@ -55,9 +55,9 @@ Satom::Satom(double x, double y, double z) : Atom(x, y, z){ | ||
55 | 55 | this->zindoG3pd = 20587*Parameters::GetInstance()->GetKayser2AU(); |
56 | 56 | this->zindoF2dd = 28411*Parameters::GetInstance()->GetKayser2AU(); |
57 | 57 | this->zindoF4dd = 18529*Parameters::GetInstance()->GetKayser2AU(); |
58 | - this->IonPotS = 21.11 * Parameters::GetInstance()->GetEV2AU(); | |
59 | - this->IonPotP = 12.39 * Parameters::GetInstance()->GetEV2AU(); | |
60 | - this->IonPotD = 4.11 * Parameters::GetInstance()->GetEV2AU(); | |
58 | + this->ionPotS = 21.11 * Parameters::GetInstance()->GetEV2AU(); | |
59 | + this->ionPotP = 12.39 * Parameters::GetInstance()->GetEV2AU(); | |
60 | + this->ionPotD = 4.11 * Parameters::GetInstance()->GetEV2AU(); | |
61 | 61 | } |
62 | 62 | |
63 | 63 | double Satom::GetCoreIntegral(OrbitalType orbital, double gamma, bool isGuess, TheoryType theory){ |