Move (and un-repo) dev org file

ABACUS.org

@@ -1,87 +0,0 @@
-#+TODO: TODO(t@) | DONE(d@)
-#+TODO: BUGREPORT(b@) BUGRISK(?@) CRITICAL(#@) | SOLVED(s@)
-#+TODO: CONCEPT(c@) UPDATED(u@) | REJECTED(r@)
-#+TODO: PICKEDUP(p@) | ABANDONED(k@) IMPLEMENTED(i@)
-
-
-* Templates
-  :PROPERTIES:
-  :CUSTOM_ID: Templates
-  :END:
-** Project
-*** dev-unit
-**** Description
-Type your description here
-**** Tasks
-***** Task1example (needs a TODO state)
-
-
-
-* Bugs 							   :ABACUS:Dev:Bugs:
-  :PROPERTIES:
-  :ARCHIVE:  %s_archive::* Bugs
-  :CUSTOM_ID: Bugs
-  :END:
-
-
-* Bugrisks						:ABACUS:Dev:Bugrisks:
-  :PROPERTIES:
-  :ARCHIVE:  %s_archive::* Bugrisks
-  :CUSTOM_ID: Bugrisks
-  :END:
-
-TIP: Search for the string BUGRISK in the codebase
-
-
-* Priority 					       :ABACUS:Dev:Priority:
-  :PROPERTIES:
-  :ARCHIVE:  %s_archive::* Priority
-  :CUSTOM_ID: Priority
-  :END:
-
-
-* Implementation queue				       :ABACUS:Dev:ImpQueue:
-  :PROPERTIES:
-  :ARCHIVE:  %s_archive::* Implementation queue
-  :CUSTOM_ID: ImplementationQueue
-  :END:
-
-** CONCEPT Unittests for integration functions
-   - State "CONCEPT"    from ""           [2018-02-20 Tue 07:01]
-Select a number of standard functions with known definite integrals:
-- polynomial
-- rational
-- exponential
-- sinusoidal
-
-Write a unittest aiming to reproduce the exact result, and displaying the accuracy.
-
-
-** CONCEPT Complex integration
-   - State "CONCEPT"    from ""           [2018-02-10 Sat 06:28]
-*** Complete implementation of Integral_result_CX
-**** Description
-The `Integral_result_CX Integrate_optimal_using_table` functions are not yet implemented.
-**** Tasks
-***** Implement `Integral_result_CX Integrate_optimal_using_table`
-
-
-
-
-** CONCEPT Rewrite ODSLF to use `State_Label`
-   - State "CONCEPT"    from ""           [2018-02-10 Sat 06:49]
-
-
-
-* Planning (short term)				     :ABACUS:Dev:PlanningST:
-  :PROPERTIES:
-  :ARCHIVE: %s_archive::* Planning (short term)
-  :CUSTOM_ID: PlanningShortTerm
-  :END:
-
-
-* Planning (long term)				     :ABACUS:Dev:PlanningLT:
-  :PROPERTIES:
-  :ARCHIVE: %s_archive::* Planning (long term)
-  :CUSTOM_ID: PlanningLongTerm
-  :END:

ABACUS.org_archive

@@ -1,26 +0,0 @@
-#    -*- mode: org -*-
-
-
-Archived entries from file /Users/jscaux/WORK/_ABACUS/ABACUS/ABACUS.org
-
-
-* Bugrisks
-
-** SOLVED Value of LiebLin ln_Density_ME
-   CLOSED: [2018-02-15 Thu 08:42]
-   - State "SOLVED"     from "BUGRISK"    [2018-02-15 Thu 08:42] \\
-     No problem. Product is always real.
-   - State "BUGRISK"    from ""           [2018-02-11 Sun 09:11]
-   :PROPERTIES:
-   :ARCHIVE_TIME: 2018-02-15 Thu 08:42
-   :ARCHIVE_FILE: ~/WORK/_ABACUS/ABACUS/ABACUS.org
-   :ARCHIVE_OLPATH: Bugrisks
-   :ARCHIVE_CATEGORY: ABACUS
-   :ARCHIVE_TODO: SOLVED
-   :ARCHIVE_ITAGS: ABACUS Dev Bugrisks
-   :END:
-
-File: ln_Density_ME.cc
-line 66
-
-Why real?

include/ABACUS_Scan.h

@@ -165,7 +165,7 @@ namespace ABACUS {
       return(*this);
     }
 
-      inline Scan_Info& operator+= (const Scan_Info& ref_info)
+    inline Scan_Info& operator+= (const Scan_Info& ref_info)
     {
       if (this != &ref_info) {
 	sumrule_obtained += ref_info.sumrule_obtained;

src/EXECS/LiebLin_DSF_tester.cc

@@ -78,7 +78,7 @@ int main(int argc, char* argv[])
 	cout << setprecision(16) << "estate.E - spstate.E = " << estate.E - spstate.E
 	     << "\tME = " << real(exp(ln_Psi_ME(spstate, estate))) << endl;
 
-      //cout << "Another try ? (1 == yes, 0 == no)" << endl;
+      cout << "Another try ? (1 == yes, 0 == no)" << endl;
       again = 1;
       cin >> again;
     } while (again != 0);

src/SCAN/General_Scan.cc

@@ -537,6 +537,7 @@ namespace ABACUS {
 
       Vect<Scan_Thread> threads_to_do;
       int il_to_do = paused_thread_data.lowest_il_with_nthreads_neq_0; // for resaving threads in case we're out of time
+      DP current_threshold = exp(-paused_thread_data.logscale * il_to_do);
       {
 #pragma omp critical
 	threads_to_do = paused_thread_data.Extract_Next_Scan_Threads();
@@ -568,6 +569,7 @@ namespace ABACUS {
 
 	  ScanState.Set_to_Label(threads_to_do[ithread].label, BaseScanState.Ix2);
 
+	  Tstate ScanStateBeingDescended = ScanState;
 
 	  // STARTING Descend_and_Compute block:
 	  int type_required = threads_to_do[ithread].type;
@@ -657,6 +659,16 @@ namespace ABACUS {
 		// 	     << "\t" << setw(16) << std::fixed << setprecision(8)
 		// 	     << data_value/exp(-paused_thread_data.logscale * il_to_do) << endl;
 
+		// Uncomment below if alerts for unexpectedly high data_value (as compared to threshold) are desired
+		// if (fabs(data_value) > 10.0* current_threshold) {
+		//   cout << "\nAlert: data_value > 10* threshold, " << data_value << "\t" << current_threshold << endl;
+		//   cout << " for state " << ScanState.label << " descendent of type " << type_required
+		//        << " of state " << ScanStateBeingDescended.label << endl;
+		//   cout << AveragingState.Ix2 << endl;
+		//   cout << ScanStateBeingDescended.Ix2 << endl;
+		//   cout << ScanState.Ix2 << endl;
+		// }
+
 	      } // if (ScanState.conv)
 	      else {
 		if (nconv0++ < 1000)
@@ -753,7 +765,7 @@ namespace ABACUS {
 
 	  } // for idesc
 
-	    // FINISHED Descend_and_Compute block
+	  // FINISHED Descend_and_Compute block
 
 
 	  scan_info_this_ithread.TT += omp_get_wtime() - start_time_this_ithread;