Commits

Britton Smith committed c2a96a3

Removing particle id compile option.

  • Participants
  • Parent commits bd7aed4

Comments (0)

Files changed (4)

File src/clib/Make.config.assemble

           -D__memory_pool_size=$(PARAMETER_MEMORY_POOL_SIZE)
 
 #-----------------------------------------------------------------------
-# DETERMINE INTEGER SIZE SETTINGS FOR PARTICLE INDICES
-#-----------------------------------------------------------------------
-
-    ERROR_IDS = 1
-
-    # Settings for 32-bit integers
-
-    ifeq ($(CONFIG_PARTICLE_IDS),32)
-        ERROR_IDS = 0
-        ASSEMBLE_IDS_DEFINES = -DCONFIG_PINT_4
-    endif
-
-    # Settings for 64-bit integers
-
-    ifeq ($(CONFIG_PARTICLE_IDS),64)
-        ERROR_IDS = 0
-        ASSEMBLE_IDS_DEFINES = -DCONFIG_PINT_8
-    endif
-
-    # error if CONFIG_INTEGERS is incorrect
-
-    ifeq ($(ERROR_IDS),1)
-       .PHONY: error_ids
-       error_ids:
-	$(error Illegal value '$(CONFIG_PARTICLE_IDS)' for $$(CONFIG_PARTICLE_IDS))
-    endif
-
-#-----------------------------------------------------------------------
 # DETERMINE INTEGER SIZE SETTINGS
 #-----------------------------------------------------------------------
 

File src/clib/Make.config.settings

      CONFIG_INTEGERS = 64
 
 #=======================================================================
-# CONFIG_PARTICLE_IDS
-#=======================================================================
-#    32            use 32-bit integers for particle IDs
-#    64            use 64-bit integers for particle IDs
-#-----------------------------------------------------------------------
-
-     CONFIG_PARTICLE_IDS = 64
-
-#=======================================================================
 # CONFIG_PRECISION
 #=======================================================================
 #    32            use 32-bit precision for floating point data

File src/clib/Make.config.targets

 	@echo "      gmake integers-32"
 	@echo "      gmake integers-64"
 	@echo
-	@echo "   Set integer size for particle IDs"
-	@echo
-	@echo "      gmake particle-id-32"
-	@echo "      gmake particle-id-64"
-	@echo
 	@echo "   Set floating-point precision"
 	@echo
 	@echo "      gmake precision-32"
 	@echo "   CONFIG_PRECISION  [precision-{32,64}]                     : $(CONFIG_PRECISION)"
 	@echo "   CONFIG_PARTICLES  [particles-{32,64,128}]                 : $(CONFIG_PARTICLES)"
 	@echo "   CONFIG_INTEGERS  [integers-{32,64}]                       : $(CONFIG_INTEGERS)" 
-	@echo "   CONFIG_PARTICLE_IDS  [particle-id-{32,64}]                : $(CONFIG_PARTICLE_IDS)"
 	@echo "   CONFIG_INITS  [inits-{32,64}]                             : $(CONFIG_INITS)"
 	@echo "   CONFIG_IO  [io-{32,64}]                                   : $(CONFIG_IO)"
 	@echo "   CONFIG_USE_MPI  [use-mpi-{yes,no}]                        : $(CONFIG_USE_MPI)"

File src/clib/macros_and_parameters.h

 #endif
 #endif
 
-/* Definitions for controlling the integer type for particle IDs
-   (8-byte needed for >2 billion particle simulations) */
-
-#ifdef CONFIG_PINT_4
-#define PINT Eint32
-#define PINTDataType MPI_INT
-#define HDF5_PINT HDF5_I4
-#define HDF5_FILE_PINT HDF5_FILE_I4
-#define PISYM "d"
-#define ENPY_PINT NPY_INT
-#endif
-
-#ifdef CONFIG_PINT_8
-#define PINT Eint64
-#define PINTDataType MPI_LONG_LONG_INT
-#define HDF5_PINT HDF5_I8
-#define HDF5_FILE_PINT HDF5_FILE_I8
-#define PISYM "lld"
-#define ENPY_PINT NPY_LONG
-#endif
-
 /* Standard definitions (well, fairly standard) */
 
 #ifndef NULL