diff --git a/src/coordinates.F90 b/src/coordinates.F90 index 2c65916..99c57ca 100644 --- a/src/coordinates.F90 +++ b/src/coordinates.F90 @@ -21,11 +21,14 @@ !! !!****************************************************************************** !! -!! module: COORDS - handles coordinates +!! module: COORDINATES +!! +!! This module provides variables and subroutines handling the coordinates +!! for all refinement levels. !! !!****************************************************************************** ! -module coords +module coordinates implicit none diff --git a/src/driver.F90 b/src/driver.F90 index 90f7da8..4308be3 100644 --- a/src/driver.F90 +++ b/src/driver.F90 @@ -35,7 +35,7 @@ program amun #ifdef FORCE use config , only : fdt #endif /* FORCE */ - use coords , only : init_coords, clear_coords + use coordinates, only : init_coords, clear_coords use evolution, only : evolve, find_new_timestep, n, t, dt, dtn #ifdef FORCE use forcing , only : init_forcing, clear_forcing diff --git a/src/evolution.F90 b/src/evolution.F90 index 3443fbd..c28d3a7 100644 --- a/src/evolution.F90 +++ b/src/evolution.F90 @@ -195,7 +195,7 @@ module evolution #ifdef MPI use mpitools, only : reduce_maximum_real #endif /* MPI */ - use coords , only : adx, ady, adz + use coordinates, only : adx, ady, adz use scheme , only : maxspeed, cmax #ifdef VISCOSITY use config , only : visc @@ -316,7 +316,7 @@ module evolution use blocks , only : block_data use config , only : im, jm, km - use coords , only : adxi, adyi, adzi + use coordinates, only : adxi, adyi, adzi #if defined MHD && defined GLM use config , only : decay use scheme , only : cmax @@ -668,7 +668,7 @@ module evolution subroutine flux_euler(pblock) use blocks , only : block_data - use coords , only : adx, ady, adz + use coordinates, only : adx, ady, adz use scheme , only : update_flux implicit none @@ -714,7 +714,7 @@ module evolution use blocks , only : block_data use config , only : im, jm, km - use coords , only : adx, ady, adz, adxi, adyi, adzi + use coordinates, only : adx, ady, adz, adxi, adyi, adzi use scheme , only : update_flux use variables, only : nqt @@ -789,7 +789,7 @@ module evolution use blocks , only : block_data use config , only : im, jm, km - use coords , only : adx, ady, adz, adxi, adyi, adzi + use coordinates, only : adx, ady, adz, adxi, adyi, adzi use scheme , only : update_flux use variables, only : nqt @@ -898,7 +898,7 @@ module evolution use config , only : tbfor use forcing , only : real_forcing #endif /* FORCE */ - use coords , only : adxi, adyi, adzi + use coordinates, only : adxi, adyi, adzi #ifdef SHAPE use problem , only : update_shapes #endif /* SHAPE */ @@ -1041,7 +1041,7 @@ module evolution use config , only : tbfor use forcing , only : real_forcing #endif /* FORCE */ - use coords , only : adxi, adyi, adzi + use coordinates, only : adxi, adyi, adzi #ifdef SHAPE use problem , only : update_shapes #endif /* SHAPE */ @@ -1209,7 +1209,7 @@ module evolution use config , only : tbfor use forcing , only : real_forcing #endif /* FORCE */ - use coords , only : adxi, adyi, adzi + use coordinates, only : adxi, adyi, adzi #ifdef SHAPE use problem , only : update_shapes #endif /* SHAPE */ diff --git a/src/forcing.F90 b/src/forcing.F90 index 2fe761c..9e76efe 100644 --- a/src/forcing.F90 +++ b/src/forcing.F90 @@ -476,7 +476,7 @@ module forcing use config , only : im, jm, km, ib, ie, jb, je, kb, ke use constants, only : dpi - use coords , only : ax, ay, az, advol + use coordinates, only : ax, ay, az, advol use variables, only : idn, imx, imy, imz implicit none @@ -630,7 +630,7 @@ module forcing use config , only : im, jm, km, ib, ie, jb, je, kb, ke use constants, only : dpi - use coords , only : ax, ay, az, advol + use coordinates, only : ax, ay, az, advol implicit none diff --git a/src/integrals.F90 b/src/integrals.F90 index 7922c63..5792133 100644 --- a/src/integrals.F90 +++ b/src/integrals.F90 @@ -141,7 +141,7 @@ module integrals #ifdef FORCE use forcing , only : fcor, finp #endif /* FORCE */ - use coords , only : advol + use coordinates, only : advol use mpitools , only : master #ifdef MPI use mpitools , only : reduce_sum_real_array diff --git a/src/io.F90 b/src/io.F90 index 9a8ceac..5e21dcc 100644 --- a/src/io.F90 +++ b/src/io.F90 @@ -928,7 +928,7 @@ module io use config , only : ncells, nghost use config , only : in, jn, kn, rdims, maxlev, toplev use config , only : xmin, xmax, ymin, ymax, zmin, zmax - use coords , only : init_coords, clear_coords + use coordinates, only : init_coords, clear_coords use error , only : print_error, print_warning use evolution, only : n, t, dt, dtn use hdf5 , only : hid_t, hsize_t @@ -2678,7 +2678,7 @@ module io use error , only : print_error use hdf5 , only : hid_t, hsize_t use hdf5 , only : h5gcreate_f, h5gclose_f - use coords, only : adx, ady, adz, res + use coordinates, only : adx, ady, adz, res ! declare variables ! diff --git a/src/mesh.F90 b/src/mesh.F90 index ef2a932..6d52d2e 100644 --- a/src/mesh.F90 +++ b/src/mesh.F90 @@ -149,7 +149,7 @@ module mesh use blocks , only : nchild, nsides, nfaces use blocks , only : get_mblocks, get_nleafs use config , only : minlev, maxlev, rdims - use coords , only : res + use coordinates, only : res use error , only : print_info, print_error use mpitools, only : master, nproc, nprocs use problem , only : init_domain, init_problem, check_ref @@ -426,7 +426,7 @@ module mesh , associate_blocks, deallocate_datablock use blocks , only : get_nleafs use config , only : minlev, maxlev, toplev, im, jm, km - use coords , only : res + use coordinates, only : res use error , only : print_info, print_error #ifdef MPI use mpitools , only : reduce_sum_integer_array @@ -1404,7 +1404,7 @@ module mesh use blocks , only : block_meta, list_meta use blocks , only : get_mblocks, get_nleafs use config , only : ncells, nghost, toplev - use coords , only : effres + use coordinates, only : effres use mpitools, only : master, nprocs implicit none diff --git a/src/problem.F90 b/src/problem.F90 index 975558e..5928587 100644 --- a/src/problem.F90 +++ b/src/problem.F90 @@ -488,7 +488,7 @@ module problem use blocks , only : block_data use config , only : im, jm, km use config , only : gamma, dens, pres, ratio, rcut - use coords , only : ax, ay, az + use coordinates, only : ax, ay, az use scheme , only : prim2cons use variables, only : nvr, nqt, idn, ivx, ivy, ivz #ifdef ADI @@ -598,7 +598,7 @@ module problem use blocks , only : block_data use config , only : im, jm, km use config , only : dens, pres, rmid, gammam1i - use coords , only : ax, ay, adx, ady + use coordinates, only : ax, ay, adx, ady use scheme , only : prim2cons use variables, only : nqt use variables, only : idn, ivx, ivy, ivz @@ -711,7 +711,7 @@ module problem use config , only : dnfac, dnrat use config , only : rstar, vstar, rsat, dsat, vsat, tsat, esat use constants, only : dpi - use coords , only : ax, ay, az, adr + use coordinates, only : ax, ay, az, adr use scheme , only : prim2cons use variables, only : nqt use variables, only : idn, ivx, ivy, ivz @@ -904,7 +904,7 @@ module problem use config , only : csnd2 #endif /* ISO */ use constants, only : dpi - use coords , only : ax, ay, az + use coordinates, only : ax, ay, az use scheme , only : prim2cons use variables, only : nvr, nqt use variables, only : idn, ivx, ivy, ivz @@ -1048,7 +1048,7 @@ module problem use config , only : csnd2 #endif /* ISO */ use constants, only : dpi - use coords , only : ax, ay, az + use coordinates, only : ax, ay, az use mpitools , only : nproc use random , only : randomn use scheme , only : prim2cons @@ -1276,7 +1276,7 @@ module problem use config , only : csnd #endif /* ISO */ use constants, only : dpi, qpi - use coords , only : ax, ay + use coordinates, only : ax, ay use scheme , only : prim2cons use variables, only : nvr, nqt use variables, only : idn, ivx, ivy, ivz @@ -1383,7 +1383,7 @@ module problem use config , only : gamma, gammam1i #endif /* ADI */ use constants, only : dpi - use coords , only : ax, ay, az, adr + use coordinates, only : ax, ay, az, adr use variables, only : idn, imx, imy, imz #ifdef ADI use variables, only : ien