From aa48b24f0d087008c3470f00bcf178b84561f9d4 Mon Sep 17 00:00:00 2001
From: Anthony Scemama <scemama@irsamc.ups-tlse.fr>
Date: Fri, 28 Dec 2018 15:06:27 +0100
Subject: [PATCH] Moved qp_plugins

---
 docs/source/programmers_guide/plugins.rst |  3 +++
 scripts/{module => }/qp_plugins           |  4 ++++
 src/hartree_fock/scf_old.irp.f            |  3 +--
 src/scf_utils/roothaan_hall_scf.irp.f     | 11 +++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 rename scripts/{module => }/qp_plugins (98%)

diff --git a/docs/source/programmers_guide/plugins.rst b/docs/source/programmers_guide/plugins.rst
index fa00bd24..5ad9171a 100644
--- a/docs/source/programmers_guide/plugins.rst
+++ b/docs/source/programmers_guide/plugins.rst
@@ -6,6 +6,9 @@ Developing plugins
 Creating a repository of plugins
 --------------------------------
 
+The purpose of :file:`$QP_ROOT/plugins` is to contain local copies of
+external repositories of plugins.
+
 Create a repository, for example :file:`qp_plugins_user`, hosted somewhere
 (GitLab, GitHub, etc...), and clone the repository in the
 :file:`$QP_ROOT/plugins` directory.
diff --git a/scripts/module/qp_plugins b/scripts/qp_plugins
similarity index 98%
rename from scripts/module/qp_plugins
rename to scripts/qp_plugins
index f69e5ade..19a3f46f 100755
--- a/scripts/module/qp_plugins
+++ b/scripts/qp_plugins
@@ -85,6 +85,8 @@ def save_new_module(path, l_child):
 """)
 
 def main(arguments):
+    arguments["<name>"] = [ os.path.normpath(name) for name in arguments["<name>"] ]
+
     if arguments["list"]:
         if arguments["-q"]:
             l_result = [ f for f in listdir(QP_PLUGINS) if f not in [ ".gitignore", "local" ] ]
@@ -218,6 +220,8 @@ def main(arguments):
         l_name = [ normalize_case[name.lower()] for name in arguments["<name>"] ]
 
         for name in l_name:
+
+            print name
             if name in d_local:
                 print "{0} Is already installed".format(name)
 
diff --git a/src/hartree_fock/scf_old.irp.f b/src/hartree_fock/scf_old.irp.f
index 852fa128..c6f69191 100644
--- a/src/hartree_fock/scf_old.irp.f
+++ b/src/hartree_fock/scf_old.irp.f
@@ -53,8 +53,7 @@ subroutine run
 
 ! Choose SCF algorithm
 
-  call damping_SCF   ! Deprecated routine
-!  call Roothaan_Hall_SCF
+  call damping_SCF
   
 end
 
diff --git a/src/scf_utils/roothaan_hall_scf.irp.f b/src/scf_utils/roothaan_hall_scf.irp.f
index d3549fe7..f3f252d8 100644
--- a/src/scf_utils/roothaan_hall_scf.irp.f
+++ b/src/scf_utils/roothaan_hall_scf.irp.f
@@ -48,6 +48,9 @@ END_DOC
 ! Increment cycle number
 
     iteration_SCF += 1
+    if(no_oa_or_av_opt)then
+     call initialize_mo_coef_begin_iteration
+    endif
 
 ! Current size of the DIIS space
 
@@ -79,6 +82,10 @@ END_DOC
     endif
 
     MO_coef = eigenvectors_Fock_matrix_MO
+    if(no_oa_or_av_opt)then
+     call reorder_active_orb
+     call initialize_mo_coef_begin_iteration
+    endif
 
     TOUCH MO_coef
 
@@ -105,6 +112,10 @@ END_DOC
       TOUCH mo_coef
       level_shift = level_shift * 2.0d0
       mo_coef(1:ao_num,1:mo_tot_num) = eigenvectors_Fock_matrix_MO(1:ao_num,1:mo_tot_num)
+      if(no_oa_or_av_opt)then
+        call reorder_active_orb
+        call initialize_mo_coef_begin_iteration
+      endif
       TOUCH mo_coef level_shift
       Delta_Energy_SCF = SCF_energy - energy_SCF_previous
       energy_SCF = SCF_energy