Merge branch 'jameswurster-master'

AUTHORS

@@ -24,8 +24,8 @@ Fangyi (Fitz) Hu <fhuu0005@student.monash.edu>
 Megha Sharma <msha0023@student.monash.edu>
 Terrence Tricco <ttricco@cita.utoronto.ca>
 Mats Esseldeurs <matsesseldeurs@yahoo.com>
-MatsEsseldeurs <matsesseldeurs@yahoo.com>
 Simone Ceppi <simone.ceppi@unimi.it>
+MatsEsseldeurs <matsesseldeurs@yahoo.com>
 Caitlyn Hardiman <caitlyn.hardiman1@monash.edu>
 Enrico Ragusa <enr.ragusa@gmail.com>
 Sergei Biriukov <svbiriukov@gmail.com>

build/Makefile

@@ -527,11 +527,11 @@ else
     SRCKROME=
 endif
 
-SOURCES= physcon.f90 ${CONFIG} ${SRCKERNEL} io.F90 units.f90 boundary.f90 \
+SOURCES= physcon.f90 ${CONFIG} ${SRCKERNEL} io.F90 units.f90 \
          mpi_dens.F90 mpi_force.F90 mpi_utils.F90 dtype_kdtree.F90 utils_omp.F90 utils_cpuinfo.f90 \
-         utils_allocate.f90 icosahedron.f90 quartic.f90 \
-         utils_system.f90 utils_mathfunc.f90 part.F90 ${DOMAIN} utils_timing.f90 mpi_balance.F90 \
-         setup_params.f90 timestep.f90 utils_dumpfiles.f90 utils_indtimesteps.F90 utils_infiles.f90 \
+         utils_infiles.f90 utils_allocate.f90 icosahedron.f90 quartic.f90 \
+         utils_system.f90 utils_mathfunc.f90 part.F90 ${DOMAIN} boundary.f90 boundary_dynamic.f90 utils_timing.f90 mpi_balance.F90 \
+         setup_params.f90 timestep.f90 utils_dumpfiles.f90 utils_indtimesteps.F90 \
          utils_sort.f90 utils_supertimestep.F90 utils_tables.f90 utils_gravwave.f90 \
          utils_sphNG.f90 utils_vectors.f90 utils_datafiles.f90 datafiles.f90 \
          gitinfo.f90 ${SRCFASTMATH} random.f90 ${SRCEOS} cullendehnen.f90 ${SRCNIMHD} ${SRCGR} \
@@ -612,7 +612,7 @@ edit: checksetup
 #----------------------------------------------------
 # these are the sources for anything which uses the readwrite_dumps module
 #
-SRCDUMP= physcon.f90 ${CONFIG} ${SRCKERNEL} utils_omp.F90 io.F90 units.f90 boundary.f90 mpi_utils.F90 \
+SRCDUMP= physcon.f90 ${CONFIG} ${SRCKERNEL} utils_omp.F90 io.F90 units.f90 boundary.f90 boundary_dynamic.f90 mpi_utils.F90 \
          utils_timing.f90 utils_infiles.f90 dtype_kdtree.f90 utils_allocate.f90 part.F90 ${DOMAIN} \
          mpi_dens.F90 mpi_force.F90 \
          mpi_balance.F90 mpi_memory.F90 mpi_derivs.F90 mpi_tree.F90 kdtree.F90 linklist_kdtree.F90 \

build/Makefile_setups

@@ -852,6 +852,18 @@ ifeq ($(SETUP), jetdusty)
     KNOWN_SETUP=yes
 endif
 
+ifeq ($(SETUP), converging)
+#   Simulation from Wurster & Bonnell (2023)
+    SETUPFILE= velfield_fromcubes.f90 setup_collidingclouds.f90
+    PERIODIC=yes
+    GRAVITY=yes
+    ISOTHERMAL=no
+    MHD=no
+    IND_TIMESTEPS=yes
+    ANALYSIS= analysis_clumpfindWB23.F90
+    KNOWN_SETUP=yes
+endif
+
 ifeq ($(SETUP), sgdisc)
 #   self-gravitating disc
     IND_TIMESTEPS=yes

src/main/boundary.f90

@@ -6,22 +6,23 @@
 !--------------------------------------------------------------------------!
 module boundary
 !
-! This module contains variables and subroutines
-!  relating to boundaries
+! This module contains variables and subroutines relating to boundaries,
+! including dynamically adjusting periodic boundaries
 !
-! :References: None
+! :References:
 !
-! :Owner: Daniel Price
+! :Owner: James Wurster
 !
-! :Runtime parameters: None
+! :Runtime parameters:
 !
-! :Dependencies: None
+! :Dependencies: dim, infile_utils, io, kernel, mpidomain, part
 !
 
+ use dim, only: maxvxyzu
  implicit none
- real, public :: xmin,xmax,ymin,ymax,zmin,zmax
- real, public :: dxbound, dybound, dzbound
- real, public :: totvol
+ real,    public :: xmin,xmax,ymin,ymax,zmin,zmax
+ real,    public :: dxbound,dybound,dzbound
+ real,    public :: totvol
 
  public :: set_boundary
  public :: cross_boundary
@@ -140,4 +141,5 @@ subroutine cross_boundary(isperiodic,xyz,ncross)
  return
 end subroutine cross_boundary
 
+!-----------------------------------------------------------------------
 end module boundary