Minimal CP changes: unused variables, insufficient format, added or displaced

__OPENMP in such a way that compilation with openmp enabled but without
-D__OPENMP doesn't yield a compilation error (for testing purposes)


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

CPV/cg_sub.f90

@@ -15,7 +15,7 @@
       use kinds, only: dp
       use control_flags, only: iprint, thdyn, tpre, iprsta, &
             tfor, taurdr, tprnfor
-      use control_flags, only: ndr, ndw, nbeg, nomore, tsde, tortho, tnosee, &
+      use control_flags, only: nbeg, nomore, tsde, tortho, tnosee, &
             tnosep, trane, tranp, tsdp, tcp, tcap, ampre, amprp, tnoseh
 
       use core, only: nlcc_any

CPV/cprsub.f90

@@ -57,7 +57,7 @@ subroutine formf( tfirst, eself )
      WRITE( stdout, 1200 ) eself
   endif
   !
-  1200 format(/,3x,'formf: eself=',f10.5)
+  1200 format(/,3x,'formf: eself=',f12.5)
   !
   IF( tpstab ) THEN
      !

CPV/nl_base.f90

@@ -1036,9 +1036,9 @@ subroutine nlfq( c, eigr, bec, becdr, fion )
   !
   DO k = 1, 3
 
+#ifdef __OPENMP
 !$omp parallel default(shared), &
 !$omp private(tmpbec,tmpdr,isa,is,ia,iss,nss,istart,ir,nr,ioff,iv,jv,inl,temp,i,mytid,ntids)
-#ifdef __OPENMP
      mytid = omp_get_thread_num()  ! take the thread ID
      ntids = omp_get_num_threads() ! take the number of threads
 #endif
@@ -1107,7 +1107,9 @@ subroutine nlfq( c, eigr, bec, becdr, fion )
         END DO
      END DO
      deallocate ( tmpbec, tmpdr )
+#ifdef __OPENMP
 !$omp end parallel
+#endif
   END DO
   !
   CALL mp_sum( fion_loc, intra_image_comm )