提交: 0fa851dfdbb7666784cba5622e0582b6da9c8f66 - MolDS (git)

Commit MetaInfo

• 修订版: 0fa851dfdbb7666784cba5622e0582b6da9c8f66 (tree)
• 时间: 2013-07-25 00:46:00
• 作者: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Log Message

Some methods for MC in Parameters-class is inlined #27279

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

更改概述

• modified: src/base/Parameters.cpp
• modified: src/base/Parameters.h

差异

--- a/src/base/Parameters.cpp
+++ b/src/base/Parameters.cpp
@@ -361,47 +361,6 @@ bool Parameters::RequiresMullikenCIS() const{
            0<this->electronicStateIndecesMullikenCIS->size());
 }
 
-// methods for MC
-int Parameters::GetElectronicStateIndexMC() const{
-   return this->electronicStateIndexMC;
-}
-
-void Parameters::SetElectronicStateIndexMC(int electronicStateIndex){
-   this->electronicStateIndexMC = electronicStateIndex;
-}
-
-int Parameters::GetTotalStepsMC() const{
-   return this->totalStepsMC;
-}
-
-void Parameters::SetTotalStepsMC(int totalSteps){
-   this->totalStepsMC = totalSteps;
-}
-
-double Parameters::GetTemperatureMC() const{
-   return this->temperatureMC;
-}
-
-void Parameters::SetTemperatureMC(double temperature){
-   this->temperatureMC = temperature;
-}
-
-double Parameters::GetStepWidthMC() const{
-   return this->stepWidthMC;
-}
-
-void Parameters::SetStepWidthMC(double stepWidth){
-   this->stepWidthMC = stepWidth;
-}
-
-unsigned long Parameters::GetSeedMC() const{
-   return this->seedMC;
-}
-
-void Parameters::SetSeedMC(unsigned long seed){
-   this->seedMC = seed;
-}
-
 // methods for RPMD
 int Parameters::GetElectronicStateIndexRPMD() const{
    return this->electronicStateIndexRPMD;

--- a/src/base/Parameters.h
+++ b/src/base/Parameters.h
@@ -154,16 +154,16 @@ public:
    double GetTimeWidthMD() const              {return this->timeWidthMD;}
    void   SetTimeWidthMD(double dt)           {this->timeWidthMD = dt;}
    // MC
-   int           GetElectronicStateIndexMC() const;
-   void          SetElectronicStateIndexMC(int electronicStateIndex);
-   int           GetTotalStepsMC() const;
-   void          SetTotalStepsMC(int totalSteps);
-   double        GetTemperatureMC() const;
-   void          SetTemperatureMC(double temperature);
-   double        GetStepWidthMC() const;
-   void          SetStepWidthMC(double stepWidth);
-   unsigned long GetSeedMC() const;
-   void          SetSeedMC(unsigned long seed);
+   int           GetElectronicStateIndexMC() const{return this->electronicStateIndexMC;}
+   void          SetElectronicStateIndexMC(int i) {this->electronicStateIndexMC = i;}
+   int           GetTotalStepsMC() const          {return this->totalStepsMC;}
+   void          SetTotalStepsMC(int steps)       {this->totalStepsMC = steps;}
+   double        GetTemperatureMC() const         {return this->temperatureMC;}
+   void          SetTemperatureMC(double t)       {this->temperatureMC = t;}
+   double        GetStepWidthMC() const           {return this->stepWidthMC;}
+   void          SetStepWidthMC(double dr)        {this->stepWidthMC = dr;}
+   unsigned long GetSeedMC() const                {return this->seedMC;}
+   void          SetSeedMC(unsigned long seed)    {this->seedMC = seed;}
    // RPMD
    int           GetElectronicStateIndexRPMD() const;
    void          SetElectronicStateIndexRPMD(int electronicStateIndex);