[cig-commits] [commit] Hiro_latest: Add round to read original spectrum data prefix to modify initial field (f8a4c59)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/calypso

On branch  : Hiro_latest
Link       : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce

>---------------------------------------------------------------

commit f8a4c59d7b653706d86f661cb1c12a226b20aaa8
Author: Hiroaki Matsui <h_kemono at mac.com>
Date:   Tue Oct 8 17:23:27 2013 -0700

    Add round to read original spectrum data prefix to modify initial field


>---------------------------------------------------------------

f8a4c59d7b653706d86f661cb1c12a226b20aaa8
 .../MHD_src/IO/m_ctl_data_noviz_MHD.f90            | 29 ++++++++++++----------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Fortran_libraries/MHD_src/IO/m_ctl_data_noviz_MHD.f90 b/src/Fortran_libraries/MHD_src/IO/m_ctl_data_noviz_MHD.f90
index 7c9d44e..c6563bf 100644
--- a/src/Fortran_libraries/MHD_src/IO/m_ctl_data_noviz_MHD.f90
+++ b/src/Fortran_libraries/MHD_src/IO/m_ctl_data_noviz_MHD.f90
@@ -44,8 +44,9 @@
 !
       private :: hd_model, hd_control, i_model, i_control
 !
-      private :: read_mhd_control_data
-      private :: read_mhd_model_data, read_mhd_control_ctl
+      private :: read_sph_noviz_mhd_ctl_data
+      private :: read_sph_noviz_mhd_model
+      private :: read_sph_noviz_mhd_control
 !
 ! ----------------------------------------------------------------------
 !
@@ -60,7 +61,7 @@
       open ( ctl_file_code, file = MHD_ctl_name, status='old' )
 !
       call load_ctl_label_and_line
-      call read_mhd_control_data
+      call read_sph_noviz_mhd_ctl_data
 !
       close(ctl_file_code)
 !
@@ -75,7 +76,7 @@
       open ( ctl_file_code, file = snap_ctl_name, status='old' )
 !
       call load_ctl_label_and_line
-      call read_mhd_control_data
+      call read_sph_noviz_mhd_ctl_data
 !
       close(ctl_file_code)
 !
@@ -84,12 +85,13 @@
 ! ----------------------------------------------------------------------
 ! ----------------------------------------------------------------------
 !
-      subroutine read_mhd_control_data
+      subroutine read_sph_noviz_mhd_ctl_data
 !
-      use m_parallel_var_dof
+      use calypso_mpi
       use m_ctl_data_4_platforms
       use m_ctl_data_node_monitor
       use m_ctl_data_4_pickup_sph
+      use m_ctl_data_4_org_data
 !
 !
       if(right_begin_flag(hd_mhd_ctl) .eq. 0) return
@@ -102,20 +104,21 @@
 !
 !
         call read_ctl_data_4_platform
+        call read_ctl_data_4_org_data
 !
-        call read_mhd_model_data
-        call read_mhd_control_ctl
+        call read_sph_noviz_mhd_model
+        call read_sph_noviz_mhd_control
 !
         call read_monitor_data_ctl
         call read_pickup_sph_ctl
       end do
 !
-      end subroutine read_mhd_control_data
+      end subroutine read_sph_noviz_mhd_ctl_data
 !
 !   --------------------------------------------------------------------
 !   --------------------------------------------------------------------
 !
-      subroutine read_mhd_model_data
+      subroutine read_sph_noviz_mhd_model
 !
       use m_ctl_data_4_fields
       use m_ctl_data_mhd_evolution
@@ -152,11 +155,11 @@
         call read_temp_def
       end do
 !
-      end subroutine read_mhd_model_data
+      end subroutine read_sph_noviz_mhd_model
 !
 !   --------------------------------------------------------------------
 !
-      subroutine read_mhd_control_ctl
+      subroutine read_sph_noviz_mhd_control
 !
       use m_ctl_data_4_time_steps
       use m_ctl_data_mhd_evo_scheme
@@ -177,7 +180,7 @@
         call read_time_loop_ctl
       end do
 !
-      end subroutine read_mhd_control_ctl
+      end subroutine read_sph_noviz_mhd_control
 !
 !   --------------------------------------------------------------------
 !