Rename a function in thermodynamics

ttadano · Apr 3, 2018 · fe57e8e · fe57e8e
1 parent 6828ffe
commit fe57e8e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/anphon/thermodynamics.cpp b/anphon/thermodynamics.cpp
@@ -399,9 +399,9 @@ void Thermodynamics::compute_free_energy_bubble()
 
     memory->allocate(FE_bubble, NT);
 
-    Calc_FE_bubble(dynamical->eval_phonon,
-                   dynamical->evec_phonon,
-                   FE_bubble);
+    compute_FE_bubble(dynamical->eval_phonon,
+                      dynamical->evec_phonon,
+                      FE_bubble);
 
     if (mympi->my_rank == 0) {
         std::cout << " done!" << std::endl << std::endl;
@@ -424,17 +424,17 @@ void Thermodynamics::compute_free_energy_bubble_SCPH(double ***eval_scph,
 
     memory->allocate(FE_bubble, NT);
 
-    Calc_FE_bubble_SCPH(eval_scph, evec_scph, FE_bubble);
+    compute_FE_bubble_SCPH(eval_scph, evec_scph, FE_bubble);
 
     if (mympi->my_rank == 0) {
         std::cout << " done!" << std::endl << std::endl;
     }
 }
 
 
-void Thermodynamics::Calc_FE_bubble(double **eval,
-                                    std::complex<double> ***evec,
-                                    double *FE_bubble)
+void Thermodynamics::compute_FE_bubble(double **eval,
+                                       std::complex<double> ***evec,
+                                       double *FE_bubble)
 {
     // This function calculates the free energy of the bubble diagram
     int i;
@@ -554,9 +554,9 @@ void Thermodynamics::Calc_FE_bubble(double **eval,
 }
 
 
-void Thermodynamics::Calc_FE_bubble_SCPH(double ***eval,
-                                         std::complex<double> ****evec,
-                                         double *FE_bubble)
+void Thermodynamics::compute_FE_bubble_SCPH(double ***eval,
+                                            std::complex<double> ****evec,
+                                            double *FE_bubble)
 {
     // This function calculates the free energy of the bubble diagram
     int i;

diff --git a/anphon/thermodynamics.h b/anphon/thermodynamics.h
@@ -66,13 +66,12 @@ namespace PHON_NS
         void compute_free_energy_bubble_SCPH(double ***,
                                              std::complex<double> ****);
 
+        void compute_FE_bubble(double **,
+                               std::complex<double> ***,
+                               double *);
 
-        void Calc_FE_bubble(double **,
-                            std::complex<double> ***,
-                            double *);
-
-        void Calc_FE_bubble_SCPH(double ***,
-                                 std::complex<double> ****,
-                                 double *);
+        void compute_FE_bubble_SCPH(double ***,
+                                    std::complex<double> ****,
+                                    double *);
     };
 }