Merge pull request #231 from jcthomas/v0.2a2_fix_status

Fixing minor bug in 'casm status'

Author: bpuchala

src/casm/app/format.cc

@@ -81,13 +81,14 @@ namespace CASM {
       std::cout << "  The expected CASM project directory structure with VASP settings  \n";
       std::cout << "  files:                                                            \n";
       std::cout << "                                                                    \n";
-      std::cout << "    $ROOT/.casm                                                     \n";
-      std::cout << "      project_settings.json                                         \n";
-      std::cout << "      config_list.json                                              \n";
       std::cout << "    $ROOT/                                                          \n";
       std::cout << "      prim.json                                                     \n";
       std::cout << "      (PRIM)                                                        \n";
       std::cout << "      LOG                                                           \n";
+      std::cout << "    $ROOT/.casm                                                     \n";
+      std::cout << "      project_settings.json                                         \n";
+      std::cout << "      config_list.json                                              \n";
+      std::cout << "      composition_axes.json                                         \n";
       std::cout << "    $ROOT/symmetry/                                                 \n";
       std::cout << "      lattice_point_group.json                                      \n";
       std::cout << "      factor_group.json                                             \n";
@@ -105,7 +106,6 @@ namespace CASM {
       std::cout << "      KPOINTS                                                       \n";
       std::cout << "      POSCAR                                                        \n";
       std::cout << "    $ROOT/training_data/settings/$CURR_CALCTYPE/$CURR_REF/          \n";
-      std::cout << "      composition_axes.json                                         \n";
       std::cout << "      chemical_reference.json                                       \n";
       std::cout << "    $ROOT/training_data/$SCELNAME/                                  \n";
       std::cout << "      LAT                                                           \n";
@@ -632,7 +632,7 @@ LCHARG = .FALSE.\n";
       std::cout << "\n### composition_axes.json ##################\n\n";
 
       std::cout << "LOCATION WHEN GENERATED:\n";
-      std::cout << "$ROOT/training_data/settings/$CURR_CALCTYPE/$CURR_REF/composition_axes.json\n";
+      std::cout << "$ROOT/.casm/composition_axes.json\n";
       std::cout << "\n\n";
 
       std::cout << "DESCRIPTION:\n";

src/casm/app/status.cc

@@ -31,35 +31,15 @@ namespace CASM {
 - See 'casm format' for descriptions and locations of the 'prim.json' file.\n";
   }
 
-  void standard_composition_uncalculated() {
-
-    std::cout << "NEXT STEPS:\n\n";
-
-    std::cout <<
-              "Calculate standard composition axes\n\
-- Execute: 'casm composition --calc'                                      \n\
-- If successful, standard composition axes will be printed to screen and  \n\
-  saved in the 'composition_axes.json' file.                              \n\
-- Then execute 'casm composition -s key' to select one of the listed axes.\n\
-- If none of the composition axes are satisfactory, edit the file         \n\
-  'composition_axes.json' to add your own custom composition axes to the  \n\
-  'custom_axes' JSON object.\n\n";
-
-    std::cout <<
-              "- See 'casm format' for a description and the location of  \n\
-   the 'composition_axes.json' file.\n\n";
-
-  }
-
   void composition_unselected() {
 
     std::cout << "NEXT STEPS:\n\n";
 
     std::cout <<
               "Select composition axes\n\
-- Execute: 'casm composition -d' to display composition axes.             \n\
-- Then execute 'casm composition -s N' to select one of the listed axes.  \n\
-- If none of the composition axes are satisfactory, edit the file         \n\
+- Execute: 'casm composition -d' to display standard composition axes.    \n\
+- Then execute 'casm composition -s <#>' to select one of the listed axes.\n\
+- If no standard composition axis is satisfactory, edit the file          \n\
   'composition_axes.json' to add your own custom composition axes to the  \n\
   'custom_axes' JSON object.\n\n";
 
@@ -367,12 +347,11 @@ Instructions for fitting ECI:                                          \n\n\
     std::cout << "\n#################################\n\n";
 
     std::cout << "CASM status:\n\n";
-    std::cout << "1) Project initialized: ";
 
     const fs::path &root = args.root;
 
     if(root.empty()) {
-      std::cout << " FALSE\n\n";
+      std::cout << "1) Project initialized: FALSE\n\n";
 
       if(vm.count("next")) {
         std::cout << "\n#################################\n\n";
@@ -416,7 +395,7 @@ Instructions for fitting ECI:                                          \n\n\
     std::string eci = desc.eci;
 
 
-    std::cout << "TRUE\n";
+    std::cout << "1) Project initialized: TRUE\n\n";
     std::cout << "- Project name: " << primclex.name() << std::endl;
     std::cout << "- Project location: " << primclex.get_path().string() << std::endl;
 
@@ -441,25 +420,6 @@ Instructions for fitting ECI:                                          \n\n\
 
     std::cout << "2) Composition axes \n";
 
-    std::cout << "- Standard composition axes calculated: ";
-
-    if(!fs::is_regular_file(primclex.dir().composition_axes())) {
-      std::cout << "FALSE\n\n";
-
-      if(vm.count("next")) {
-        std::cout << "\n#################################\n\n";
-
-        standard_composition_uncalculated();
-      }
-      else {
-        std::cout << "For next steps, run 'casm status -n'\n\n";
-      }
-
-      return 0;
-    }
-
-    std::cout << "TRUE\n";
-
     std::cout << "- Composition axes selected: ";
 
     if(!primclex.has_composition_axes()) {