From feabca978a319b2c1284e0c9f0c98e9f0544d37b Mon Sep 17 00:00:00 2001
From: kokalj <kokalj@c92efa57-630b-4861-b058-cf58834340f0>
Date: Mon, 5 May 2008 14:41:54 +0000
Subject: [PATCH] updating ...

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@4862 c92efa57-630b-4861-b058-cf58834340f0
---
 Doc/INPUT_LD1.def | 32 ++++++++++++++++++++------------
 Doc/INPUT_PH.def  | 18 +-----------------
 Doc/INPUT_PW.def  |  7 ++-----
 Doc/Makefile      |  4 +++-
 4 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/Doc/INPUT_LD1.def b/Doc/INPUT_LD1.def
index 1653eda8d..9b2989b58 100644
--- a/Doc/INPUT_LD1.def
+++ b/Doc/INPUT_LD1.def
@@ -332,10 +332,10 @@ input_description -distribution {Quantum Espresso} -program ld1.x {
 	    elsewhen -test "rel = 2" {
 		syntax {
 		    line {
-			var AE_nwf 
+			var nwf
 		    }	    
 		    table AE_wfs {
-			rows -start 1 -end AE_nwf {
+			rows -start 1 -end nwf {
 			    col nl
 			    col n
 			    col l
@@ -489,8 +489,7 @@ input_description -distribution {Quantum Espresso} -program ld1.x {
 	group {
 	    var which_augfun  -type CHARACTER { 
 		default { 
-		    'DEFAULT', which means: 'AE' for Vanderbilt-Ultrasoft 
-		    pseudopotentials and 'BESSEL' for PAW datasets.
+		    'AE' for Vanderbilt-Ultrasoft pseudopotentials and 'BESSEL' for PAW datasets.
 		}
 		info {                 
 		    If different from 'AE' the augmentation functions are pseudized
@@ -524,6 +523,15 @@ input_description -distribution {Quantum Espresso} -program ld1.x {
 	    }
 	}
 
+	var lsave_wfc -type LOGICAL {
+	    default { .false. if .not. lpaw, otherwise .true. }
+	    info {
+		Set it to .true. to save all-electron and pseudo wavefunctions
+		used in the pseudopotential generation in the UPF file. Only
+		works for UPFv2 format.
+	    }
+	}
+
 	var author  -type CHARACTER {
 	    info { Name of the author. }
             default { 'anonymous' }
@@ -604,21 +612,21 @@ input_description -distribution {Quantum Espresso} -program ld1.x {
 			    col jjs -type REAL { info { The total angular momentum (0.0 is allowed for complete shells). } }
 			}
 		    }
-		    message {
-			* if lloc>-1 the state with lls=lloc must be the last
-			
-			* if lloc>0 in the relativistic case, both states with jjs=lloc-1/2
-			  and jjs=lloc+1/2 must be the last two
-		    }
+		}
+		message {
+		    * if lloc>-1 the state with lls=lloc must be the last
+		    
+		    * if lloc>0 in the relativistic case, both states with jjs=lloc-1/2
+		      and jjs=lloc+1/2 must be the last two
 		}
 	    }	
 	    otherwise {
 		syntax {
 		    line {
-			var PP_nwfs
+			var nwfs 
 		    }
 		    table PP_wfs {
-			rows -start 1 -end PP_nwfs {
+			rows -start 1 -end nwfs {
 			    col nls
 			    col nns
 			    col lls
diff --git a/Doc/INPUT_PH.def b/Doc/INPUT_PH.def
index 311dd7342..5c6a83539 100644
--- a/Doc/INPUT_PH.def
+++ b/Doc/INPUT_PH.def
@@ -323,7 +323,7 @@ input_description -distribution {Quantum Espresso} -package PWscf -program ph.x
 	elsewhen -test "nat_todo was specified" {
 	    linecard {
 		list nat_todo_list -type INTEGER {
-		    format { atom(1)  atom(2)  ... atom(nat_todo) }
+		    format { atom(1)  atom(2) ... atom(nat_todo) }
 		    info {
 			Contains the list of indices of atoms used in the
 			calculation if "nat_todo" is specified.
@@ -333,19 +333,3 @@ input_description -distribution {Quantum Espresso} -package PWscf -program ph.x
 	}
     }
 }
-
-#
-#                   End of namelist "inputph"
-#
-#card 2   xq(3)   the phonon wavevector; must be equal to the one used
-#                 in the non-selfconsistent calculation (not read if 
-#                 ldisp is true).
-#
-#card 3   list(na), na = 1, nrapp
-#                 contains the list of indices of irreps used in the
-#                 calculation if  "nrapp" is specified
-#OR:
-#card 3   atomo(na), na = 1, nat_todo
-#                 contains the list of indices of atoms used in the
-#                 calculation if  "nat_todo" is specified
-#
diff --git a/Doc/INPUT_PW.def b/Doc/INPUT_PW.def
index 96a314244..4879443a5 100644
--- a/Doc/INPUT_PW.def
+++ b/Doc/INPUT_PW.def
@@ -1070,6 +1070,7 @@ input_description -distribution {Quantum Espresso} -package PWscf -program pw.x
 
 	var ortho_para -type INTEGER { 
 	    default { 0 }
+	    status { OBSOLESCENT: use command-line option " -ndiag XX" instead  }
 	    info {
 		meaningful for diagonalization='david' and parallel executables.
 		The number of processors to be used for the parallel subspace
@@ -1079,8 +1080,6 @@ input_description -distribution {Quantum Espresso} -package PWscf -program pw.x
 		so the actual number of processors used will be the largest
 		square number less or equal to ortho_para (if set) or to the 
 		total number of processors (if ortho_para is not set).
-                OBSOLESCENT: use command-line option " -ndiag XX" instead 
-
 	    }
 	}
 
@@ -1992,9 +1991,7 @@ input_description -distribution {Quantum Espresso} -package PWscf -program pw.x
 		}
 	    }
 	    elsewhen -test "gamma" {
-		syntax -flag {gamma} {
-		    label { bla }
-		}
+		syntax -flag {gamma} {}
 	    }
 	}
     }
diff --git a/Doc/Makefile b/Doc/Makefile
index 747fde89b..c938fd662 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -8,7 +8,9 @@ HTMLS = \
 	INPUT_PROJWFC.html \
 	INPUT_LD1.html \
 	INPUT_D3.html
+
 XMLS = $(HTMLS:.html=.xml)
+TXTS = $(HTMLS:.html=.txt)
 
 PDFS = constraints_HOWTO.pdf eps_man.pdf
 AUXS = $(PDFS:.pdf=.aux)
@@ -26,4 +28,4 @@ $(PDFS): %.pdf: %.tex
 	$(LATEX)  $<
 
 clean:
-	rm -f $(HTMLS) $(XMLS) $(PDFS) $(AUXS) $(LOGS) *~
\ No newline at end of file
+	rm -f $(HTMLS) $(TXTS) $(XMLS) $(PDFS) $(AUXS) $(LOGS) *~
\ No newline at end of file