hush some (not all) VLA-related warnings by using constexpr size

m-a-d-n-e-s-s · Jun 21, 2024 · 96ac90e · 96ac90e
1 parent d34a2ea
commit 96ac90e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/src/madness/chem/MolecularOrbitals.h b/src/madness/chem/MolecularOrbitals.h
@@ -187,7 +187,7 @@ class MolecularOrbitals : public archive::ParallelSerializableObject {
 	    print("orbital #   irrep   energy    occupation  localize_set");
         for (int i=mo.size()-1; i>=0; --i) {
 //            double n=get_mos()[i].norm2();
-            std::size_t bufsize=1024;
+            constexpr std::size_t bufsize=1024;
             char buf[bufsize];
             snprintf(buf,bufsize,"%5d %10s %12.8f  %6.2f  %8d  %15s", i, irreps[i].c_str(),get_eps()[i],
                    get_occ()[i],get_localize_sets()[i], flags[i].c_str());

diff --git a/src/madness/chem/ccpairfunction.h b/src/madness/chem/ccpairfunction.h
@@ -716,7 +716,7 @@ using pureT=Function<T,NDIM>;
             for (auto& b : vb) {
                 double tmp=a.inner_internal(b,R2);
                 double wall1=cpu_time();
-                std::size_t bufsize=256;
+                constexpr std::size_t bufsize=256;
                 char buf[bufsize];
                 snprintf(buf,bufsize,"result from inner %10s %10s %12.8f %4.1fs",a.name(true).c_str(),b.name().c_str(),tmp,wall1-wall0);
                 print(std::string(buf));

diff --git a/src/madness/chem/mp3.cc b/src/madness/chem/mp3.cc
@@ -663,8 +663,8 @@ double MP3::compute_mp3_cd(World& world,
     double tmp2 = inner(bra, g12 * pair_square(j, i), Rsquare);
     double fac = (i == j) ? 0.5 : 1.0;
     double result = fac * (4.0 * tmp1 - 2.0 * tmp2);
-	std::size_t bufsize=256;
-	char buf[bufsize];
+    constexpr std::size_t bufsize=256;
+    char buf[bufsize];
     snprintf(buf,bufsize,"mp3 energy: term_CD %2ld %2ld: %12.8f\n", i, j, result);
     print(std::string(buf));
     return result;
@@ -721,8 +721,8 @@ double MP3::compute_mp3_ef(World& world,
     }
     tmp_tau=consolidate(tmp_tau,{"remove_lindep"});
     double result=inner(pair_square(i,j),tmp_tau,Rsquare);
-	std::size_t bufsize=256;
-	char buf[bufsize];
+    constexpr std::size_t bufsize=256;
+    char buf[bufsize];
     snprintf(buf, bufsize,"mp3 energy: term_EF %2ld %2ld %12.8f\n",i,j,result);
     print(std::string(buf));
 
@@ -806,8 +806,8 @@ double MP3::compute_mp3_ghij(World& world,
         auto bra_intermediate = multiply(intermediate, Rsquare, {3, 4, 5});
         t4.tag("multiply");
         double tmp = 2.0*inner(bra_intermediate, gintermediate);
-	    std::size_t bufsize=256;
-	    char buf[bufsize];
+        constexpr std::size_t bufsize=256;
+        char buf[bufsize];
         snprintf(buf, bufsize,"mp3 energy: term_GHIJ  %2ld %12.8f\n", i, tmp);
         print(std::string(buf));
         t4.tag("inner");
@@ -872,8 +872,8 @@ double MP3::compute_mp3_klmn(World& world,
     double result = -2.0*inner(lhs, rhs, Rsquare);
     inner_KLMN.interrupt();
 
-	std::size_t bufsize=256;
-	char buf[bufsize];
+    constexpr std::size_t bufsize=256;
+    char buf[bufsize];
     snprintf(buf,bufsize,"mp3 energy: term_KLMN %2ld %2ld %12.8f\n", i, j, result);
     print(std::string(buf));
 

diff --git a/src/madness/mra/macrotaskq.h b/src/madness/mra/macrotaskq.h
@@ -481,8 +481,8 @@ class MacroTask {
 		bool debug=false;
 
 		io_redirect(const long task_number, std::string filename, bool debug=false) : debug(debug) {
-	        std::size_t bufsize=256;
-	        char cfilename[bufsize];
+	                constexpr std::size_t bufsize=256;
+	                char cfilename[bufsize];
 			std::snprintf(cfilename,bufsize,"%s.%5.5ld",filename.c_str(),task_number);
 			ofile=std::ofstream(cfilename);
 			if (debug) std::cout << "redirecting to file " << cfilename << std::endl;

diff --git a/src/madness/mra/mraimpl.h b/src/madness/mra/mraimpl.h
@@ -2104,7 +2104,7 @@ namespace madness {
 
         if (this->world.rank()==0) {
 
-            std::size_t bufsize=128;
+            constexpr std::size_t bufsize=128;
             char buf[bufsize];
             snprintf(buf, bufsize, "%40s at time %.1fs: norm/tree/#coeff/size: %7.5f %zu, %6.3f m, %6.3f GByte",
                    (name.c_str()), wall, norm, tsize,double(ncoeff)*1.e-6,double(ncoeff)/fac*d);

diff --git a/src/madness/world/parallel_archive.h b/src/madness/world/parallel_archive.h
@@ -169,7 +169,7 @@ namespace madness {
                 MADNESS_ASSERT(filename);
                 MADNESS_ASSERT(strlen(filename)-1<sizeof(fname));
                 strcpy(fname,filename); // Save the filename for later
-                std::size_t bufsize=256;
+                constexpr std::size_t bufsize=256;
                 char buf[bufsize];
                 MADNESS_ASSERT(strlen(filename)+7 <= sizeof(buf));
                 snprintf(buf, bufsize, "%s.%5.5d", filename, world.rank());
@@ -222,7 +222,7 @@ namespace madness {
             typename std::enable_if_t<std::is_same<X,BinaryFstreamInputArchive>::value || std::is_same<X,BinaryFstreamOutputArchive>::value,
                                       bool>
             exists(World& world, const char* filename) {
-                std::size_t bufsize=256;
+                constexpr std::size_t bufsize=256;
                 char buf[bufsize];
                 MADNESS_ASSERT(strlen(filename)+7 <= sizeof(buf));
                 snprintf(buf,bufsize, "%s.%5.5d", filename, world.rank());
@@ -273,7 +273,7 @@ namespace madness {
                                       void>
             remove(World& world, const char* filename) {
                 if (world.rank() == 0) {
-                    std::size_t bufsize=268;
+                    constexpr std::size_t bufsize=268;
                     char buf[bufsize];
                     MADNESS_ASSERT(strlen(filename)+7 <= sizeof(buf));
                     for (ProcessID p=0; p<world.size(); ++p) {

diff --git a/src/madness/world/redirectio.cc b/src/madness/world/redirectio.cc
@@ -40,7 +40,7 @@ using std::endl;
 static std::ofstream fout;
 namespace madness {
     void redirectio(const World& world, bool split) {
-        std::size_t bufsize=256;
+        constexpr std::size_t bufsize=256;
         char filename[bufsize];
         std::snprintf(filename,bufsize,"log.%5.5d",world.mpi.rank());
         char errfilename[bufsize];