Skip to content

Commit 5f2d838

Browse files
hiromatsuihiromatsui
committed
Merge remote-tracking branch 'refs/remotes/origin/Ver.2.0_alpha' into Ver.2.0_alpha
2 parents 2a90c21 + 0001433 commit 5f2d838

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1973
-4448
lines changed

‎.github/workflows/linux_and_macos.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: build
2828
run: |
2929
sudo apt update
30-
sudo apt install pkg-config git gfortran libopenmpi-dev \
30+
sudo apt install pkg-config git libopenmpi-dev \
3131
zlib1g zlib1g-dev libblas-dev libfftw3-dev libhdf5-openmpi-dev
3232
3333
./configure \
@@ -42,21 +42,14 @@ jobs:
4242
4343
Run-on-Mac:
4444
name: test-compile on Mac
45-
runs-on: [macos-14]
45+
runs-on: [macos-15]
4646
steps:
4747
- uses: actions/checkout@v2
4848
- name: build
4949
run: |
50+
brew install gfortran open-mpi fftw hdf5-mpi
5051
brew info gfortran
5152
brew info open-mpi
52-
brew install gfortran
53-
54-
a=`which gfortran-14`; \
55-
b=`dirname $a`; \
56-
c=$b/gfortran; \
57-
ln -s $a $c
58-
59-
brew install open-mpi fftw hdf5-mpi
6053
6154
mpicc -v
6255
mpif90 -v

‎examples/spherical_shell/full_sphere/README‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
!-----------------------------------------------------------------------
2+
! Example to generate spherical harmonics index data files
3+
!-----------------------------------------------------------------------
4+
!
5+
Here is the files to generate spherical harmonics index data file
6+
for simulations in FULL SPHERE with 6 MPI processes.
7+
In this example, half of Chebyshev collocation points
8+
are used for the radial spacing for the full sphere.
9+
This example consists of the following files and directories
10+
11+
control_sph_shell: control file for index file generation
12+
control_resolution: control file for spatial resolution and domain decomposition
13+
sph_lm47r63c_full_6: Directory for spherical harmonics index table
14+
15+
Run index generation program in both directory for index tables
16+
[with_inner_core]$ mpirun -np 6 [CALYPSO_DIR]/bin/utilities/gen_sph_grids

‎examples/spherical_shell/full_sphere/control_resolution‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
begin spherical_shell_ctl
2+
begin FEM_mesh_ctl
3+
FEM_mesh_output_switch 'On'
4+
FEM_viewer_mesh_output_switch 'On'
5+
end FEM_mesh_ctl
6+
!
7+
begin num_domain_ctl
8+
num_radial_domain_ctl 2
9+
num_horizontal_domain_ctl 3
10+
end num_domain_ctl
11+
!
12+
begin num_grid_sph
13+
truncation_level_ctl 47
14+
!
15+
ngrid_meridonal_ctl 72
16+
ngrid_zonal_ctl 144
17+
!
18+
radial_grid_type_ctl half_Chebyshev
19+
num_fluid_grid_ctl 63
20+
fluid_core_size_ctl 1.0
21+
ICB_to_CMB_ratio_ctl 0.0
22+
end num_grid_sph
23+
end spherical_shell_ctl

‎examples/spherical_shell/full_sphere/control_sph_shell‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
begin MHD_control
2+
begin data_files_def
3+
debug_flag_ctl 'Off'
4+
num_subdomain_ctl 6
5+
sph_file_prefix 'sph_lm47r63c_full_6/in'
6+
!
7+
sph_file_fmt_ctl 'ascii'
8+
end data_files_def
9+
!
10+
file spherical_shell_ctl 'control_resolution'
11+
end MHD_control

‎examples/spherical_shell/full_sphere/sph_lm47r63c_full_6/README‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
!-----------------------------------------------------------------------
2+
! Example to generate spherical harmonics index data files
3+
!-----------------------------------------------------------------------
4+
!
5+
Spherical harmonics index data are stored in this directory.

‎examples/spherical_shell/full_sphere_w_ext/README‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
!-----------------------------------------------------------------------
2+
! Example to generate spherical harmonics index data files
3+
!-----------------------------------------------------------------------
4+
!
5+
Here is the files to generate spherical harmonics index data file
6+
for simulations in FULL SPHERE with 6 MPI processes.
7+
In this example, half of Chebyshev collocation points
8+
are used for the radial spacing for the full sphere including the external of she sphere.
9+
This example consists of the following files and directories
10+
11+
control_sph_shell: control file for index file generation
12+
control_resolution: control file for spatial resolution and domain decomposition
13+
sph_lm47r63c_full_ext_6: Directory for spherical harmonics index table
14+
15+
Run index generation program in both directory for index tables
16+
[with_inner_core]$ mpirun -np 6 [CALYPSO_DIR]/bin/utilities/gen_sph_grids

‎examples/spherical_shell/full_sphere_w_ext/control_resolution‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
begin spherical_shell_ctl
2+
begin FEM_mesh_ctl
3+
FEM_mesh_output_switch 'On'
4+
FEM_viewer_mesh_output_switch 'On'
5+
end FEM_mesh_ctl
6+
!
7+
begin num_domain_ctl
8+
num_radial_domain_ctl 2
9+
num_horizontal_domain_ctl 3
10+
end num_domain_ctl
11+
!
12+
begin num_grid_sph
13+
truncation_level_ctl 47
14+
!
15+
ngrid_meridonal_ctl 72
16+
ngrid_zonal_ctl 144
17+
!
18+
radial_grid_type_ctl half_Chebyshev
19+
num_fluid_grid_ctl 63
20+
fluid_core_size_ctl 1.0
21+
ICB_to_CMB_ratio_ctl 0.0
22+
!
23+
Max_radius_ctl 1.5
24+
end num_grid_sph
25+
end spherical_shell_ctl

‎examples/spherical_shell/full_sphere_w_ext/control_sph_shell‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
begin MHD_control
2+
begin data_files_def
3+
debug_flag_ctl 'Off'
4+
num_subdomain_ctl 6
5+
sph_file_prefix 'sph_lm47r63c_full_ext_6/in'
6+
!
7+
sph_file_fmt_ctl 'merged_gz'
8+
end data_files_def
9+
!
10+
file spherical_shell_ctl 'control_resolution'
11+
end MHD_control

‎examples/spherical_shell/full_sphere_w_ext/sph_lm47r63c_full_ext_6/README‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
!-----------------------------------------------------------------------
2+
! Example to generate spherical harmonics index data files
3+
!-----------------------------------------------------------------------
4+
!
5+
Spherical harmonics index data are stored in this directory.

‎src/Fortran_libraries/MHD_src/IO/set_control_4_MHD_coefs.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
!!
44
!!@author H. Matsui
55
!!@date Programmed by H. Matsui in 2001
6-
!!@n Mmodified by H. Matsui in Aug., 2007
6+
!!@n Modified by H. Matsui in Aug., 2007
77
!
88
!> @brief set coeffcients for MHD simulation from control data
99
!!

0 commit comments

Comments
 (0)