Skip to content

Commit ac2b533

Browse files
hiromatsuihiromatsui
committed
Change control label for isosurface data file format
1 parent 8502d7e commit ac2b533

File tree

27 files changed

+137
-92
lines changed

27 files changed

+137
-92
lines changed

‎doc/CALYPSO.pdf‎

320 Bytes
Binary file not shown.

‎doc/tex_src/controls_CALYPSO.tex‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,10 +1280,10 @@ \subsection{\tt cross\_section\_ctl}
12801280
\verb|[file_format]| \\
12811281
File format for cross section data is defined as character \verb|[file_format]|. The following formats are available;
12821282
\begin{description}
1283-
\item{\tt VTK: } VTK format
1284-
\item{\tt VTK\_gz: } Compressed VTK format (Available if zlib library is linked)
1285-
\item{\tt PSF: } Binary section data format
1286-
\item{\tt PSF\_gzip: } Compressed Binary section data format (Available if zlib library is linked)
1283+
\item{\tt VTK: } VTK format
1284+
\item{\tt VTK\_gz: } Compressed VTK format (Available if zlib library is linked)
1285+
\item{\tt PSF: } Binary section data format
1286+
\item{\tt PSF\_gz: } Compressed Binary section data format (Available if zlib library is linked)
12871287
\end{description}
12881288

12891289
\subsubsection{\tt surface\_define}
@@ -1462,14 +1462,14 @@ \subsection{\tt isosurface\_ctl}
14621462
\verb|[file_prefix]| \\
14631463
File prefix for isosurface data is defined as character \verb|[file_prefix]|.
14641464

1465-
\paragraph{\tt iso\_output\_type}
1466-
\label{href_t:iso_output_type}
1465+
\paragraph{{\tt isosurface\_file\_format} or {\tt iso\_output\_type}}
1466+
\label{href_t:isosurface_file_format}
14671467
File format for isosurface data is defined as character \verb|[file_format]|. The following formats are available;
14681468
\begin{description}
1469-
\item{\tt VTK: } VTK format
1470-
\item{\tt VTK\_gz: } Compressed VTK format (Available if zlib library is linked)
1471-
\item{\tt ISO: } Binary isosurface data format
1472-
\item{\tt ISO\_gzip: } Compressed Binary isosurface data format (Available if zlib library is linked)
1469+
\item{\tt VTK: } VTK format
1470+
\item{\tt VTK\_gz: } Compressed VTK format (Available if zlib library is linked)
1471+
\item{\tt ISO: } Binary isosurface data format
1472+
\item{\tt ISO\_gz: } Compressed Binary isosurface data format (Available if zlib library is linked)
14731473
\end{description}
14741474

14751475
\subsubsection{\tt isosurf\_define}
@@ -1614,27 +1614,27 @@ \subsection{\tt time\_averaging\_sph\_monitor}
16141614

16151615
\paragraph{\tt volume\_integrate\_prefix}
16161616
\label{href_t:volume_integrate_prefix}
1617-
\verb|[File\_Prefix]| \\
1618-
File prefix \verb|[File\_Prefix]| for volume integrated data is defined by text.
1617+
\verb|[File_Prefix]| \\
1618+
File prefix \verb|[File_Prefix]| for volume integrated data is defined by text.
16191619

16201620
\paragraph{\tt volume\_sph\_spectr\_prefix}
16211621
\label{href_t:volume_sph_spectr_prefix}
1622-
\verb|[File\_Prefix]| \\
1623-
File prefix \verb|[File\_Prefix]| for volume integrated spectrum data is defined by text.
1622+
\verb|[File_Prefix]| \\
1623+
File prefix \verb|[File_Prefix]| for volume integrated spectrum data is defined by text.
16241624

16251625
\paragraph{\tt sphere\_integrate\_prefix}
16261626
\label{href_t:sphere_integrate_prefix}
1627-
\verb|[File\_Prefix]| \\
1628-
File prefix \verb|[File\_Prefix]| for sphere integrated data is defined by text.
1627+
\verb|[File_Prefix]| \\
1628+
File prefix \verb|[File_Prefix]| for sphere integrated data is defined by text.
16291629

16301630
\paragraph{\tt layer\_sph\_spectr\_prefix}
16311631
\label{href_t:layer_sph_spectr_prefix}
1632-
\verb|[File\_Prefix]| \\
1633-
File prefix \verb|[File\_Prefix]| for layered spectrum data is defined by text.
1632+
\verb|[File_Prefix]| \\
1633+
File prefix \verb|[File_Prefix]| for layered spectrum data is defined by text.
16341634

16351635
\paragraph{\tt picked\_sph\_prefix}
16361636
\label{href_t:picked_sph_prefix}
1637-
\verb|[File\_Prefix]| \\
1638-
File prefix \verb|[File\_Prefix]| for picked up spectrum data is defined by text.
1637+
\verb|[File_Prefix]| \\
1638+
File prefix \verb|[File_Prefix]| for picked up spectrum data is defined by text.
16391639

16401640

‎doc/tex_src/programs_CALYPSO.tex‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,8 +1129,10 @@ \subsection{Isosurface data}
11291129
\begin{itemize}
11301130
\item \hyperref[href_t:isosurface_file_prefix]
11311131
{\tt isosurface\_file\_prefix [file\_prefix]}
1132-
\item \hyperref[href_t:iso_output_type]
1133-
{\tt iso\_output\_type [file\_format]}
1132+
\item \hyperref[href_t:isosurface_file_format]
1133+
{\tt isosurface\_file\_format [file\_format]}
1134+
\item \hyperref[href_t:isosurface_file_format]
1135+
{\tt iso\_output\_type [file\_format] {\color{red} (Deprecated)}}
11341136
%
11351137
\item Block \hyperref[href_t:isosurf_define]{\tt isosurf\_define}
11361138
\begin{itemize}
@@ -1154,7 +1156,7 @@ \subsection{Isosurface data}
11541156

11551157
\paragraph{Output data format of isosurface module}
11561158
\label{sec:PSF_data}
1157-
Isosurface data are written with VTK format and VTK data compressed by zlib. Field data also output by binary format and binary compressed by zlib. The list of data format and control flag for \verb|iso_output_type| are listed in Table \ref{table:ISO_data}. Like as sectioning data, program \hyperref[section:section_to_VTK]{\tt section\_to\_VTK} generates VTK file from the binary section data. The output data format is defined by \verb|iso_output_type|. Because the field data is written by using Cartesian coordinate $(x,y,z)$ system, $(x,y,z)$ components in ParaView corresponds to the spherical components $(r, \theta, \phi)$ or cylindrical componennts $(s,\phi, z)$ if sectioning data is writtein the spherical or cylindrical componnents. Consequently, ParaView can not draw griph or field lines for these spherical or cylindrical vectors.
1159+
Isosurface data are written with VTK format and VTK data compressed by zlib. Field data also output by binary format and binary compressed by zlib. The list of data format and control flag for \verb|isosurface_file_format| are listed in Table \ref{table:ISO_data}. Like as sectioning data, program \hyperref[section:section_to_VTK]{\tt section\_to\_VTK} generates VTK file from the binary section data. The output data format is defined by \verb|isosurface_file_format|. Because the field data is written by using Cartesian coordinate $(x,y,z)$ system, $(x,y,z)$ components in ParaView corresponds to the spherical components $(r, \theta, \phi)$ or cylindrical componennts $(s,\phi, z)$ if sectioning data is writtein the spherical or cylindrical componnents. Consequently, ParaView can not draw griph or field lines for these spherical or cylindrical vectors.
11581160
%
11591161
\begin{table}[htp]
11601162
\caption{Data format and an example of data size and output time for isosurface data}

‎examples/dynamo_benchmark/dynamobench_case_2/clean.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh
2+
#
3+
#
4+
echo 'Clean results'
5+
rm -f monitor/[A-Q,S-Z,a-q,s-z]*
6+
rm -f rst_6/[A-Q,S-Z,a-q,s-z]*
7+
rm -f field/[A-Q,S-Z,a-q,s-z]*
8+
rm -f sections/[A-Q,S-Z,a-q,s-z]*
9+
rm -f isosurfaces/[A-Q,S-Z,a-q,s-z]*
10+
rm -f *.dat *~ controls/*~

‎examples/dynamo_benchmark/dynamobench_case_2/control_MHD‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ begin MHD_control
1919
begin data_files_def
2020
debug_flag_ctl 'Off'
2121
!
22-
num_subdomain_ctl 4
22+
num_subdomain_ctl 6
2323
num_smp_ctl 4
2424
!
2525
restart_file_prefix 'rst_4/rst'
@@ -261,12 +261,12 @@ begin MHD_control
261261
begin time_step_ctl
262262
elapsed_time_ctl 80000.
263263
i_step_init_ctl 0
264-
i_step_finish_ctl 120000
264+
i_step_finish_ctl 300000
265265
!
266266
i_step_check_ctl 100
267-
i_step_rst_ctl 20000
268-
i_step_field_ctl 4000
269-
i_step_sectioning_ctl 500
267+
i_step_rst_ctl 50000
268+
i_step_field_ctl 10000
269+
i_step_sectioning_ctl 1000
270270
!
271271
dt_ctl 5.0e-5
272272
time_init_ctl 0.0e-8
@@ -294,7 +294,7 @@ begin MHD_control
294294
volume_pwr_spectr_prefix 'monitor/sph_pwr_volume'
295295
volume_pwr_spectr_format 'gzip'
296296
!
297-
nusselt_number_prefix 'Nusselt'
297+
nusselt_number_prefix 'monitor/Nusselt'
298298
nusselt_number_format 'gzip'
299299
!
300300
begin layered_spectrum_ctl
@@ -337,26 +337,26 @@ begin MHD_control
337337
!
338338
begin dynamo_benchmark_data_ctl
339339
dynamo_benchmark_file_prefix 'monitor/dynamobench'
340-
dynamo_benchmark_file_format 'gzip'
340+
dynamo_benchmark_file_format 'ASCII'
341341
nphi_mid_eq_ctl 512
342342
end dynamo_benchmark_data_ctl
343343
end sph_monitor_ctl
344344
!
345345
begin visual_control
346346
array cross_section_ctl
347-
file cross_section_ctl controls/control_psf_CMB
348-
file cross_section_ctl controls/control_psf_ICB
349-
file cross_section_ctl controls/control_psf_eq
350-
file cross_section_ctl controls/control_psf_z0.3
351-
file cross_section_ctl controls/control_psf_s0.55
347+
file cross_section_ctl 'controls/control_psf_CMB'
348+
file cross_section_ctl 'controls/control_psf_ICB'
349+
file cross_section_ctl 'controls/control_psf_eq'
350+
file cross_section_ctl 'controls/control_psf_z0.3'
351+
file cross_section_ctl 'controls/control_psf_s0.55'
352352
end array cross_section_ctl
353353
!
354354
array isosurface_ctl
355-
file isosurface_ctl controls/control_iso_temp
355+
file isosurface_ctl 'controls/control_iso_temp'
356356
end array isosurface_ctl
357357
end visual_control
358358
!
359359
begin dynamo vizs control
360-
file zonal mean section ctl controls/control_psf_zm
360+
file zonal mean section ctl 'controls/control_psf_zm'
361361
end dynamo vizs control
362362
end MHD_control

‎examples/dynamo_benchmark/dynamobench_case_2/controls/README‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
!-----------------------------------------------------------------------
2+
! Example using dynamo benchmark test Case 2
3+
! Please see Christensen et.al. (2001) for the model description
4+
!-----------------------------------------------------------------------
5+
!
6+
Field data for visualization are stored in this directory.

‎examples/dynamo_benchmark/dynamobench_case_2/controls/control_iso_temp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
!
22
begin isosurface_ctl
33
isosurface_file_prefix 'isosurfaces/temp0_7'
4-
iso_output_type vtk_gz
4+
isosurface_file_format vtk_gz
55
!
66
begin isosurf_define
77
isosurf_field temperature
@@ -17,9 +17,9 @@ begin isosurface_ctl
1717
result_type 'field'
1818
!
1919
array output_field
20-
output_field velocity vector end
21-
output_field velocity radial end
22-
output_field magnetic_field vector end
20+
output_field velocity vector
21+
output_field velocity radial
22+
output_field magnetic_field vector
2323
end array output_field
2424
end field_on_isosurf
2525
!

‎examples/dynamo_benchmark/dynamobench_case_2/isosurfaces/README‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
!-----------------------------------------------------------------------
2+
! Example using dynamo benchmark test Case 2
3+
! Please see Christensen et.al. (2001) for the model description
4+
!-----------------------------------------------------------------------
5+
!
6+
Field data for visualization are stored in this directory.

‎examples/dynamo_benchmark/dynamobench_case_2/sph_lm63r72c_ic_6/README‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
!-----------------------------------------------------------------------
2+
! Example using dynamo benchmark test Case 2
3+
! Please see Christensen et.al. (2001) for the model description
4+
!-----------------------------------------------------------------------
5+
!
6+
Field data for visualization are stored in this directory.

‎src/Fortran_libraries/VIZ_src/surfacing/bcast_section_control_data.f90‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ subroutine bcast_iso_control_data(iso_c)
138138
& cast_long(kchara), 0)
139139
!
140140
call bcast_ctl_type_c1(iso_c%iso_file_head_ctl)
141-
call bcast_ctl_type_c1(iso_c%iso_file_head_ctl)
142-
call bcast_ctl_type_c1(iso_c%iso_output_type_ctl)
141+
call bcast_ctl_type_c1(iso_c%iso_file_format_ctl)
143142
!
144143
call bcast_iso_define_control(iso_c%iso_def_c)
145144
call bcast_fld_on_psf_control(iso_c%fld_on_iso_c)

0 commit comments

Comments
 (0)