From e81300ae5b388f74b1604170e434de8326819815 Mon Sep 17 00:00:00 2001 From: ajchcoelho Date: Thu, 14 Nov 2024 11:10:37 +0100 Subject: [PATCH] THRIFT: Improve prints to command line --- PENTA/Sources/penta_interface_mod.f90 | 4 ++-- THRIFT/Sources/thrift_dkes.f90 | 6 +++--- THRIFT/Sources/thrift_penta.f90 | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/PENTA/Sources/penta_interface_mod.f90 b/PENTA/Sources/penta_interface_mod.f90 index de4d88a0..27182099 100644 --- a/PENTA/Sources/penta_interface_mod.f90 +++ b/PENTA/Sources/penta_interface_mod.f90 @@ -861,8 +861,8 @@ SUBROUTINE penta_run_2_efield Else Er_test_vals(min_ind) = Er_test_vals(min_ind + 1)/2._rknd EndIf - Write(*,'(a,i4,a,f10.3)') 'Cannot use Er=0 with log_interp, using Er(', & - min_ind, ') = ', Er_test_vals(min_ind) + ! Write(*,'(a,i4,a,f10.3)') 'Cannot use Er=0 with log_interp, using Er(', & + ! min_ind, ') = ', Er_test_vals(min_ind) EndIf ! Loop over Er to get fluxes as a function of Er Do ie = 1,num_Er_test diff --git a/THRIFT/Sources/thrift_dkes.f90 b/THRIFT/Sources/thrift_dkes.f90 index f3fd0eda..a0c91b90 100644 --- a/THRIFT/Sources/thrift_dkes.f90 +++ b/THRIFT/Sources/thrift_dkes.f90 @@ -124,12 +124,12 @@ SUBROUTINE thrift_dkes(lscreen,iflag) DO k = mystart,myend ! Setup input arg1(1) = TRIM(proc_string) - WRITE(arg1(2),'(i3)') ik_dkes(k) + WRITE(arg1(2),'(i4)') ik_dkes(k) WRITE(arg1(3),'(e20.10)') nuarr_dkes(k) WRITE(arg1(4),'(e20.10)') Earr_dkes(k) !dkes_efield arg1(5) = 'F' IF (lscreen .and. lfirst_pass) arg1(5) = 'T' - WRITE(temp_str,'(i3.3)') k + WRITE(temp_str,'(i4.4)') k arg1(6) = '_k' // TRIM(temp_str) ier_phi = 0 ! We don't read the boozmn or wout file we've done that already CALL dkes_input_prepare_old(arg1,6,dkes_input_file,ier_phi) @@ -265,7 +265,7 @@ SUBROUTINE thrift_dkes(lscreen,iflag) IF(lscreen) WRITE(*, '(I0, A, I0, A, I0, A)') k, ' in [', mystart, ',', myend, '] completed' END DO CALL second0(etime) - PRINT *, 'I took ', etime-stime,'s.' + WRITE(*, '(A, I0, A, F8.2, A, I0, A)') 'Processor ', myworkid, ' took ', etime-stime,'s to compute ', myend-mystart+1, ' DKES coefficients.' !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!! Parallel Work block Done !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/THRIFT/Sources/thrift_penta.f90 b/THRIFT/Sources/thrift_penta.f90 index 3c1cb4a9..4eeb1866 100644 --- a/THRIFT/Sources/thrift_penta.f90 +++ b/THRIFT/Sources/thrift_penta.f90 @@ -42,7 +42,7 @@ SUBROUTINE thrift_penta(lscreen,iflag) !----------------------------------------------------------------------- IF (iflag < 0) RETURN IF (lscreen) WRITE(6,'(a)') ' -------------------- NEOCLASSICAL BOOTSTRAP USING PENTA -------------------' - IF (lscreen) WRITE(6,'(A)') " /"," Er root(s) (V/cm)" + IF (lscreen) Write(*,*) " /"," Er root(s) (V/cm)" IF (lvmec) THEN ierr_mpi = 0 @@ -174,6 +174,7 @@ SUBROUTINE thrift_penta(lscreen,iflag) ELSE CALL MPI_REDUCE(JBS_PENTA,JBS_PENTA,ns_dkes,MPI_DOUBLE_PRECISION,MPI_SUM,master,MPI_COMM_MYWORLD,ierr_mpi) CALL MPI_REDUCE(etapar_PENTA,etapar_PENTA,ns_dkes,MPI_DOUBLE_PRECISION,MPI_SUM,master,MPI_COMM_MYWORLD,ierr_mpi) + CALL FLUSH(6) DEALLOCATE(rho_k,iota,phip,chip,btheta,bzeta,bsq,vp,EparB) DEALLOCATE(te,ne,dtedrho,dnedrho) DEALLOCATE(ni,ti,dtidrho,dnidrho)