Removed obselete code from spncci and lgi libraries

nd-nuclear-theory · Jan 29, 2021 · ad3018e · ad3018e
1 parent 7602135
commit ad3018e
Show file tree

Hide file tree

Showing 28 changed files with 29 additions and 6,709 deletions.
diff --git a/libraries/lgi/get_lgi_expansion.cpp b/libraries/lgi/get_lgi_expansion.cpp
diff --git a/libraries/lgi/lgi.cpp b/libraries/lgi/lgi.cpp
@@ -58,7 +58,7 @@ namespace lgi
     return ss.str();
   }
 
-  std::string LGIOutputStr(const MultiplicityTagged<lgi::LGI>& lgi_family)
+  std::string LGIFamilyStr(const MultiplicityTagged<lgi::LGI>& lgi_family)
     {
       int Nex;
       u3::U3 sigma;
@@ -85,7 +85,7 @@ namespace lgi
       {
         std::tie(Nex,sigma,Sp,Sn,S)=lgi_count.irrep.Key();
         int count=lgi_count.tag;
-        os<<LGIOutputStr(lgi_count)<<std::endl;
+        os<<LGIFamilyStr(lgi_count)<<std::endl;
       }
   }
 
@@ -98,51 +98,6 @@ namespace lgi
     os.close();
   }
 
-  void 
-  WriteLGIExpansionHeader(int Z, int N, int Nmax, std::ostream& os)
-    {
-      os<<"# Z  N  Nmax"<<std::endl;
-      os<<"#  Nex lambda mu 2Sp 2Sn 2S gamma_max"<<std::endl;
-      os<<fmt::format("{}  {}  {}", Z, N, Nmax)<<std::endl;
-    }
-
-  void 
-  WriteLGIExpansion(
-    const lgi::MultiplicityTaggedLGIVector& lgi_families,
-    const lsu3shell::OperatorBlocks&lgi_expansions,
-    std::ostream& os
-  )
-  {
-    for(int i=0; i<lgi_families.size(); ++i)
-      {
-        const auto& lgi_family=lgi_families[i];
-        os<<LGIOutputStr(lgi_family)<<std::endl;
-        os<<mcutils::FormatMatrix(lgi_expansions[i], ".8f")<<std::endl;
-      }
-  }
-
-
-  void 
-  WriteLGIExpansion(
-    int Z, int N, int Nmax,
-    const lgi::MultiplicityTaggedLGIVector& lgi_families,
-    lsu3shell::OperatorBlocks&lgi_expansion,
-    const std::string& filename
-  )
-    {
-      // Open file
-      std::ofstream os;
-      os.open(filename);
-
-      // Write header 
-      WriteLGIExpansionHeader(Z,N,Nmax,os);
-
-      //Write expansions 
-      WriteLGIExpansion(lgi_families,lgi_expansion,os);
-
-      os.close();
-    }
-
 
   void ReadLGISet(
     const std::string& lgi_filename, 

diff --git a/libraries/lgi/lgi.h b/libraries/lgi/lgi.h
@@ -12,6 +12,7 @@
     to accept std::ostream for output and extract to lgi.
   10/11/17 (aem) : Extract Nsigma0ForNuclide from spncci_basis
   1/15/18 (aem) : Updated Read LGI to be consistant with write functions
+  1/28/21 (aem) : Removed deprecated WriteLGIExpansion function.
 ****************************************************************/
 #ifndef LGI_SOLVER_H_
 #define LGI_SOLVER_H_
@@ -150,22 +151,14 @@ namespace lgi
   // STYLE: maybe LGI::vector would be more consistent
   typedef MultiplicityTagged<lgi::LGI>::vector MultiplicityTaggedLGIVector;
 
+  std::string LGIFamilyStr(const MultiplicityTagged<lgi::LGI>& lgi_family);
+
   void
     WriteLGILabels(const lgi::MultiplicityTaggedLGIVector& lgi_families,std::ostream& os);
 
   void
     WriteLGILabels(const lgi::MultiplicityTaggedLGIVector& lgi_families, const std::string& filename);
 
-
-  void 
-  WriteLGIExpansion(
-    int Z, int N, int Nmax,
-    const lgi::MultiplicityTaggedLGIVector& lgi_families,
-    lsu3shell::OperatorBlocks&lgi_expansions,
-    const std::string& filename
-  );
-
-
   void 
   ReadLGISet(
     const std::string& lgi_filename, 

diff --git a/libraries/lgi/lgi_solver.cpp b/libraries/lgi/lgi_solver.cpp
@@ -335,12 +335,7 @@ void WriteLGIExpansionsText(const std::string& filename, const lsu3shell::Operat
     int num_rows=lgi_expansion.rows();
     int num_cols=lgi_expansion.cols();
     expansion_file << num_rows << num_cols<<std::endl;
-
-    for(int j=0; j<num_cols; ++j)
-      for(int i=0; i<num_rows; ++i)
-          expansion_file<<lgi_expansion(i,j);
-
-      expansion_file<<std::endl;
+    expansion_file<<mcutils::FormatMatrix(lgi_expansion, ".8f")<<std::endl;        
   }
 
 

diff --git a/libraries/lgi/lgi_solver.h b/libraries/lgi/lgi_solver.h
@@ -152,8 +152,5 @@ void ReadLGIExpansion(
   // Outputs
   //  lgi_expansions
 
-
-
-
 }
 #endif
diff --git a/libraries/sp3rlib/scratch.cpp b/libraries/sp3rlib/scratch.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,8 +152,5 @@ void ReadLGIExpansion( @@
       // Outputs
       //  lgi_expansions
     }
     #endif