diff --git a/src/LMmapping.f90 b/src/LMmapping.f90 index 0599b9cc..26b5d598 100644 --- a/src/LMmapping.f90 +++ b/src/LMmapping.f90 @@ -6,15 +6,15 @@ module LMmapping use parallel_mod, only: load implicit none - + private - + type, public :: mappings integer :: l_max, m_max, lm_max ,m_min integer, allocatable :: lm2(:,:),lm2l(:),lm2m(:) integer, allocatable :: lm2lmS(:), lm2lmA(:) end type mappings - + type, public :: subblocks_mappings integer :: nLMBs,l_max,m_max,sizeLMB2max,m_min integer, allocatable :: nLMBs2(:) @@ -23,7 +23,7 @@ module LMmapping integer, allocatable :: lm22l(:,:,:) integer, allocatable :: lm22m(:,:,:) end type subblocks_mappings - + public :: allocate_mappings, deallocate_mappings, & & allocate_subblocks_mappings, deallocate_subblocks_mappings diff --git a/src/Makefile b/src/Makefile index 06fe08a8..12aaa485 100644 --- a/src/Makefile +++ b/src/Makefile @@ -76,12 +76,12 @@ ifeq ($(COMPILER),intel) else COMP_MPFC = mpiifort COMP_MPCC = mpiicc - endif + endif FFLAG_MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 \ -lmkl_lapack95_lp64\ -lmkl_sequential -lmkl_core -lpthread -lm \ - -Wl,-rpath,$(MKLROOT)/lib/intel64 + -Wl,-rpath,$(MKLROOT)/lib/intel64 endif ifeq ($(COMPILER),gnu) @@ -94,7 +94,7 @@ ifeq ($(COMPILER),gnu) FFLAG_PREPROCESSOR = -cpp FFLAG_WARN_ALL = -Wall -Wno-maybe-uninitialized FFLAG_CHECK_ALL = -fcheck=all - FFLAG_FPE = -ffpe-trap=invalid,zero,overflow + FFLAG_FPE = -ffpe-trap=invalid,zero,overflow COMP_FC = gfortran COMP_CC = gcc COMP_MPFC = mpif90 @@ -212,7 +212,7 @@ ifeq ($(PRODRUN),yes) DEBUG=no OPT += -O3 $(FFLAG_ARCH_OPT) else - OPT += -O + OPT += -O endif ifeq ($(USE_OMP),yes) FFLAGS += $(FFLAG_OPENMP) @@ -238,7 +238,7 @@ endif INCPATHS += -I. -FFLAGS += $(FFLAG_CONVERT) +FFLAGS += $(FFLAG_CONVERT) FFLAGS += $(FFLAG_PREPROCESSOR) $(OPT) LDFLAGS = @@ -296,7 +296,7 @@ endif OBJS := $(addsuffix .o, $(basename $(RED_SOURCES))) OBJS += truncation.o -.SUFFIXES: +.SUFFIXES: #ifeq ($(COMPILER),gnu) #ifeq ($(USE_MPI),yes) @@ -513,7 +513,7 @@ preCalculations.o : truncation.o phys_param.o num_param.o constants.o\ useful.o integration.o parallel.o special.o RMS_helpers.o : truncation.o blocking.o radial.o constants.o\ horizontal.o useful.o integration.o\ - LMmapping.o + LMmapping.o kinetic_energy.o : truncation.o blocking.o num_param.o radial.o\ horizontal.o output_data.o logic.o constants.o\ phys_param.o useful.o integration.o\ @@ -539,7 +539,7 @@ RMS.o : truncation.o blocking.o mem_alloc.o init_fields.o : truncation.o blocking.o radial.o horizontal.o\ constants.o logic.o $(FFT_OBJS) $(SHT_OBJS)\ useful.o phys_param.o mpi_transpose.o\ - $(DCT_OBJS) mem_alloc.o parallel.o + $(DCT_OBJS) mem_alloc.o parallel.o mean_sd.o : precision_mod.o mem_alloc.o matrices.o communications.o movie.o : truncation.o parallel.o radial_data.o\ output_data.o logic.o radial.o mem_alloc.o\ diff --git a/src/README.md b/src/README.md index 493866c7..9e6b04ff 100644 --- a/src/README.md +++ b/src/README.md @@ -5,7 +5,7 @@ Set a suitable compiler in the first line of the Makefile: `COMPILER = `. The options are `intel`, `gnu` or `portland` - depending on your available compilers. **Table** : List of default compilers - + | Compiler Option | Normal | With MPI | |:---------------:|:-------------:|:----------------:| | intel | ifort, icc | mpiifort, mpiicc | @@ -17,7 +17,7 @@ Set a suitable compiler in the first line of the Makefile: `COMPILER = 0!')