Erroneous errors

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@2311 c92efa57-630b-4861-b058-cf58834340f0

pwtools/dynmat.f90

@@ -458,7 +458,7 @@ subroutine set_asr ( asr, axis, nat, tau, dyn, zeu )
   !
   if ( (asr.ne.'simple') .and. (asr.ne.'crystal') .and. (asr.ne.'one-dim') &
                          .and.(asr.ne.'zero-dim')) then
-     call errore('set_asr','reading asr',asr)
+     call errore('set_asr','invalid Acoustic Sum Rule:' // asr, 1)
   endif
   if(asr.eq.'crystal') n=3
   if(asr.eq.'one-dim') then

pwtools/matdyn.f90

@@ -689,8 +689,8 @@ SUBROUTINE set_asr (asr, nr1, nr2, nr3, frc, zeu, nat, ibrav, tau)
   ! (i.e. the rotation axis is (Ox) if axis='1', (Oy) if axis='2' and (Oz) if axis='3') 
   !
   if((asr.ne.'simple').and.(asr.ne.'crystal').and.(asr.ne.'one-dim') &
-       .and.(asr.ne.'zero-dim')) then
-              call errore('matdyn','reading asr',asr)
+                      .and.(asr.ne.'zero-dim')) then
+     call errore('matdyn','invalid Acoustic Sum Rule:' // asr, 1)
   endif
   if(asr.eq.'crystal') n=3
   if(asr.eq.'one-dim') then

pwtools/q2r.f90

@@ -541,8 +541,8 @@ subroutine set_zasr ( zasr, nr1,nr2,nr3, nat, ibrav, tau, zeu)
   ! and (Oz) if axis='3') 
   !
   if((zasr.ne.'simple').and.(zasr.ne.'crystal').and.(zasr.ne.'one-dim') &
-       .and.(zasr.ne.'zero-dim')) then
-              call errore('q2r','reading zasr',zasr)
+                       .and.(zasr.ne.'zero-dim')) then
+      call errore('q2r','invalid Acoustic Sum Rulei for Z*:' // zasr, 1)
   endif
   if(zasr.eq.'crystal') n=3
   if(zasr.eq.'one-dim') then