diff --git a/matlab/load_2D_data.m b/matlab/load_2D_data.m
index 8540abd5b6d2aeafd170527dba520f5617017faf..f03bbaa3a0e23e209ebe32cd137b3b2ef9aa76a2 100644
--- a/matlab/load_2D_data.m
+++ b/matlab/load_2D_data.m
@@ -1,8 +1,10 @@
function [ data, kr, kz, time, dt ] = load_2D_data( filename, variablename )
%LOAD_2D_DATA load a 2D variable stored in a hdf5 result file from HeLaZ
time = h5read(filename,'/data/var2d/time');
- kr = h5read(filename,['/data/var2d/',variablename,'/coordkr']);
- kz = h5read(filename,['/data/var2d/',variablename,'/coordkz']);
+ kr = h5read(filename,'/data/grid/coordkr');
+ kz = h5read(filename,'/data/grid/coordkz');
+% kr = h5read(filename,['/data/var2d/',variablename,'/coordkr']);
+% kz = h5read(filename,['/data/var2d/',variablename,'/coordkz']);
dt = h5readatt(filename,'/data/input','dt');
cstart= h5readatt(filename,'/data/input','start_iframe2d');
diff --git a/matlab/load_5D_data.m b/matlab/load_5D_data.m
index fc47285fe67e55d0629f418eafd3fec29f35c2c3..87edc9b9446f37900b4f016610902967822fd301 100644
--- a/matlab/load_5D_data.m
+++ b/matlab/load_5D_data.m
@@ -1,10 +1,14 @@
function [ data, p, j, kr, kz, time, dt ] = load_5D_data( filename, variablename )
%LOAD_5D_DATA load a 5D variable stored in a hdf5 result file from HeLaZ
time = h5read(filename,'/data/var5d/time');
- p = h5read(filename,['/data/var5d/',variablename,'/coordp']);
- j = h5read(filename,['/data/var5d/',variablename,'/coordj']);
- kr = h5read(filename,['/data/var5d/',variablename,'/coordkr']);
- kz = h5read(filename,['/data/var5d/',variablename,'/coordkz']);
+ p = h5read(filename,'/data/grid/coordp');
+ j = h5read(filename,'/data/grid/coordj');
+ kr = h5read(filename,'/data/grid/coordkr');
+ kz = h5read(filename,'/data/grid/coordkz');
+% p = h5read(filename,['/data/var5d/',variablename,'/coordp']);
+% j = h5read(filename,['/data/var5d/',variablename,'/coordj']);
+% kr = h5read(filename,['/data/var5d/',variablename,'/coordkr']);
+% kz = h5read(filename,['/data/var5d/',variablename,'/coordkz']);
dt = h5readatt(filename,'/data/input','dt');
cstart= h5readatt(filename,'/data/input','start_iframe5d');
diff --git a/src/diagnose.F90 b/src/diagnose.F90
index 0f36b94ade697792a0f6777d1ce4150d574a2a89..0d5aba46f3c6599f554b30de7e57affcb2c0231c 100644
--- a/src/diagnose.F90
+++ b/src/diagnose.F90
@@ -67,7 +67,7 @@ SUBROUTINE diagnose(kstep)
CALL creatd(fidres, 0, dims, "/profiler/Tc_comm", "cumulative communication time")
CALL creatd(fidres, 0, dims, "/profiler/Tc_poisson", "cumulative poisson computation time")
CALL creatd(fidres, 0, dims, "/profiler/Tc_Sapj", "cumulative Sapj computation time")
- CALL creatd(fidres, 0, dims, "/profiler/Tc_diag", "cumulative sym computation time")
+ CALL creatd(fidres, 0, dims, "/profiler/Tc_diag", "cumulative sym computation time")
CALL creatd(fidres, 0, dims, "/profiler/Tc_checkfield", "cumulative checkfield computation time")
CALL creatd(fidres, 0, dims, "/profiler/Tc_step", "cumulative total step computation time")
CALL creatd(fidres, 0, dims, "/profiler/time", "current simulation time")
@@ -99,17 +99,16 @@ SUBROUTINE diagnose(kstep)
rank = 0
CALL creatd(fidres, rank, dims, "/data/var2d/time", "Time t*c_s/R")
CALL creatd(fidres, rank, dims, "/data/var2d/cstep", "iteration number")
+ CALL creatg(fidres, "/data/grid", "Grid data")
+ CALL putarr(fidres, "/data/grid/coordkr", krarray_full(1:nkr),"kr*rho_s0", ionode=0)
+ CALL putarr(fidres, "/data/grid/coordkz", kzarray_full(1:nkz),"kz*rho_s0", ionode=0)
+ CALL putarr(fidres, "/data/grid/coordp" , parray_e_full(1:pmaxe+1), "p_e", ionode=0)
+ CALL putarr(fidres, "/data/grid/coordj" , jarray_e_full(1:jmaxe+1), "j_e", ionode=0)
IF (nsave_2d .GT. 0) THEN
CALL creatg(fidres, "/data/var2d/Ne00", "Ne00")
CALL creatg(fidres, "/data/var2d/Ni00", "Ni00")
CALL creatg(fidres, "/data/var2d/phi", "phi")
- CALL putarr(fidres, "/data/var2d/Ne00/coordkr", krarray_full(1:nkr), "kr*rho_s0", ionode=0)
- CALL putarr(fidres, "/data/var2d/Ni00/coordkr", krarray_full(1:nkr), "kr*rho_s0", ionode=0)
- CALL putarr(fidres, "/data/var2d/phi/coordkr", krarray_full(1:nkr), "kr*rho_s0", ionode=0)
- CALL putarr(fidres, "/data/var2d/Ne00/coordkz", kzarray_full(1:nkz), "kz*rho_s0", ionode=0)
- CALL putarr(fidres, "/data/var2d/Ni00/coordkz", kzarray_full(1:nkz), "kz*rho_s0", ionode=0)
- CALL putarr(fidres, "/data/var2d/phi/coordkz", kzarray_full(1:nkz), "kz*rho_s0", ionode=0)
END IF
! var5d group (moments)
@@ -121,22 +120,6 @@ SUBROUTINE diagnose(kstep)
CALL creatg(fidres, "/data/var5d/moments_i", "moments_i")
CALL creatg(fidres, "/data/var5d/Sepj", "Sepj")
CALL creatg(fidres, "/data/var5d/Sipj", "Sipj")
- CALL putarr(fidres, "/data/var5d/moments_e/coordp", parray_e_full(1:pmaxe+1), "p_e", ionode=0)
- CALL putarr(fidres, "/data/var5d/moments_e/coordj", jarray_e_full(1:jmaxe+1), "j_e", ionode=0)
- CALL putarr(fidres, "/data/var5d/moments_e/coordkr", krarray_full(1:nkr), "kr*rho_s0",ionode=0)
- CALL putarr(fidres, "/data/var5d/moments_e/coordkz", kzarray_full(1:nkz), "kz*rho_s0",ionode=0)
- CALL putarr(fidres, "/data/var5d/moments_i/coordp", parray_i_full(1:pmaxi+1), "p_i", ionode=0)
- CALL putarr(fidres, "/data/var5d/moments_i/coordj", jarray_i_full(1:jmaxi+1), "j_i", ionode=0)
- CALL putarr(fidres, "/data/var5d/moments_i/coordkr", krarray_full(1:nkr), "kr*rho_s0",ionode=0)
- CALL putarr(fidres, "/data/var5d/moments_i/coordkz", kzarray_full(1:nkz), "kz*rho_s0",ionode=0)
- CALL putarr(fidres, "/data/var5d/Sepj/coordp", parray_e_full(1:pmaxe+1), "p_e", ionode=0)
- CALL putarr(fidres, "/data/var5d/Sepj/coordj", jarray_e_full(1:jmaxe+1), "j_e", ionode=0)
- CALL putarr(fidres, "/data/var5d/Sepj/coordkr", krarray_full(1:nkr), "kr*rho_s0",ionode=0)
- CALL putarr(fidres, "/data/var5d/Sepj/coordkz", kzarray_full(1:nkz), "kz*rho_s0",ionode=0)
- CALL putarr(fidres, "/data/var5d/Sipj/coordp", parray_i_full(1:pmaxi+1), "p_i", ionode=0)
- CALL putarr(fidres, "/data/var5d/Sipj/coordj", jarray_i_full(1:jmaxi+1), "j_i", ionode=0)
- CALL putarr(fidres, "/data/var5d/Sipj/coordkr", krarray_full(1:nkr), "kr*rho_s0",ionode=0)
- CALL putarr(fidres, "/data/var5d/Sipj/coordkz", kzarray_full(1:nkz), "kz*rho_s0",ionode=0)
END IF
! Add input namelist variables as attributes of /data/input, defined in srcinfo.h