From 436c072a70543277f2d871c04fe6ba3a11798219 Mon Sep 17 00:00:00 2001 From: giannozz Date: Mon, 10 Sep 2012 06:04:36 +0000 Subject: [PATCH] Remove < and > character from input file section when writing pseudopotentials git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@9415 c92efa57-630b-4861-b058-cf58834340f0 --- Modules/cell_base.f90 | 6 ++---- Modules/write_upf_v2.f90 | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Modules/cell_base.f90 b/Modules/cell_base.f90 index e44220d26..b3f151548 100644 --- a/Modules/cell_base.f90 +++ b/Modules/cell_base.f90 @@ -69,10 +69,8 @@ INTEGER :: iforceh(3,3) = 1 ! if iforceh( i, j ) = 0 then h( i, j ) ! is not allowed to move - LOGICAL :: fix_volume = .FALSE. ! True if cell volume is kept fixed -! 2DSHAPE - LOGICAL :: fix_area = .FALSE. ! True for cell_dofree='2Dshape' to keep area constant -! 2DSHAPE + LOGICAL :: fix_volume = .FALSE.! True if cell volume is kept fixed + LOGICAL :: fix_area = .FALSE. ! True if area in xy plane is kept constant REAL(DP) :: wmass = 0.0_DP ! cell fictitious mass REAL(DP) :: press = 0.0_DP ! external pressure diff --git a/Modules/write_upf_v2.f90 b/Modules/write_upf_v2.f90 index 930b0af22..46495ed83 100644 --- a/Modules/write_upf_v2.f90 +++ b/Modules/write_upf_v2.f90 @@ -203,9 +203,9 @@ CONTAINS WRITE (u,'("")') REWIND (unit=u_input) 10 READ (u_input, '(A)',end=20,err=25) line - WRITE (u, '(A)') TRIM(line) + WRITE (u, '(A)') TRIM(CHECK(line)) GO TO 10 -25 CALL infomsg('write_upf_v2::write_inputfile', 'reading input data') +25 CALL infomsg('write_upf_v2::write_inputfile', 'problem writing input data') 20 WRITE (u,'("")') ELSE CALL infomsg('write_upf_v2::write_inputfile', 'input file not open')