From 290333e5f38531cfc2b79bc1e34dc71ff36616c7 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Fri, 3 Jun 2022 10:39:03 +0200
Subject: [PATCH] reduced terminal verbose
---
src/auxval.F90 | 10 ++--------
src/basic_mod.F90 | 14 +++++++-------
src/fourier_mod.F90 | 2 +-
src/parallel_mod.F90 | 1 -
wk/analysis_3D.m | 20 ++++++++++----------
5 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/src/auxval.F90 b/src/auxval.F90
index 7a9d9852..8ade4159 100644
--- a/src/auxval.F90
+++ b/src/auxval.F90
@@ -16,11 +16,11 @@ subroutine auxval
IF (my_id .EQ. 0) WRITE(*,*) '=== Set auxiliary values ==='
IF (LINEARITY .NE. 'linear') THEN
- write(*,*) 'FFTW3 y-grid distribution'
+ IF (my_id .EQ. 0) write(*,*) 'FFTW3 y-grid distribution'
CALL init_grid_distr_and_plans(Nx,Ny)
ELSE
CALL init_1Dgrid_distr
- write(*,*) 'Manual y-grid distribution'
+ IF (my_id .EQ. 0) write(*,*) 'Manual y-grid distribution'
ENDIF
! Init the grids
CALL set_pgrid ! parallel kin (MPI distributed)
@@ -86,11 +86,5 @@ subroutine auxval
write(*,*) 'Closure = 1 -> Maximal Nepj degree is min(Pmaxe,2*Jmaxe+1): De = ', dmaxi
write(*,*) 'Closure = 1 -> Maximal Nipj degree is min(Pmaxi,2*Jmaxi+1): Di = ', dmaxi
ENDIF
- DO ip = ips_i,ipe_i
- DO ij = ijs_i,ije_i
- IF((parray_i(ip)+2*jarray_i(ij) .LE. dmaxi) .AND. (rank_ky + rank_z .EQ. 0))&
- print*, '(',parray_i(ip),',',jarray_i(ij),')'
- ENDDO
- ENDDO
END SUBROUTINE auxval
diff --git a/src/basic_mod.F90 b/src/basic_mod.F90
index e86e0357..bc79d1b2 100644
--- a/src/basic_mod.F90
+++ b/src/basic_mod.F90
@@ -168,22 +168,22 @@ CONTAINS
hours = (time/3600./24. - days) * 24
mins = (time/3600. - days*24. - hours) * 60
secs = (time/60. - days*24.*60 - hours*60 - mins) * 60
- WRITE(*,*) 'CPU Time = ', days, '[day]', hours, '[h]', mins, '[min]', secs, '[s]'
- WRITE(*,*) '(',time,'[s])'
+ IF (my_id .EQ. 0) WRITE(*,*) 'CPU Time = ', days, '[day]', hours, '[h]', mins, '[min]', secs, '[s]'
+ IF (my_id .EQ. 0) WRITE(*,*) '(',time,'[s])'
ELSEIF ( hours .GT. 0 ) THEN !display h min s
mins = (time/3600. - hours) * 60
secs = (time/60. - hours*60 - mins) * 60
- WRITE(*,*) 'CPU Time = ', hours, '[h]', mins, '[min]', secs, '[s]'
- WRITE(*,*) '(',time,'[s])'
+ IF (my_id .EQ. 0) WRITE(*,*) 'CPU Time = ', hours, '[h]', mins, '[min]', secs, '[s]'
+ IF (my_id .EQ. 0) WRITE(*,*) '(',time,'[s])'
ELSEIF ( mins .GT. 0 ) THEN !display min s
secs = (time/60. - mins) * 60
- WRITE(*,*) 'CPU Time = ', mins, '[min]', secs, '[s]'
- WRITE(*,*) '(',time,'[s])'
+ IF (my_id .EQ. 0) WRITE(*,*) 'CPU Time = ', mins, '[min]', secs, '[s]'
+ IF (my_id .EQ. 0) WRITE(*,*) '(',time,'[s])'
ELSE ! display s
- WRITE(*,*) 'CPU Time = ', FLOOR(time), '[s]'
+ IF (my_id .EQ. 0) WRITE(*,*) 'CPU Time = ', FLOOR(time), '[s]'
ENDIF
END SUBROUTINE display_h_min_s
diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90
index cdc2fefa..9eec0d8c 100644
--- a/src/fourier_mod.F90
+++ b/src/fourier_mod.F90
@@ -68,7 +68,7 @@ MODULE fourier
planb = fftw_mpi_plan_dft_c2r_2D(NX_, NY_, cmpx_data_f, real_data_f, communicator, ior(FFTW_MEASURE, FFTW_MPI_TRANSPOSED_IN))
if ((.not. c_associated(planf)) .OR. (.not. c_associated(planb))) then
- write(*,*) "plan creation error!!"
+ IF (my_id .EQ. 0) write(*,*) "plan creation error!!"
stop
end if
diff --git a/src/parallel_mod.F90 b/src/parallel_mod.F90
index 3efe15f5..96d8c277 100644
--- a/src/parallel_mod.F90
+++ b/src/parallel_mod.F90
@@ -45,7 +45,6 @@ CONTAINS
DO i_=1,num_procs_z-1
dsp_zy(i_) =dsp_zy(i_-1) + rcv_zy(i_-1)
END DO
- print*, rcv_zy, dsp_zy
!!!!! PJZ gather variables
! IONS
diff --git a/wk/analysis_3D.m b/wk/analysis_3D.m
index 5b429ee4..7670b95f 100644
--- a/wk/analysis_3D.m
+++ b/wk/analysis_3D.m
@@ -10,7 +10,7 @@ system(['mkdir -p ',MISCDIR]);
CMD = ['rsync ', LOCALDIR,'outputs* ',MISCDIR]; disp(CMD);
system(CMD);
% Load outputs from jobnummin up to jobnummax
-JOBNUMMIN = 10; JOBNUMMAX = 11;
+JOBNUMMIN = 10; JOBNUMMAX = 20;
data = compile_results(MISCDIR,JOBNUMMIN,JOBNUMMAX); %Compile the results from first output found to JOBNUMMAX if existing
data.localdir = LOCALDIR;
@@ -40,7 +40,7 @@ end
if 0
%% MOVIES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Options
-options.INTERP = 0;
+options.INTERP = 1;
options.POLARPLOT = 0;
options.NAME = '\phi';
% options.NAME = 'N_i^{00}';
@@ -48,12 +48,12 @@ options.NAME = '\phi';
% options.NAME = 'n_i^{NZ}';
% options.NAME = '\Gamma_x';
% options.NAME = 'n_i';
-options.PLAN = 'yz';
+options.PLAN = 'xz';
% options.NAME = 'f_e';
% options.PLAN = 'sx';
options.COMP = 'avg';
% options.TIME = dat.Ts5D;
-options.TIME = 1250:0.1:1370;
+options.TIME = 1250:1:1500;
data.EPS = 0.1;
data.a = data.EPS * 2000;
create_film(data,options,'.gif')
@@ -65,17 +65,17 @@ if 0
options.INTERP = 0;
options.POLARPLOT = 0;
options.AXISEQUAL = 1;
-% options.NAME = '\phi';
+options.NAME = '\phi';
% options.NAME = 'n_i';
-options.NAME = 'N_i^{00}';
+% options.NAME = 'N_i^{00}';
% options.NAME = 'T_i';
% options.NAME = '\Gamma_x';
% options.NAME = 'k^2n_e';
-options.PLAN = 'yz';
+options.PLAN = 'kxky';
% options.NAME = 'f_i';
% options.PLAN = 'sx';
options.COMP = 'avg';
-options.TIME = [1300 1350];
+options.TIME = [1200 1300 1400 1500];
data.a = data.EPS * 2e3;
fig = photomaton(data,options);
save_figure(data,fig)
@@ -114,11 +114,11 @@ if 0
%% Hermite-Laguerre spectrum
% options.TIME = 'avg';
options.P2J = 1;
-options.ST = 1;
+options.ST = 0;
options.PLOT_TYPE = 'space-time';
options.NORMALIZED = 1;
options.JOBNUM = 0;
-options.TIME = [1100 1150];
+options.TIME = [1300 1500];
options.specie = 'i';
options.compz = 'avg';
fig = show_moments_spectrum(data,options);
--
GitLab