Commit 9c14dee3 authored by Roy Fabrice's avatar Roy Fabrice
Browse files

synthax changes

name changes
parent 53090e5c
......@@ -36,8 +36,8 @@ module modreadcube
use hdf5, only : HID_T
use iso_fortran_env, only : OUTPUT_UNIT
use modconstant, only : IDKIND
use modmpicom, only : info_proc
use modvariables, only : common_meta, inforamses, ngrid, param, xmax, xmin, ymax, ymin, zmax, zmin
use mpi_communicator_m, only : info_proc
use variables_m, only : common_meta, inforamses, ngrid, param, xmax, xmin, ymax, ymin, zmax, zmin
use modmpicommons, only : Emergencystop, procid
use modvarcommons, only : field, global_npart, local_npart, nres, pfof_id, position, potential, velocity
use mpi
......
......@@ -23,15 +23,16 @@ SRC = modconstant.f90 \
modwritehalo.f90 \
modreadparameters.f90 \
modfofmpi.f90 \
modvariables.f90 \
modmpicom.f90 \
variables_m.f90 \
mpi_communicator_m.f90 \
modreadcube.f90 \
modwritedmcube.f90 \
modwritestarcube.f90 \
read_ramses_part_mod.f90 \
select_dm_mod.f90 \
modio.f90 \
modfofpara.f90 \
write_dm_cube_m.f90 \
write_star_cube_m.f90 \
read_ramses_part_file_m.f90 \
select_dm_m.f90 \
read_ramses_output_m.f90 \
io_utils_m.f90 \
parallel_fof_m.f90 \
pfof_snap.f90
OBJS_NOPREFIX=$(SRC:%.f90=%.o)
......
......@@ -23,7 +23,7 @@
!> This module contains subroutines used for I/O.
!> Authors: F. Roy, V. Bouillot
module modio
module io_utils_m
use mpi
......@@ -32,7 +32,6 @@ module modio
private
public :: Print_screen_parameters,&
Read_ramses, &
Init_parameters,&
The_end, &
Title, &
......@@ -95,7 +94,7 @@ contains
use modconstant, only : ERR_MSG_LEN, FILENAME_LEN, LOG_UNIT
use modmpicommons, only : create_mpi_type_param_pfof_snap, emergencystop, MPI_TYPE_PARAMETER_PFOF_SNAP, procid, procnb
use modreadparameters, only : read_pfof_snap_parameters
use modvariables, only : param
use variables_m, only : param
character(len=ERR_MSG_LEN) :: errormessage
character(len=FILENAME_LEN) :: filelog
......@@ -140,7 +139,7 @@ contains
use iso_fortran_env, only : OUTPUT_UNIT
use modmpicommons, only : procid
use modvariables, only : param
use variables_m, only : param
if(procid==0) then
......@@ -243,6 +242,4 @@ contains
end subroutine Write_timings
end module modio
end module io_utils_m
......@@ -23,7 +23,7 @@
!> This module contains the subroutines and the variables used for MPI communications.
!> Authors: F. Roy, V. Bouillot
module modmpicom
module mpi_communicator_m
use mpi
use modmpicommons, only : type_info_process,&
......@@ -167,7 +167,7 @@ contains
!! It also creates the communicators used for the parallel hdf5 i/o if they are needed.
subroutine setcommunicators()
use modvariables, only : param
use variables_m, only : param
integer(kind=4) :: mpierr
......@@ -272,4 +272,4 @@ contains
end subroutine setcommunicators
end module modmpicom
end module mpi_communicator_m
\ No newline at end of file
......@@ -24,7 +24,7 @@
!> This module contains the serial FOF algorithm.
!>
!> Authors: E. Audit, F. Roy, V. Bouillot
module modfofpara
module parallel_fof_m
use iso_fortran_env, only : ERROR_UNIT
use modindex, only : coord_to_id, id_to_coord
......@@ -49,7 +49,7 @@ contains
use compute_halo_properties_mod, only : compute_halo_com, compute_halo_radius
use modmpicommons, only : emergencystop, procid
use modmpicom, only : info_proc
use mpi_communicator_m, only : info_proc
use modconstant, only : IDKIND, LOG_UNIT
use modfofmpi, only : mergehaloes, border, nflagloc
......@@ -66,7 +66,7 @@ contains
use modwritehalo, only : h5writehalopart, mpih5writehalomass, mpih5writehalopart
use modtiming, only : tfofloc, tfofinit, tgatherhalo, time0, timeint, tobs, touthalopart, toutmass, traccord, tselecthalo, tsort
use modvarcommons, only : global_npart, local_npart, nres, pfof_id, position, structure_id
use modvariables, only : inforamses, param, xmax, xmin, ymax, ymin, zmax, zmin
use variables_m, only : inforamses, param, xmax, xmin, ymax, ymin, zmax, zmin
use mpi
! Local variables
......@@ -721,6 +721,4 @@ end subroutine Parallel_fof
end subroutine Init
end module modfofpara
end module parallel_fof_m
......@@ -25,19 +25,20 @@ program Friend
use iso_fortran_env, only : ERROR_UNIT, OUTPUT_UNIT
use modconstant, only : LOG_UNIT, ERR_CODE_WRONG_PARAMETER
use modfofpara, only : Parallel_fof
use parallel_fof_m, only : Parallel_fof
use fortran_hdf5_manage_interface_m, only : hdf5_finalize, hdf5_init
use modio, only : Print_screen_parameters, Init_parameters, Read_ramses, The_end, Title, Write_timings
use modmpicom, only : Setcommunicators
use io_utils_m, only : Print_screen_parameters, Init_parameters, The_end, Title, Write_timings
use mpi_communicator_m, only : Setcommunicators
use modmpicommons, only : Emergencystop, procid, procnb
use modreadcube, only : Readcube, Selectreadcubetype
use modtiming, only : tfof, tfofinit, tfofloc, timeint, tobs, tout, traccord, tread, treadfile
use modvarcommons, only : nres
use modvariables, only : ngrid, param
use modwritedmcube, only : Selectwritedmcube, Writedmcube
use modwritestarcube, only : Selectwritestarcube, Writestarcube
use read_ramses_output_m, only : Read_ramses_output
use variables_m, only : ngrid, param
use write_dm_cube_m, only : Selectwritedmcube, Writedmcube
use write_star_cube_m, only : Selectwritestarcube, Writestarcube
use mpi
use select_dm_mod, only : Select_dm_particles
use select_dm_m, only : Select_dm_particles
implicit none
......@@ -88,7 +89,7 @@ program Friend
! RA2 = RAMSES v2
! RA3 = RAMSES v3
! Read the output of the cosmological simulation
call Read_ramses()
call Read_ramses_output()
if (param%star) then
call Select_dm_particles()
end if
......
......@@ -29,6 +29,8 @@
module read_ramses_output_m
use mpi
implicit none
private
......@@ -51,7 +53,7 @@ subroutine Read_ramses_output()
use modvarcommons, only : field, global_npart, local_npart, nres, pfof_id, position, potential, velocity, &
mass, metallicity, birth_date
use mpi_communicator_m, only : build_my_process_grid, info_proc
use read_ramses_part_mod, only : Read_ramses_part_file
use read_ramses_part_file_m, only : Read_ramses_part_file
use variables_m, only : inforamses, ngrid, param, xmax, xmin, ymax, ymin, zmax, zmin
!-----------------------------------------------
......
......@@ -36,7 +36,7 @@ module select_dm_m
private
public :: Select_dm_particles
contains
subroutine Select_dm_particles()
......@@ -44,11 +44,12 @@ contains
use mpi
use modconstant, only : IDKIND, MPI_IDKIND
use modsort, only : heapsort
use modvariables, only : param
use variables_m, only : param
use modvarcommons, only : position, velocity, pfof_id, mass, birth_date, metallicity, field, potential, local_npart, &
star_position, star_velocity, star_ramses_id, star_mass, star_birth_date, star_metallicity, star_field, &
star_potential, global_nstar, local_nstar, global_npart
use modmpicommons, only : procid
integer(kind=4) :: ipart, local_npart_dm
real(kind=4), parameter :: EPSILON=1.e-7
integer(kind=IDKIND), allocatable, dimension(:) :: is_star
......
......@@ -22,7 +22,7 @@
!! This file contains some global variables declarations.
!> This module contains some global variables declarations.
module modvariables
module variables_m
use modconstant, only : IDKIND, type_common_metadata, type_parameter_pfof_snap
use type_info_ramses_mod, only : type_info_ramses
......@@ -45,4 +45,4 @@ module modvariables
inforamses,&
common_meta
end module modvariables
end module variables_m
......@@ -23,7 +23,7 @@
!> This module contains subroutines used to write HDF5 dark matter particles cubes.
!> Authors: F. Roy
module modwritedmcube
module write_dm_cube_m
use mpi
use modvarcommons, only : field, global_npart, local_npart, mass, pfof_id, position, potential, velocity
......@@ -35,8 +35,8 @@ module modwritedmcube
use fortran_hdf5_write_data_m
use fortran_hdf5_write_mpi_data_m
use hdf5, only : HID_T
use modmpicom, only : info_proc
use modvariables, only : inforamses, param, xmax, xmin, ymax, ymin, zmax, zmin
use mpi_communicator_m, only : info_proc
use variables_m, only : inforamses, param, xmax, xmin, ymax, ymin, zmax, zmin
use modmpicommons, only : procid, procnb
use modwritemeta, only : Write_meta_common, Write_meta_halofinder_parameter, Write_meta_info_ramses
......@@ -885,4 +885,4 @@ contains
end subroutine Mpih5writesorteddmcube
end module modwritedmcube
end module write_dm_cube_m
......@@ -23,7 +23,7 @@
!> This module contains subroutines used to write HDF5 star cubes.
!> Authors: F. Roy
module modwritestarcube
module write_star_cube_m
use iso_fortran_env, only : ERROR_UNIT
use mpi
......@@ -38,8 +38,8 @@ module modwritestarcube
use fortran_hdf5_write_data_m
use fortran_hdf5_write_mpi_data_m
use hdf5, only : HID_T
use modmpicom, only : info_proc
use modvariables, only : inforamses, param, xmax, xmin, ymax, ymin, zmax, zmin
use mpi_communicator_m, only : info_proc
use variables_m, only : inforamses, param, xmax, xmin, ymax, ymin, zmax, zmin
use modmpicommons, only : procid, procnb
use modwritemeta, only : Write_meta_common, Write_meta_halofinder_parameter, Write_meta_info_ramses
......@@ -1072,4 +1072,4 @@ contains
end subroutine Mpih5writesortedstarcube
end module modwritestarcube
end module write_star_cube_m
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment