Support 'NONE', 'No', 'none' etc. instead of 'None' for the cutoff fi…

…eld.
ttadano · Feb 22, 2016 · 2387335 · 2387335
1 parent c67fd5c
commit 2387335
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/alm/input.cpp b/alm/input.cpp
@@ -586,7 +586,8 @@ void Input::parse_cutoff_radii()
         jkd = kd_map[str_pair[1]];
 
         for (order = 0; order < maxorder; ++order) {
-            if (cutoff_line[order + 1] == "None") {
+   //         if (cutoff_line[order + 1] == "None") {
+            if (cutoff_line[order+1][0] == 'N' or cutoff_line[order+1][0] == 'n') {
                 // Minus value for cutoff radius.
                 // This is a flag for neglecting cutoff radius
                 cutoff_tmp = -1.0;

diff --git a/alm/interaction.cpp b/alm/interaction.cpp
@@ -75,10 +75,6 @@ void Interaction::init()
         std::cout << std::endl;
     }
 
-//    for (i = 0; i < 3; ++i) {
-//        if(!is_periodic[i]) nsize[i] = 0;
-//    }
-
     nneib = (2 * nsize[0] + 1) * (2 * nsize[1] + 1) * (2 * nsize[2] + 1);
     memory->allocate(x_image, nneib, nat, 3);
     memory->allocate(exist_image, nneib);