Merge lp:~nickpapior/siesta/4.1-cml into lp:~albertog/siesta/4.1-cml

[Nick Papior]

Fixed some minor things and updated last references to FoX in makefile and NOTICE.txt

[Alberto Garcia (albertog)]

review: Approve

=== modified file 'NOTICE.txt'
--- NOTICE.txt	2016-05-27 15:20:03 +0000
+++ NOTICE.txt	2016-10-20 19:44:57 +0000
@@ -5,9 +5,6 @@
 different licensing terms, so see below. Other accompanying products
 without special requirements are not listed.
 
-This package includes a copy of the FoX software, which has its own
-license, copyright, and attribution terms. (See Src/FoX)
-
 This package includes a copy of the SiestaXC library, which has its own
 license, copyright, and attribution terms. (See Src/SiestaXC)
 
 
=== modified file 'Obj/DOCUMENTED-TEMPLATE.make'
--- Obj/DOCUMENTED-TEMPLATE.make	2016-10-04 09:22:48 +0000
+++ Obj/DOCUMENTED-TEMPLATE.make	2016-10-20 19:44:57 +0000
@@ -40,7 +40,7 @@
 
 # The FC_SERIAL symbol is useful in at least two cases:
 #   1. When the "MPI compiler environment" is so complex that it might
-#      trick the configure scripts (for FoX at least).
+#      trick the configure scripts.
 #   2. When executables compiled with a (parallel) FC are flagged by 
 #      the computer centers as "queuing-system-only". 
 # Most utilities are thus compiled with FC_SERIAL, which in practice
 
=== modified file 'Src/wxml/m_wxml_core.f90'
--- Src/wxml/m_wxml_core.f90	2009-08-11 10:19:43 +0000
+++ Src/wxml/m_wxml_core.f90	2016-10-20 19:44:57 +0000
@@ -285,7 +285,7 @@
 type(xmlf_t), intent(inout)   :: xf
 character(len=*), intent(in)  :: name
 
-character(len=100)  :: current
+character(len=2000)  :: current
 
 if (is_empty(xf%stack)) then
    call wxml_fatal(xf, "Out of elements to close")
@@ -312,7 +312,7 @@
 subroutine xml_Close(xf)
 type(xmlf_t), intent(inout)   :: xf
 
-character(len=200) :: name
+character(len=2000) :: name
 
 do
    if (is_empty(xf%stack)) exit
@@ -407,7 +407,7 @@
 type(xmlf_t), intent(inout)   :: xf
 
 integer  :: i, status, size, key_len, value_len
-character(len=200)  :: key, value
+character(len=2000)  :: key, value
 
 do i = 1, len(xf%dict)
    call get_key(xf%dict,i,key,key_len,status)
 
=== modified file 'Src/wxml/m_wxml_elstack.f90'
--- Src/wxml/m_wxml_elstack.f90	2009-08-06 15:05:23 +0000
+++ Src/wxml/m_wxml_elstack.f90	2016-10-20 19:44:57 +0000
@@ -15,7 +15,7 @@
 real, parameter, private            :: STACK_SIZE_MULT = 1.5
 
 type, private :: elstack_item
-  character(len=100) :: data
+  character(len=200) :: data
 end type
 
 type, public :: elstack_t
 
=== modified file 'Util/CMLComp/ccViz'
--- Util/CMLComp/ccViz	2009-06-24 14:49:27 +0000
+++ Util/CMLComp/ccViz	2016-10-20 19:44:57 +0000
@@ -3681,7 +3681,7 @@
 
     <!-- The parameter value *should* be in a scalar/array/matrix child.
          Sometimes it is in the value attribute though, so we check below
-         That option will be removed later on since FoX never does that. -->
+      -->
 
           <td class="paramvalue">
             <xsl:choose>
@@ -8736,7 +8736,7 @@
     <golem:seealso>gwtsystem</golem:seealso>
   </entry>
 
-  <entry id="atomArray" term="FoX Atom array parser">
+  <entry id="atomArray" term="Atom array parser">
     <annotation />
     <definition />
     <description />
 
=== modified file 'Util/SiestaSubroutine/ProtoNEB/Src/Makefile'
--- Util/SiestaSubroutine/ProtoNEB/Src/Makefile	2016-01-25 16:00:16 +0000
+++ Util/SiestaSubroutine/ProtoNEB/Src/Makefile	2016-10-20 19:44:57 +0000
@@ -38,9 +38,8 @@
 FDF=libfdf.a
 XMLPARSER=libxmlparser.a
 XC=libSiestaXC.a
-FoX_LIBS=`$(OBJ_DIR)/FoX/FoX-config --libs --wcml`
 ALL_LIBS= $(SIESTA_LIB) $(FDF) $(WXML) $(XMLPARSER) $(XC) \
-	$(MPI_INTERFACE) $(COMP_LIBS) $(FoX_LIBS) $(LIBS)
+	$(MPI_INTERFACE) $(COMP_LIBS) $(LIBS)
 #
 libs_collected:
 	(cd $(OBJ_DIR) ; \
 
=== modified file 'Util/SiestaSubroutine/SimpleTest/Src/Makefile'
--- Util/SiestaSubroutine/SimpleTest/Src/Makefile	2016-01-25 16:00:16 +0000
+++ Util/SiestaSubroutine/SimpleTest/Src/Makefile	2016-10-20 19:44:57 +0000
@@ -52,9 +52,8 @@
 FDF=libfdf.a
 XMLPARSER=libxmlparser.a
 XC=libSiestaXC.a
-FoX_LIBS=`$(OBJ_DIR)/FoX/FoX-config --libs --wcml`
 ALL_LIBS= $(SIESTA_LIB) $(FDF) $(WXML) $(XMLPARSER) $(XC) \
-	$(MPI_INTERFACE) $(COMP_LIBS) $(FoX_LIBS) $(LIBS)
+	$(MPI_INTERFACE) $(COMP_LIBS) $(LIBS)
 #
 libs_collected:
 	(cd $(OBJ_DIR) ; \
 
=== modified file 'version.info'
--- version.info	2016-10-19 07:39:07 +0000
+++ version.info	2016-10-20 19:44:57 +0000
@@ -1,1 +1,1 @@
-siesta-4.1--594
+siesta-4.1--594-np-cml-1