[cig-commits] [commit] master: Merge branch 'Hiro_latest' (6d403c0)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Apr 8 03:03:59 PDT 2014
Repository : ssh://geoshell/calypso
On branch : master
Link : https://github.com/geodynamics/calypso/compare/bf5dcaf71a4089a4c2f22940f4edea71b9abedd1...9730b061d69d156b271dfe841a55ae371b4e1c03
>---------------------------------------------------------------
commit 6d403c0306cf3277992126f93a61036a02fa3109
Merge: bbd7fed 0d81850
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Fri Mar 14 09:59:15 2014 -0700
Merge branch 'Hiro_latest'
>---------------------------------------------------------------
6d403c0306cf3277992126f93a61036a02fa3109
Makefile.in | 10 +-
configure | 35 ++
configure.in | 7 +
examples/README | 4 +
examples/assemble_sph/2domains/.DS_Store | Bin 0 -> 6148 bytes
examples/assemble_sph/2domains/README | 7 +
examples/assemble_sph/4domains/.DS_Store | Bin 0 -> 6148 bytes
examples/assemble_sph/4domains/README | 6 +
examples/assemble_sph/sph_lm31r48c_2/.DS_Store | Bin 0 -> 6148 bytes
examples/assemble_sph/sph_lm31r48c_2/README | 9 +
.../assemble_sph/sph_lm31r48c_2/control_sph_shell | 3 +-
examples/assemble_sph/sph_lm31r48c_4/.DS_Store | Bin 0 -> 6148 bytes
examples/assemble_sph/sph_lm31r48c_4/README | 9 +
.../assemble_sph/sph_lm31r48c_4/control_sph_shell | 3 +-
.../dynamo_benchmark/Compositional_case_1/README | 17 +-
.../Compositional_case_1/control_MHD | 5 +-
.../Compositional_case_1/control_sph_shell | 3 +-
.../Compositional_case_1/field/.DS_Store | Bin 0 -> 6148 bytes
.../Compositional_case_1/field/README | 8 +
.../Compositional_case_1/rst_4/README | 8 +
.../Compositional_case_1/sph_lm31r48c_4/.DS_Store | Bin 0 -> 6148 bytes
.../Compositional_case_1/sph_lm31r48c_4/README | 8 +
.../dynamo_benchmark/dynamobench_case_0/README | 8 +-
.../dynamobench_case_0/control_MHD | 38 +-
.../dynamobench_case_0/control_snapshot | 40 +-
.../dynamobench_case_0/control_sph_shell | 3 +-
.../dynamobench_case_0/field/.DS_Store | Bin 0 -> 6148 bytes
.../dynamobench_case_0/field/README | 6 +
.../dynamobench_case_0/rst_4/README | 6 +
.../dynamobench_case_0/sph_lm31r48c_4/.DS_Store | Bin 0 -> 6148 bytes
.../dynamobench_case_0/sph_lm31r48c_4/README | 6 +
.../dynamo_benchmark/dynamobench_case_1/README | 2 +-
.../dynamobench_case_1/control_MHD | 32 +-
.../dynamobench_case_1/control_snapshot | 29 +-
.../dynamobench_case_1/control_sph_shell | 3 +-
.../dynamobench_case_1/field/README | 6 +
.../dynamobench_case_1/rst_4/README | 6 +
.../dynamobench_case_1/sph_lm31r48c_4/README | 6 +
.../dynamo_benchmark/dynamobench_case_2/README | 6 +-
.../dynamobench_case_2/control_MHD | 19 +-
.../dynamobench_case_2/control_snapshot | 21 +-
.../dynamobench_case_2/control_sph_shell | 5 +-
.../dynamobench_case_2/field/README | 6 +
.../dynamobench_case_2/rst_4/README | 6 +
.../dynamobench_case_2/sph_lm31r48c_ic_4/.DS_Store | Bin 0 -> 6148 bytes
.../dynamobench_case_2/sph_lm31r48c_ic_4/README | 6 +
.../dynamo_benchmark/pseudo_vacuum/control_MHD | 21 +-
.../{control_MHD => control_snapshot} | 5 +-
.../pseudo_vacuum/control_sph_shell | 3 +-
.../dynamo_benchmark/pseudo_vacuum/field/.DS_Store | Bin 0 -> 6148 bytes
.../dynamo_benchmark/pseudo_vacuum/field/README | 6 +
.../dynamo_benchmark/pseudo_vacuum/rst_4/.DS_Store | Bin 0 -> 6148 bytes
.../dynamo_benchmark/pseudo_vacuum/rst_4/README | 6 +
.../pseudo_vacuum/sph_lm31r48c_4/.DS_Store | Bin 0 -> 6148 bytes
.../pseudo_vacuum/sph_lm31r48c_4/README | 6 +
.../pseudo_vacuum/sph_lm31r48c_4/control_sph_shell | 35 --
examples/heat_composition_source/.DS_Store | Bin 0 -> 6148 bytes
examples/heat_composition_source/README | 23 +
.../const_sph_initial_spectr.f90 | 98 ++-
.../control_MHD} | 157 +++--
.../control_sph_shell | 13 +-
examples/heat_composition_source/rst_1/.DS_Store | Bin 0 -> 6148 bytes
examples/heat_composition_source/rst_1/README | 5 +
.../sph_lm3r64c_1/.DS_Store | Bin 0 -> 6148 bytes
.../heat_composition_source/sph_lm3r64c_1/README | 5 +
examples/heterogineous_temp/.DS_Store | Bin 0 -> 6148 bytes
examples/heterogineous_temp/README | 25 +
examples/heterogineous_temp/bc_spectr.btx | 34 ++
.../control_MHD} | 169 +++---
.../control_sph_shell | 23 +-
examples/heterogineous_temp/rst_2/.DS_Store | Bin 0 -> 6148 bytes
examples/heterogineous_temp/rst_2/README | 5 +
.../heterogineous_temp/sph_lm4r64c_2/.DS_Store | Bin 0 -> 6148 bytes
examples/heterogineous_temp/sph_lm4r64c_2/README | 5 +
examples/spherical_shell/Chebyshev_points/README | 14 +
.../Chebyshev_points/control_sph_shell | 3 +-
.../Chebyshev_points/sph_lm31r48c_4/.DS_Store | Bin 0 -> 6148 bytes
.../Chebyshev_points/sph_lm31r48c_4/README | 5 +
.../sph_lm31r48c_4/control_sph_shell | 35 --
examples/spherical_shell/equidistance/.DS_Store | Bin 0 -> 6148 bytes
examples/spherical_shell/equidistance/README | 14 +
.../spherical_shell/equidistance/control_sph_shell | 3 +-
.../equidistance/sph_lm24r24e_1/.DS_Store | Bin 0 -> 6148 bytes
.../equidistance/sph_lm24r24e_1/README | 5 +
.../spherical_shell/explicitly_defined/.DS_Store | Bin 0 -> 6148 bytes
examples/spherical_shell/explicitly_defined/README | 14 +
.../explicitly_defined/control_sph_shell | 3 +-
.../explicitly_defined/sph_lm31r48c_2/.DS_Store | Bin 0 -> 6148 bytes
.../explicitly_defined/sph_lm31r48c_2/README | 5 +
examples/spherical_shell/with_inner_core/.DS_Store | Bin 0 -> 6148 bytes
examples/spherical_shell/with_inner_core/README | 15 +
.../with_inner_core/control_sph_shell | 13 +-
.../with_inner_core/sph_lm31r48c_6_ic/.DS_Store | Bin 0 -> 6148 bytes
.../with_inner_core/sph_lm31r48c_6_ic/README | 5 +
src/External_libs/Makefile | 30 +-
.../MHD_src/IO/check_read_bc_file.f90 | 30 +-
.../MHD_src/IO/init_sph_MHD_elapsed_label.f90 | 15 +-
.../MHD_src/IO/m_bc_data_list.f90 | 240 ++++----
.../MHD_src/IO/m_boundary_condition_IDs.f90 | 113 ++--
.../MHD_src/IO/m_ctl_data_composite_norm.f90 | 125 ++--
.../MHD_src/IO/m_ctl_data_mhd_evo_scheme.f90 | 49 +-
.../MHD_src/IO/m_ctl_data_mhd_forces.f90 | 8 +-
.../MHD_src/IO/m_ctl_data_noviz_MHD.f90 | 28 +-
.../MHD_src/IO/m_ctl_data_termal_norm.f90 | 114 ++--
.../MHD_src/IO/m_sph_boundary_input_data.f90 | 315 ++++++----
.../MHD_src/IO/m_surf_data_list.f90 | 240 ++++----
src/Fortran_libraries/MHD_src/IO/range_data_IO.f90 | 58 +-
.../MHD_src/IO/set_control_4_composition.f90 | 64 +-
.../MHD_src/IO/set_control_4_force.f90 | 8 +-
.../MHD_src/IO/set_control_4_magne.f90 | 92 ++-
.../MHD_src/IO/set_control_4_model.f90 | 14 +-
.../MHD_src/IO/set_control_4_normalize.f90 | 72 ++-
.../MHD_src/IO/set_control_4_press.f90 | 57 +-
.../MHD_src/IO/set_control_4_temp.f90 | 60 +-
.../MHD_src/IO/set_control_4_time_steps.f90 | 111 +---
.../MHD_src/IO/set_control_4_velo.f90 | 119 ++--
.../MHD_src/IO/set_node_group_types.f90 | 238 ++++++++
.../MHD_src/IO/set_surface_group_types.f90 | 252 +++++---
.../MHD_src/IO/sph_mhd_rms_IO.f90 | 3 +-
.../MHD_src/IO/sph_mhd_rst_IO_control.f90 | 2 +-
src/Fortran_libraries/MHD_src/Makefile | 15 +-
.../MHD_src/field_data/cal_max_indices.f90 | 42 +-
.../field_data/lead_pole_data_4_sph_mhd.f90 | 2 +-
.../MHD_src/field_data/node_monitor_IO.f90 | 4 +-
.../MHD_src/field_data/output_ucd_file_control.f90 | 51 +-
.../MHD_src/sph_MHD/FEM_analyzer_sph_MHD.f90 | 13 +-
.../MHD_src/sph_MHD/adjust_fixed_flux_sph.f90 | 165 ------
.../MHD_src/sph_MHD/cal_diff_adv_src_explicit.f90 | 331 +++++++++++
.../MHD_src/sph_MHD/cal_div_buoyancies_sph_MHD.f90 | 87 ++-
.../MHD_src/sph_MHD/cal_div_of_forces.f90 | 6 +-
.../MHD_src/sph_MHD/cal_explicit_terms.f90 | 145 ++---
.../MHD_src/sph_MHD/cal_fdm_coefs_4_boundaries.f90 | 338 +++++++++++
.../MHD_src/sph_MHD/cal_inner_core_rotation.f90 | 226 +++----
.../MHD_src/sph_MHD/cal_momentum_eq_explicit.f90 | 35 +-
.../MHD_src/sph_MHD/cal_nonlinear.f90 | 41 +-
.../MHD_src/sph_MHD/cal_nonlinear_sph_MHD.f90 | 41 +-
.../MHD_src/sph_MHD/cal_r_buoyancies_on_sph.f90 | 2 +-
.../MHD_src/sph_MHD/cal_rot_buoyancies_sph_MHD.f90 | 65 +-
.../MHD_src/sph_MHD/cal_sol_sph_MHD_crank.f90 | 81 ++-
.../MHD_src/sph_MHD/cal_sol_sph_fluid_crank.f90 | 173 +++---
.../MHD_src/sph_MHD/cal_sph_bc_fdm_matrix.f90 | 63 --
.../MHD_src/sph_MHD/cal_sph_exp_fixed_flux.f90 | 343 ++++++-----
.../MHD_src/sph_MHD/cal_sph_exp_fixed_scalar.f90 | 557 +++++++++--------
.../MHD_src/sph_MHD/cal_sph_exp_nod_cmb_ins.f90 | 167 +++---
.../MHD_src/sph_MHD/cal_sph_exp_nod_cmb_qvac.f90 | 135 +++--
.../MHD_src/sph_MHD/cal_sph_exp_nod_icb_ins.f90 | 167 +++---
.../MHD_src/sph_MHD/cal_sph_exp_nod_icb_qvac.f90 | 136 +++--
.../MHD_src/sph_MHD/cal_sph_exp_nod_none_bc.f90 | 232 ++++----
.../MHD_src/sph_MHD/cal_sph_exp_rotation.f90 | 4 -
.../MHD_src/sph_MHD/cal_sph_field_by_rotation.f90 | 45 +-
.../MHD_src/sph_MHD/cal_vorticity_terms_adams.f90 | 32 +-
.../MHD_src/sph_MHD/center_sph_matrices.f90 | 116 ++++
.../MHD_src/sph_MHD/check_dependency_for_MHD.f90 | 14 +-
.../MHD_src/sph_MHD/check_field_dependency.f90 | 4 +-
.../MHD_src/sph_MHD/const_coriolis_sph.f90 | 157 -----
.../MHD_src/sph_MHD/const_coriolis_sph_rlm.f90 | 118 ++++
.../MHD_src/sph_MHD/const_data_4_dynamobench.f90 | 12 +-
.../MHD_src/sph_MHD/const_r_mat_4_scalar_sph.f90 | 139 +++--
.../MHD_src/sph_MHD/const_r_mat_4_vector_sph.f90 | 198 +++++--
.../MHD_src/sph_MHD/const_radial_forces_on_bc.f90 | 25 +-
.../MHD_src/sph_MHD/const_radial_mat_4_sph.f90 | 3 +-
.../MHD_src/sph_MHD/const_sph_diffusion.f90 | 279 ++++-----
.../MHD_src/sph_MHD/const_sph_divergence.f90 | 96 +--
.../MHD_src/sph_MHD/const_sph_radial_grad.f90 | 272 +++------
.../MHD_src/sph_MHD/const_sph_rotation.f90 | 318 ++++------
.../MHD_src/sph_MHD/const_wz_coriolis_rtp.f90 | 4 +-
.../MHD_src/sph_MHD/construct_MHD_coefficient.f90 | 16 +-
.../MHD_src/sph_MHD/copy_MHD_4_sph_trans.f90 | 2 +
.../MHD_src/sph_MHD/copy_snap_4_sph_trans.f90 | 1 +
.../MHD_src/sph_MHD/global_field_4_dynamobench.f90 | 8 +-
.../MHD_src/sph_MHD/initial_magne_dbench_qvc.f90 | 5 +-
.../MHD_src/sph_MHD/initial_magne_dynamobench.f90 | 8 +-
.../MHD_src/sph_MHD/interact_coriolis_rlm.f90 | 173 ++++++
.../MHD_src/sph_MHD/lead_fields_4_sph_mhd.f90 | 12 +-
.../MHD_src/sph_MHD/m_addresses_trans_sph_MHD.f90 | 87 ++-
.../MHD_src/sph_MHD/m_addresses_trans_sph_snap.f90 | 71 ++-
.../MHD_src/sph_MHD/m_boundary_params_sph_MHD.f90 | 79 +++
.../MHD_src/sph_MHD/m_coef_fdm_fixed_CMB.f90 | 180 ------
.../MHD_src/sph_MHD/m_coef_fdm_fixed_ICB.f90 | 177 ------
.../MHD_src/sph_MHD/m_coef_fdm_free_CMB.f90 | 80 +--
.../MHD_src/sph_MHD/m_coef_fdm_free_ICB.f90 | 80 +--
.../MHD_src/sph_MHD/m_coef_fdm_to_center.f90 | 179 ++++++
.../MHD_src/sph_MHD/m_comm_tbl_sph_coriolis.f90 | 181 ------
.../MHD_src/sph_MHD/m_control_parameter.f90 | 14 +-
.../MHD_src/sph_MHD/m_control_params_sph_MHD.f90 | 204 -------
.../MHD_src/sph_MHD/m_coriolis_coefs_tri_sph.f90 | 66 +--
.../MHD_src/sph_MHD/m_coriolis_terms_rlm.f90 | 238 ++++++++
.../MHD_src/sph_MHD/m_field_4_dynamobench.f90 | 23 +-
.../MHD_src/sph_MHD/m_field_at_mid_equator.f90 | 4 +-
.../MHD_src/sph_MHD/m_field_on_circle.f90 | 10 +-
.../MHD_src/sph_MHD/m_gaunt_coriolis_rlm.f90 | 264 +++++++++
.../MHD_src/sph_MHD/m_initial_field_control.f90 | 129 +++-
.../MHD_src/sph_MHD/m_normalize_parameter.f90 | 59 +-
.../MHD_src/sph_MHD/m_physical_property.f90 | 5 +-
.../MHD_src/sph_MHD/m_radial_matrices_sph.f90 | 10 -
.../MHD_src/sph_MHD/material_property.f90 | 20 +-
.../MHD_src/sph_MHD/select_exp_magne_bc.f90 | 253 ++++++++
.../MHD_src/sph_MHD/select_exp_scalar_bc.f90 | 204 +++++++
.../MHD_src/sph_MHD/select_exp_velocity_bc.f90 | 314 ++++++++++
.../MHD_src/sph_MHD/set_bc_flag_sph_velo.f90 | 88 ++-
.../MHD_src/sph_MHD/set_bc_sph_mhd.f90 | 387 ++++--------
.../MHD_src/sph_MHD/set_bc_sph_scalars.f90 | 470 +++++++++++++++
.../MHD_src/sph_MHD/set_comm_tbl_sph_coriolis.f90 | 423 -------------
.../MHD_src/sph_MHD/set_control_sph_data_MHD.f90 | 64 +-
.../MHD_src/sph_MHD/set_control_sph_mhd.f90 | 4 +-
.../MHD_src/sph_MHD/set_coriolis_tri_sph.f90 | 332 -----------
.../MHD_src/sph_MHD/set_free_slip_sph_mat_bc.f90 | 115 ----
.../MHD_src/sph_MHD/set_initial_sph_dynamo.f90 | 16 +-
.../MHD_src/sph_MHD/set_non_slip_sph_mat_bc.f90 | 103 ----
.../MHD_src/sph_MHD/set_radial_mat_sph.f90 | 177 +++---
.../MHD_src/sph_MHD/set_reference_sph_mhd.f90 | 66 ++-
.../MHD_src/sph_MHD/set_scalar_boundary_sph.f90 | 197 +++---
.../MHD_src/sph_MHD/set_sph_exp_free_CMB.f90 | 176 +++---
.../MHD_src/sph_MHD/set_sph_exp_free_ICB.f90 | 172 +++---
.../MHD_src/sph_MHD/set_sph_exp_nod_center.f90 | 6 +-
.../MHD_src/sph_MHD/set_sph_exp_rigid_CMB.f90 | 171 +++---
.../MHD_src/sph_MHD/set_sph_exp_rigid_ICB.f90 | 209 ++++---
.../MHD_src/sph_MHD/set_sph_magne_mat_bc.f90 | 163 ++---
.../MHD_src/sph_MHD/set_sph_mom_mat_bc.f90 | 180 ------
.../MHD_src/sph_MHD/set_sph_restart_IO.f90 | 2 +-
.../MHD_src/sph_MHD/set_sph_scalar_mat_bc.f90 | 165 ++++--
.../MHD_src/sph_MHD/solver_sph_coriolis_sr.f90 | 300 ----------
.../MHD_src/sph_MHD/sph_MHD_circle_transform.f90 | 6 +-
.../MHD_src/sph_MHD/sph_trans_w_coriols.f90 | 221 +++++++
.../MHD_src/sph_MHD/sph_transforms_4_MHD.f90 | 125 ++--
.../MHD_src/sph_MHD/sum_coriolis_terms_rlm.f90 | 360 +++++++++++
.../MHD_src/sph_MHD/sum_div_coriolis_rj_sph.f90 | 262 --------
.../MHD_src/sph_MHD/sum_r_coriolis_tri_sph.f90 | 226 -------
.../MHD_src/sph_MHD/sum_rot_coriolis_rj_sph.f90 | 266 ---------
.../MHD_src/sph_MHD/t_boundary_params_sph_MHD.f90 | 266 +++++++++
.../MHD_src/sph_MHD/trans_sph_velo_4_coriolis.f90 | 78 ---
src/Fortran_libraries/Makefile | 23 +-
.../PARALLEL_src/COMM_src/calypso_SR.f90 | 243 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_2.f90 | 243 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_3.f90 | 243 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_6.f90 | 243 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_N.f90 | 273 +++++++++
.../{spherical_SR_int.f90 => calypso_SR_int.f90} | 101 ++--
.../PARALLEL_src/COMM_src/calypso_SR_rev.f90 | 242 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_rev_2.f90 | 242 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_rev_3.f90 | 242 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_rev_6.f90 | 242 ++++++++
.../PARALLEL_src/COMM_src/calypso_SR_rev_N.f90 | 269 +++++++++
...rical_SR_rev_int.f90 => calypso_SR_rev_int.f90} | 91 ++-
.../PARALLEL_src/COMM_src/calypso_mpi.f90 | 109 +++-
.../PARALLEL_src/COMM_src/hdf5_file_IO.F90 | 659 ++++++++++++---------
.../COMM_src/m_array_for_send_recv.f90 | 118 ++++
.../PARALLEL_src/COMM_src/m_merged_ucd_data.f90 | 130 ++--
.../PARALLEL_src/COMM_src/m_parallel_var_dof.f90 | 177 ------
.../PARALLEL_src/COMM_src/m_solver_SR.f90 | 189 +++---
.../PARALLEL_src/COMM_src/m_work_time.f90 | 57 +-
.../PARALLEL_src/COMM_src/merged_ucd_data_IO.f90 | 146 +++--
.../COMM_src/merged_udt_vtk_file_IO.f90 | 171 +++---
.../PARALLEL_src/COMM_src/merged_vtk_data_IO.f90 | 149 ++---
.../PARALLEL_src/COMM_src/nod_phys_send_recv.f90 | 2 +-
.../COMM_src/nodal_vector_send_recv.f90 | 31 +-
.../COMM_src/output_parallel_ucd_file.f90 | 77 +--
.../COMM_src/parallel_ucd_IO_select.F90 | 119 ++--
.../PARALLEL_src/COMM_src/select_calypso_SR.f90 | 477 +++++++++++++++
.../PARALLEL_src/COMM_src/select_spherical_SR.f90 | 456 --------------
.../COMM_src/set_ctl_parallel_platform.f90 | 14 +-
.../COMM_src/set_from_recv_buf_rev.f90 | 223 +++++++
.../COMM_src/set_from_recv_buf_rev_tri.f90 | 231 ++++++++
.../COMM_src/set_from_recv_buff_tri.f90 | 225 +++++++
.../PARALLEL_src/COMM_src/set_from_recv_buffer.f90 | 217 +++++++
.../PARALLEL_src/COMM_src/set_to_send_buf_tri.f90 | 264 +++++++++
.../PARALLEL_src/COMM_src/set_to_send_buffer.f90 | 251 ++++++++
.../PARALLEL_src/COMM_src/solver_SR.f90 | 68 +--
.../PARALLEL_src/COMM_src/solver_SR_3.f90 | 65 +-
.../PARALLEL_src/COMM_src/solver_SR_6.f90 | 33 +-
.../PARALLEL_src/COMM_src/solver_SR_N.f90 | 61 +-
.../PARALLEL_src/COMM_src/solver_SR_int.f90 | 35 +-
.../PARALLEL_src/COMM_src/spherical_SR.f90 | 168 ------
.../PARALLEL_src/COMM_src/spherical_SR_2.f90 | 170 ------
.../PARALLEL_src/COMM_src/spherical_SR_3.f90 | 172 ------
.../PARALLEL_src/COMM_src/spherical_SR_6.f90 | 177 ------
.../PARALLEL_src/COMM_src/spherical_SR_N.f90 | 188 ------
.../PARALLEL_src/COMM_src/spherical_SR_rev.f90 | 160 -----
.../PARALLEL_src/COMM_src/spherical_SR_rev_2.f90 | 162 -----
.../PARALLEL_src/COMM_src/spherical_SR_rev_3.f90 | 165 ------
.../PARALLEL_src/COMM_src/spherical_SR_rev_6.f90 | 173 ------
.../PARALLEL_src/COMM_src/spherical_SR_rev_N.f90 | 179 ------
src/Fortran_libraries/PARALLEL_src/Makefile | 15 +-
.../SPH_SHELL_src/cal_ave_4_rms_vector_sph.f90 | 50 +-
.../SPH_SHELL_src/cal_rms_by_sph_spectr.f90 | 95 +--
.../SPH_SHELL_src/cal_rms_fields_by_sph.f90 | 135 ++---
.../SPH_SHELL_src/cal_sph_exp_1st_diff.f90 | 2 -
.../SPH_SHELL_src/circle_transform_single.f90 | 3 +-
.../SPH_SHELL_src/clear_schmidt_trans.f90 | 129 ----
.../SPH_SHELL_src/copy_1st_nodal_4_sph_trans.f90 | 72 +--
.../SPH_SHELL_src/copy_all_spec_4_sph_trans.f90 | 8 +-
.../SPH_SHELL_src/copy_field_4_sph_trans.f90 | 120 ++--
.../SPH_SHELL_src/copy_pole_field_sph_trans.f90 | 110 ++--
.../SPH_SHELL_src/copy_spectr_4_sph_trans.f90 | 94 ++-
.../SPH_SHELL_src/copy_sph_field_4_sph_trans.f90 | 52 +-
.../SPH_SHELL_src/copy_xyz_field_4_sph_trans.f90 | 78 +--
.../SPH_SHELL_src/cvt_nod_fld_and_sph_fld.f90 | 7 +-
.../PARALLEL_src/SPH_SHELL_src/init_sph_trans.f90 | 6 +-
.../SPH_SHELL_src/legendre_bwd_trans_fdout.f90 | 147 +++++
.../SPH_SHELL_src/legendre_bwd_trans_krin.f90 | 146 ++---
.../SPH_SHELL_src/legendre_bwd_trans_lgloop.f90 | 151 +++++
.../SPH_SHELL_src/legendre_bwd_trans_org.f90 | 87 ++-
.../SPH_SHELL_src/legendre_bwd_trans_spin.f90 | 93 +--
.../SPH_SHELL_src/legendre_fwd_trans_fdout.f90 | 151 +++++
.../SPH_SHELL_src/legendre_fwd_trans_krin.f90 | 141 +++--
.../SPH_SHELL_src/legendre_fwd_trans_lgloop.f90 | 153 +++++
.../SPH_SHELL_src/legendre_fwd_trans_org.f90 | 136 ++---
.../SPH_SHELL_src/legendre_fwd_trans_spin.f90 | 104 ++--
.../SPH_SHELL_src/legendre_transform_fdout.f90 | 136 +++++
.../SPH_SHELL_src/legendre_transform_krin.f90 | 75 ++-
.../SPH_SHELL_src/legendre_transform_lgloop.f90 | 107 ++++
.../SPH_SHELL_src/legendre_transform_org.f90 | 56 +-
.../SPH_SHELL_src/legendre_transform_select.f90 | 223 +++++++
.../SPH_SHELL_src/legendre_transform_spin.f90 | 87 ++-
.../SPH_SHELL_src/m_work_4_sph_trans.f90 | 32 +-
.../SPH_SHELL_src/m_work_4_sph_trans_fdout.f90 | 130 ++++
.../SPH_SHELL_src/m_work_4_sph_trans_krin.f90 | 125 ++--
.../SPH_SHELL_src/m_work_4_sph_trans_spin.f90 | 128 ++--
.../SPH_SHELL_src/merge_polidal_toroidal_v.f90 | 145 +++--
.../SPH_SHELL_src/ordering_leg_trans_fdout.f90 | 369 ++++++++++++
.../SPH_SHELL_src/ordering_schmidt_trans_krin.f90 | 440 ++++++++------
.../SPH_SHELL_src/ordering_schmidt_trans_spin.f90 | 360 ++++++-----
.../SPH_SHELL_src/pickup_gauss_coefficients.f90 | 28 +-
.../SPH_SHELL_src/pickup_sph_coefs.f90 | 102 ++--
.../SPH_SHELL_src/pickup_sph_rms_spectr.f90 | 47 +-
.../SPH_SHELL_src/pickup_sph_spectr.f90 | 35 +-
.../SPH_SHELL_src/pole_sph_transform.f90 | 77 ++-
.../SPH_SHELL_src/r_interpolate_sph_data.f90 | 13 +-
.../SPH_SHELL_src/schmidt_b_trans_at_center.f90 | 6 +-
.../SPH_SHELL_src/schmidt_b_trans_at_pole.f90 | 51 +-
.../SPH_SHELL_src/select_fourier_transform.F90 | 45 +-
.../PARALLEL_src/SPH_SHELL_src/set_radius_func.f90 | 8 +-
.../SPH_SHELL_src/sph_trans_scalar.f90 | 152 ++---
.../SPH_SHELL_src/sph_trans_vector.f90 | 125 ++--
.../SPH_SHELL_src/sph_transform_each_fld.f90 | 12 +-
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs.f90 | 44 +-
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_2.f90 | 44 +-
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_3.f90 | 44 +-
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_6.f90 | 51 +-
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_N.f90 | 52 +-
.../SPH_SHELL_src/spherical_SRs_int.f90 | 49 +-
.../SPH_SHELL_src/sum_b_trans_at_pole.f90 | 148 +++--
.../SPH_SHELL_src/sum_sph_rms_data.f90 | 113 ++--
.../SERIAL_src/BASE/copy_between_two_fields.f90 | 104 +++-
.../SERIAL_src/BASE/cvt_nodal_and_sph_field.f90 | 33 +-
.../SERIAL_src/BASE/m_phys_labels.f90 | 2 +-
.../SERIAL_src/BASE/m_precision.f90 | 20 +-
.../SERIAL_src/BASE/m_t_step_parameter.f90 | 50 +-
.../SERIAL_src/BASE/t_group_data.f90 | 63 +-
.../SERIAL_src/FFT_wrapper/FFTW_wrapper.f90 | 417 ++++++++++---
.../SERIAL_src/FFT_wrapper/FFT_selector.F90 | 35 +-
.../SERIAL_src/FFT_wrapper/m_FFTW_wrapper.f90 | 168 ++++--
.../SERIAL_src/FFT_wrapper/t_FFTW_wrapper.f90 | 193 ++++--
.../SERIAL_src/FFT_wrapper/t_FFT_selector.F90 | 12 +-
.../SERIAL_src/IO/group_data_IO.f90 | 2 +-
.../SERIAL_src/IO/m_control_params_2nd_files.f90 | 2 +-
.../SERIAL_src/IO/m_ctl_data_4_2nd_data.f90 | 1 +
.../SERIAL_src/IO/m_ctl_data_4_org_data.f90 | 40 +-
.../SERIAL_src/IO/m_ctl_data_4_platforms.f90 | 19 +-
.../SERIAL_src/IO/m_ctl_data_4_sphere_model.f90 | 12 +-
.../SERIAL_src/IO/m_field_data_IO.f90 | 8 +
.../SERIAL_src/IO/m_field_file_format.f90 | 104 ++--
.../SERIAL_src/IO/m_file_format_switch.f90 | 33 +-
.../SERIAL_src/IO/m_pickup_sph_spectr_data.f90 | 39 +-
src/Fortran_libraries/SERIAL_src/IO/m_ucd_data.f90 | 225 -------
.../SERIAL_src/IO/set_and_cal_udt_data.f90 | 289 ++++++---
.../SERIAL_src/IO/set_control_platform_data.F90 | 19 -
.../SERIAL_src/IO/set_nodal_field_name.f90 | 5 +-
.../SERIAL_src/IO/set_parallel_file_name.f90 | 9 +-
.../SERIAL_src/IO/set_ucd_data.f90 | 108 ++++
.../SERIAL_src/IO/set_ucd_file_names.f90 | 123 ++--
.../SERIAL_src/IO/skip_comment_f.f90 | 94 ++-
.../SERIAL_src/IO/skip_gz_comment.f90 | 17 +-
src/Fortran_libraries/SERIAL_src/IO/t_ucd_data.f90 | 427 +++++++++++++
.../SERIAL_src/IO/ucd_IO_select.f90 | 145 +++++
.../SERIAL_src/IO/ucd_field_file_IO.f90 | 107 ++--
.../SERIAL_src/IO/udt_data_IO.f90 | 148 ++---
.../SERIAL_src/IO/udt_file_IO.f90 | 269 ++++++---
.../SERIAL_src/IO/vtk_data_IO.f90 | 395 ++++++------
.../SERIAL_src/IO/vtk_file_IO.f90 | 149 ++---
.../SERIAL_src/IO/write_ucd_to_vtk_file.f90 | 249 ++++++--
src/Fortran_libraries/SERIAL_src/Makefile | 15 +-
.../SPH_SPECTR_src/boundary_radius_func.f90 | 102 ----
...loidal_rotation.f90 => m_poloidal_rotation.f90} | 94 ++-
.../SPH_SPECTR_src/m_rms_4_sph_spectr.f90 | 53 +-
.../SPH_SPECTR_src/m_schmidt_poly_on_rtm.f90 | 2 +-
.../SPH_SPECTR_src/m_sph_spectr_data.f90 | 45 --
.../SPH_SPECTR_src/m_sph_trans_comm_table.f90 | 3 +-
.../SPH_SPECTR_src/m_spheric_parameter.f90 | 61 +-
.../SPH_SPECTR_src/output_sph_m_square_file.f90 | 36 +-
.../SPH_SPECTR_src/radial_int_for_sph_spec.f90 | 126 ++--
.../SPH_SPECTR_src/schmidt_poly_on_rtm_grid.f90 | 4 +
.../SPH_SPECTR_src/set_control_sph_data.f90 | 1 -
.../SPH_SPECTR_src/set_radius_4_sph_dynamo.f90 | 11 +-
.../SPH_SPECTR_src/set_radius_func_noequi.f90 | 112 ++--
.../SPH_SPECTR_src/set_special_sph_lm_flags.f90 | 69 ++-
.../SPH_SPECTR_src/t_spheric_parameter.f90 | 13 +-
.../SERIAL_src/spherical_harmonics/Makefile | 2 +-
.../spherical_harmonics/cal_gaunt_itgs.f90 | 130 ++--
.../SERIAL_src/spherical_harmonics/factorials.f90 | 24 +-
.../SERIAL_src/spherical_harmonics/legendre.f90 | 39 +-
.../m_integrals_4_sph_coriolis.f90 | 153 -----
.../spherical_harmonics/m_schmidt_polynomial.f90 | 51 +-
.../spherical_harmonics/normgi_by_fact.f90 | 290 +++++++++
.../spherical_harmonics/normgi_by_primes.f90 | 2 +-
.../SERIAL_src/spherical_harmonics/schmidt.f90 | 33 ++
.../spherical_harmonics/tri_sph_for_coriolis.f90 | 13 -
src/Fortran_libraries/SOLVER_src/Makefile | 15 +-
.../UTILS_src/MERGE/m_control_param_newsph.f90 | 2 +
.../UTILS_src/MERGE/merge_sph_step_spectr.f90 | 140 +++--
.../UTILS_src/MERGE/r_interpolate_marged_sph.f90 | 242 ++++++++
.../UTILS_src/MESH/const_mesh_info.f90 | 2 +-
.../UTILS_src/MESH/const_surface_data.f90 | 6 +-
.../UTILS_src/MESH/copy_communication_table.f90 | 4 -
.../UTILS_src/MESH/count_overlap.f90 | 35 +-
.../UTILS_src/MESH/m_element_hash.f90 | 11 +-
.../UTILS_src/MESH/m_near_element_id_4_node.f90 | 2 +-
.../UTILS_src/MESH/m_near_node_id_4_node.f90 | 4 +-
.../UTILS_src/MESH/m_next_nod_id_nod_w_hang.f90 | 2 +-
.../UTILS_src/MESH/m_next_node_id_4_node.f90 | 2 +-
.../UTILS_src/MESH/m_ucd_data.f90 | 181 ++++++
.../UTILS_src/MESH/set_edge_hash.f90 | 8 +-
.../UTILS_src/MESH/set_ucd_data.f90 | 169 ------
.../UTILS_src/MESH/t_geometry_data.f90 | 16 +
src/Fortran_libraries/UTILS_src/Makefile | 21 +-
.../spherical_grid/cal_sph_ele_addresses.f90 | 422 +++++++++++++
.../spherical_grid/cal_sph_ele_connects.f90 | 353 +++++++++++
.../spherical_grid/cal_sph_node_addresses.f90 | 397 +++++++++++++
.../const_global_sph_grids_modes.f90 | 50 +-
.../spherical_grid/const_sph_radial_grid.f90 | 2 +-
.../spherical_grid/m_2d_sph_trans_table.f90 | 13 +-
.../spherical_grid/m_sph_1d_global_index.f90 | 82 ++-
.../spherical_grid/m_sph_mesh_1d_connect.f90 | 5 +-
.../spherical_grid/ordering_sph_mesh_to_rtp.f90 | 2 +-
.../spherical_grid/set_comm_tbl_4_pole_mesh.f90 | 12 +-
.../spherical_grid/set_comm_tbl_4_sph_mesh.f90 | 4 +-
.../spherical_grid/set_ctl_gen_shell_eq.f90 | 54 +-
.../spherical_grid/set_ctl_gen_shell_grids.f90 | 186 +++---
.../spherical_grid/set_ele_group_global_sph.f90 | 12 +-
.../spherical_grid/set_export_sph_center_mesh.f90 | 10 +-
.../spherical_grid/set_import_sph_center_mesh.f90 | 6 +-
.../spherical_grid/set_indices_4_sph_tranform.f90 | 214 -------
.../spherical_grid/set_item_4_sph_groups.f90 | 20 +-
.../spherical_grid/set_node_group_global_sph.f90 | 18 +-
.../spherical_grid/set_sph_1d_global_index.f90 | 20 +-
.../UTILS_src/spherical_grid/set_sph_ele_group.f90 | 36 +-
.../spherical_grid/set_sph_grid_for_equator.f90 | 11 +-
.../UTILS_src/spherical_grid/set_sph_groups.f90 | 3 +-
.../spherical_grid/set_sph_local_element.f90 | 619 +------------------
.../spherical_grid/set_sph_local_node.f90 | 208 +------
.../spherical_grid/set_sph_node_group.f90 | 4 +-
.../spherical_grid/set_sph_surf_group.f90 | 22 +-
..._tranform.f90 => set_sph_tranform_ordering.f90} | 301 +++-------
.../spherical_grid/set_stack_4_sph_groups.f90 | 55 +-
.../spherical_grid/set_surf_group_global_sph.f90 | 12 +-
src/Makefile | 49 +-
src/confdb/check_gnu_make.m4 | 65 ++
src/module_dependency/make_module_dependency.f90 | 1 -
src/option_settings | 23 +-
src/programs/Makefile | 21 +-
src/programs/SPH_MHD/SPH_analyzer_MHD.f90 | 59 +-
src/programs/SPH_MHD/analyzer_sph_MHD.f90 | 14 +-
src/programs/SPH_MHD/control_MHD | 77 ++-
src/programs/SPH_MHD/main_sph_MHD.f90 | 6 +-
src/programs/data_utilities/INITIAL_FIELD/Makefile | 20 +-
.../INITIAL_FIELD/SPH_analyzer_add_initial.f90 | 131 ++++
.../INITIAL_FIELD/SPH_analyzer_const_initial.f90 | 131 ++--
.../INITIAL_FIELD/analyzer_sph_initial_fld.f90 | 77 ---
.../INITIAL_FIELD/const_sph_initial_spectr.f90 | 107 +++-
.../INITIAL_FIELD/main_sph_add_initial_fld.f90 | 27 +
.../INITIAL_FIELD/main_sph_initial_fld.f90 | 8 +-
src/programs/data_utilities/MERGE/Makefile | 15 +-
.../data_utilities/MERGE/assemble_newsph.f90 | 1 -
.../data_utilities/MERGE/control_assemble_sph | 8 +-
src/programs/data_utilities/Makefile | 21 +-
src/programs/data_utilities/SNAPSHOT_MHD/Makefile | 7 +-
.../SNAPSHOT_MHD/SPH_analyzer_d_bench.f90 | 49 +-
.../SNAPSHOT_MHD/SPH_analyzer_snap.f90 | 49 +-
.../SNAPSHOT_MHD/analyzer_noviz_sph_snap.f90 | 11 +-
.../SNAPSHOT_MHD/analyzer_noviz_sph_zm_snap.f90 | 39 +-
.../SNAPSHOT_MHD/analyzer_sph_dynamobench.f90 | 9 +-
.../data_utilities/SNAPSHOT_MHD/control_snapshot | 517 ----------------
.../SNAPSHOT_MHD/main_sph_dynamobench.f90 | 6 +-
.../SNAPSHOT_MHD/main_sph_snapshot_noviz.f90 | 6 +-
.../SNAPSHOT_MHD/main_sph_zm_snap_noviz.f90 | 29 +-
src/programs/mesh_utilities/CMakeLists.txt | 2 +-
src/programs/mesh_utilities/Makefile | 2 +
src/programs/mesh_utilities/analyzer_test_sph.f90 | 39 +-
.../mesh_utilities/cmp_trans_sph_indices.f90 | 12 +-
.../mesh_utilities/cmp_trans_sph_tests.f90 | 339 +++++++++++
.../mesh_utilities/generate_sph_grids_nosf.f90 | 11 +-
src/programs/mesh_utilities/main_test_sph.f90 | 13 +-
492 files changed, 26600 insertions(+), 18232 deletions(-)
diff --cc src/option_settings
index ab61274,41d81a1..8a2fbc5
--- a/src/option_settings
+++ b/src/option_settings
@@@ -5,11 -5,34 +5,10 @@@ Settings for Makefile
# Intel mac with gfortran-openmpi with self compiled FFTW3
# -------------------------------------------------------------------------------
#
- # ./configure --prefix='/Users/matsui/local' FCFLAGS='-O -Wall -g' \
- # PKG_CONFIG_PATH='/Users/matsui/local/lib/pkgconfig:/usr/local/lib/pkgconfig' \
- # --enable-fftw3 --with-hdf5='/Users/matsui/local/bin/h5pcc'
+ # setenv PKG_CONFIG_PATH /Users/matsui/local/lib/pkgconfig:/usr/lib/pkgconfig;
+ #./configure --prefix='/Users/matsui/local' CFLAGS='-O -Wall -g' FCFLAGS='-O -Wall -g' --enable-fftw3 --with-hdf5=/Users/matsui/local/bin/h5pcc
#
#
-# Makefile for geoynamo platform Calypso
-# Written by H. Matsui
-#
-SHELL = /bin/sh
-#
-# directories of Calypso
-#
-SRCDIR = /Users/matsui/src_release
-INSTDIR= /Users/matsui/local
-#
-MHDDIR = $(SRCDIR)/src
-MAKEDIR= $(SRCDIR)/work
-BUILDDIR= $(SRCDIR)/bin
-#
-# MPI settings
-#
-MPICHDIR =
-MPICHLIBDIR = $(MPICHDIR)/lib
-MPICHBINDIR = $(MPICHDIR)/bin
-MPICHINCDIR =
-MPILIBS =
-#
-[Kemo-MacBook-Pro:~/src_release] matsui% more Makefile
-#
# Makefile for geoynamo platform CALYPSO
# Written by H. Matsui
#
More information about the CIG-COMMITS
mailing list