Skip to content

Commit

Permalink
Fixed to change function definition from v3 to v4.
Browse files Browse the repository at this point in the history
  • Loading branch information
kskinoue0612 committed Oct 18, 2022
1 parent 392ab6a commit badfa53
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion source/04/03_05_gridgenerator_add_errorhandling.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ JMax にそれぞれ 10000 を指定してみてください。
if (imax * jmax > 100000 ) then
! 100000 より大きい格子は生成できない
call cg_iric_write_errorcode(fin, 1, ier)
cg_close_f(fin, ier)
cg_iric_close(fin, ier)
stop
endif
Expand Down
4 changes: 2 additions & 2 deletions source/05/03_01_01_example_string.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
integer:: ier
character(200):: sampleitem
call cg_iric_read_string_f("sampleitem", sampleitem, ier)
call cg_iric_read_string(fid, "sampleitem", sampleitem, ier)
.. code-block:: fortran
:caption: 文字列の条件を読み込むための処理の記述例 (境界条件)
Expand All @@ -35,4 +35,4 @@
integer:: ier
character(200):: sampleitem
call cg_iric_read_bc_string_f("inflow", 1, "sampleitem", sampleitem, ier)
call cg_iric_read_bc_string(fid, "inflow", 1, "sampleitem", sampleitem, ier)
4 changes: 2 additions & 2 deletions source/05/03_01_02_example_filename_read.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
integer:: ier
character(200):: flowdatafile
call cg_iric_read_string_f("flowdatafile", flowdatafile, ier)
call cg_iric_read_string(fid, "flowdatafile", flowdatafile, ier)
.. code-block:: fortran
Expand All @@ -37,4 +37,4 @@
integer:: ier
character(200):: flowdatafile
call cg_iric_read_bc_string_f("inflow", 1, "flowdatafile", flowdatafile, ier)
call cg_iric_read_bc_string(fid, "inflow", 1, "flowdatafile", flowdatafile, ier)
4 changes: 2 additions & 2 deletions source/05/03_01_03_example_filename_save.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
integer:: ier
character(200):: flowdatafile
call cg_iric_read_string_f("flowdatafile", flowdatafile, ier)
call cg_iric_read_string(fid, "flowdatafile", flowdatafile, ier)
.. code-block:: fortran
:caption: ファイル名 (書き込み用) の条件を読み込むための処理の記述例 (境界条件)
Expand All @@ -35,4 +35,4 @@
integer:: ier
character(200):: flowdatafile
call cg_iric_read_bc_string_f("inflow", 1, "flowdatafile", flowdatafile, ier)
call cg_iric_read_bc_string(fid, "inflow", 1, "flowdatafile", flowdatafile, ier)
4 changes: 2 additions & 2 deletions source/05/03_01_04_example_foldername.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
integer:: ier
character(200):: flowdatafolder
call cg_iric_read_string_f("flowdatafolder", flowdatafolder, ier)
call cg_iric_read_string(fid, "flowdatafolder", flowdatafolder, ier)
.. code-block:: fortran
Expand All @@ -36,4 +36,4 @@
integer:: ier
character(200):: flowdatafolder
call cg_iric_read_bc_string_f("inflow", 1, "flowdatafolder", flowdatafolder, ier)
call cg_iric_read_bc_string(fid, "inflow", 1, "flowdatafolder", flowdatafolder, ier)
4 changes: 2 additions & 2 deletions source/05/03_01_05_example_integer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
integer:: ier, numsteps
call cg_iric_read_integer_f("numsteps", numsteps, ier)
call cg_iric_read_integer(fid, "numsteps", numsteps, ier)
.. code-block:: fortran
:caption: 整数の条件を読み込むための処理の記述例 (境界条件)
Expand All @@ -33,4 +33,4 @@
integer:: ier, numsteps
call cg_iric_read_bc_integer_f("inflow", 1, "numsteps", numsteps, ier)
call cg_iric_read_bc_integer(fid, "inflow", 1, "numsteps", numsteps, ier)
4 changes: 2 additions & 2 deletions source/05/03_01_06_example_integer_select.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
integer:: ier, flowtype
call cg_iric_read_integer_f("flowtype", flowtype, ier)
call cg_iric_read_integer(fid, "flowtype", flowtype, ier)
.. code-block:: fortran
:caption: 整数 (選択式) の条件を読み込むための処理の記述例 (境界条件)
Expand All @@ -38,4 +38,4 @@
integer:: ier, flowtype
call cg_iric_read_bc_integer_f("inflow", 1, "flowtype", flowtype, ier)
call cg_iric_read_bc_integer(fid, "inflow", 1, "flowtype", flowtype, ier)
4 changes: 2 additions & 2 deletions source/05/03_01_07_example_real.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
integer:: ier
double precision:: g
call cg_iric_read_real_f("g", g, ier)
call cg_iric_read_real(fid, "g", g, ier)
.. code-block:: fortran
:caption: 実数の条件を読み込むための処理の記述例 (境界条件)
Expand All @@ -35,4 +35,4 @@
integer:: ier
double precision:: g
call cg_iric_read_bc_real_f("inflow", 1, "g", g, ier)
call cg_iric_read_bc_real(fid, "inflow", 1, "g", g, ier)
8 changes: 4 additions & 4 deletions source/05/03_01_08_example_func.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
double precision, dimension(:), allocatable:: discharge_time, discharge_value
! サイズを調べる
call cg_iric_read_functionalsize_f("discharge", discharge_size, ier)
call cg_iric_read_functionalsize(fid, "discharge", discharge_size, ier)
! メモリを確保
allocate(discharge_time(discharge_size))
allocate(discharge_value(discharge_size))
! 確保したメモリに値を読み込む
call cg_iric_read_functional_f("discharge", discharge_time, discharge_value, ier)
call cg_iric_read_functional(fid, "discharge", discharge_time, discharge_value, ier)
.. code-block:: fortran
Expand All @@ -48,9 +48,9 @@
double precision, dimension(:), allocatable:: discharge_time, discharge_value
! サイズを調べる
call cg_iric_read_bc_functionalsize_f("inflow", 1, "discharge", discharge_size, ier)
call cg_iric_read_bc_functionalsize(fid, "inflow", 1, "discharge", discharge_size, ier)
! メモリを確保
allocate(discharge_time(discharge_size))
allocate(discharge_value(discharge_size))
! 確保したメモリに値を読み込む
call cg_iric_read_bc_functional_f("inflow", 1, "discharge", discharge_time, discharge_value, ier)
call cg_iric_read_bc_functional(fid, "inflow", 1, "discharge", discharge_time, discharge_value, ier)
16 changes: 8 additions & 8 deletions source/05/03_01_09_example_func_multi.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
double precision, dimension(:), allocatable:: discharge_value, elevation_value
! サイズを調べる
call cg_iric_read_functionalsize_f("discharge", discharge_size, ier)
call cg_iric_read_functionalsize(fid, "discharge", discharge_size, ier)
! メモリを確保
allocate(time_value(discharge_size))
allocate(discharge_value(discharge_size), elevation_value(discharge_size))
! 確保したメモリに値を読み込む
call cg_iric_read_functionalwithname_f("discharge", "time", time_value)
call cg_iric_read_functionalwithname_f("discharge", "discharge", discharge_value)
call cg_iric_read_functionalwithname_f("discharge", "elevation", elevation_value)
call cg_iric_read_functionalwithname(fid, "discharge", "time", time_value)
call cg_iric_read_functionalwithname(fid, "discharge", "discharge", discharge_value)
call cg_iric_read_functionalwithname(fid, "discharge", "elevation", elevation_value)
.. code-block:: fortran
:caption: 関数型 (複数の値) の条件を読み込むための処理の記述例 (境界条件)
Expand All @@ -50,11 +50,11 @@
double precision, dimension(:), allocatable:: discharge_value, elevation_value
! サイズを調べる
call cg_iric_read_bc_functionalsize_f("discharge", discharge_size, ier)
call cg_iric_read_bc_functionalsize(fid, "discharge", discharge_size, ier)
! メモリを確保
allocate(time_value(discharge_size))
allocate(discharge_value(discharge_size), elevation_value(discharge_size))
! 確保したメモリに値を読み込む
call cg_iric_read_bc_functionalwithname_f("discharge", "time", time_value)
call cg_iric_read_bc_functionalwithname_f("discharge", "discharge", discharge_value)
call cg_iric_read_bc_functionalwithname_f("discharge", "elevation", elevation_value)
call cg_iric_read_bc_functionalwithname(fid, "discharge", "time", time_value)
call cg_iric_read_bc_functionalwithname(fid, "discharge", "discharge", discharge_value)
call cg_iric_read_bc_functionalwithname(fid, "discharge", "elevation", elevation_value)
8 changes: 4 additions & 4 deletions source/05/03_01_10_example_cgns.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ CGNSファイル内の計算結果は、 valueType に result_gridNodeReal な
integer:: ier
character(200):: cgnsName, resultName
call cg_iric_read_string_f("input_file", cgnsName, ier)
call cg_iric_read_string_f("result_to_read", resultName, ier)
call cg_iric_read_string(fid, "input_file", cgnsName, ier)
call cg_iric_read_string(fid, "result_to_read", resultName, ier)
.. code-block:: fortran
:caption: CGNSファイル名と計算結果の条件を読み込むための処理の記述例 (境界条件)
Expand All @@ -45,5 +45,5 @@ CGNSファイル内の計算結果は、 valueType に result_gridNodeReal な
integer:: ier
character(200):: cgnsName, resultName
call cg_iric_read_bc_string_f("inflow", 1, "input_file", cgnsName, ier)
call cg_iric_read_bc_string_f("inflow", 1, "result_to_read", resultName, ier)
call cg_iric_read_bc_string(fid, "inflow", 1, "input_file", cgnsName, ier)
call cg_iric_read_bc_string(fid, "inflow", 1, "result_to_read", resultName, ier)

0 comments on commit badfa53

Please sign in to comment.