Skip to content

Commit

Permalink
Merge pull request #164 from Cosmoglobe/devel
Browse files Browse the repository at this point in the history
Merge `devel` into master
  • Loading branch information
dncnwtts authored Mar 21, 2023
2 parents 3aa493e + 26213f4 commit f7ec2e3
Show file tree
Hide file tree
Showing 245 changed files with 419,073 additions and 350,720 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ This work has received funding from the European Union's Horizon 2020 research a

## Citation

If used for published results, please cite these papers:
If used for published results, please [cite these papers](https://github.com/Cosmoglobe/Commander/blob/master/docs/commander.bib):

- Jewell et al. 2004, ApJ, 609, 1
- Wandelt et al. 2004, Phys. Rev. D, 70, 083511
- Eriksen et al. 2004, ApJS, 155, 227 (Commander)
- Eriksen et al. 2008, ApJ, 676, 10 (Joint FG + CMB)
- [Jewell et al. 2004, ApJ, 609, 1](https://ui.adsabs.harvard.edu/abs/2004ApJ...609....1J)
- [Wandelt et al. 2004, Phys. Rev. D, 70, 083511](https://ui.adsabs.harvard.edu/abs/2004PhRvD..70h3511W)
- [Eriksen et al. 2004, ApJS, 155, 227 (Commander)](https://ui.adsabs.harvard.edu/abs/2004ApJS..155..227E)
- [Eriksen et al. 2008, ApJ, 676, 10 (Joint FG + CMB)](https://ui.adsabs.harvard.edu/abs/2008ApJ...676...10E)

6 changes: 0 additions & 6 deletions cmake/libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,6 @@ message(STATUS "OPENMP Fortran LIBRARIES are: ${OpenMP_Fortran_LIBRARIES}")
#------------------------------------------------------------------------------
add_custom_target(tempita ALL "")
set(comm_hdf_mod "${COMMANDER3_SOURCE_DIR}/comm_hdf_mod.f90")
# running python command at configure time
execute_process(
COMMAND ${TEMPITA_DIR}/tempita_proc.py < $< > $@
INPUT_FILE ${comm_hdf_mod}.in
OUTPUT_FILE ${comm_hdf_mod}
)
#------------------------------------------------------------------------------
# Creating a Unified target
#------------------------------------------------------------------------------
Expand Down
17 changes: 13 additions & 4 deletions cmake/projects/commander3.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,33 @@ set(sources
${COMMANDER3_SOURCE_DIR}/ars_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_fft_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_n_qucov_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_n_lcut_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_4d_map_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_f_int_0d_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_n_rms_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_n_rms_qucov_mod.f90
# TOD processing modules
${COMMANDER3_SOURCE_DIR}/comm_tod_noise_psd_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_driver_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_mapmaking_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_lfi_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_lfi_smod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_hfi_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_gain_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_gain_smod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_noise_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_orbdipole_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_pointing_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_wmap_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_dirbe_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_quiet_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_quiet_smod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_spider_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_lb_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_jump_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_driver_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_spider_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_spider_smod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_lb_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_jump_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_tod_driver_mod.f90
# TOD simulations module (and submodules)
${COMMANDER3_SOURCE_DIR}/comm_tod_simulations_mod.f90
#
Expand All @@ -86,7 +91,9 @@ set(sources
${COMMANDER3_SOURCE_DIR}/comm_physdust_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_b_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_f_line_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_exp_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_powlaw_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_powlaw_break_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_utils.f90
${COMMANDER3_SOURCE_DIR}/comm_bp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_f_mod.f90
Expand Down Expand Up @@ -114,6 +121,7 @@ set(sources
${COMMANDER3_SOURCE_DIR}/invsamp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_line_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_timing_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_status_mod.f90
${COMMANDER3_SOURCE_DIR}/locate_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_conviqt_mod.f90
Expand All @@ -140,6 +148,7 @@ set(sources
${COMMANDER3_SOURCE_DIR}/comm_noise_mod.f90
${COMMANDER3_SOURCE_DIR}/spline_1d_mod.f90
${COMMANDER3_SOURCE_DIR}/spline_2d_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_curvature_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_diffuse_comp_mod.f90
${COMMANDER3_SOURCE_DIR}/comm_diffuse_comp_smod.f90
${COMMANDER3_SOURCE_DIR}/comm_nonlin_mod.f90
Expand Down
8 changes: 4 additions & 4 deletions cmake/variables.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ option(USE_SYSTEM_BLAS "Enables search for BLAS/LAPACK on the system." ON)
# HDF5
option(USE_SYSTEM_ZLIB "Enables search for ZLIB on the system." ON)
option(USE_SYSTEM_LIBAEC "Enables search for LibAEC on the system." ON)
option(USE_SYSTEM_HDF5 "Enables search for HDF5 on the system." ON) #OFF)
option(USE_SYSTEM_HDF5 "Enables search for HDF5 on the system." OFF)
# FFTW
option(USE_SYSTEM_FFTW "Enables search for FFTW on the system." ON) #OFF)
option(USE_SYSTEM_FFTW "Enables search for FFTW on the system." OFF)
option(FFTW_ENABLE_AVX "Enables AVX support for FFTW library" OFF)
option(FFTW_ENABLE_AVX2 "Enables AVX2 support for FFTW library" ON)
option(FFTW_ENABLE_SSE "Enables SSE support for FFTW library" OFF)
Expand All @@ -99,11 +99,11 @@ option(FFTW_ENABLE_SSE2 "Enables SSE2 support for FFTW library" OFF)
option(USE_SYSTEM_MBEDTLS "Enables search for MbedTLS on the system." ON)
option(USE_SYSTEM_LIBSSH2 "Enables search for LibSSH2 on the system." ON)
option(USE_SYSTEM_CURL "Enables search for cURL on the system." ON)
option(USE_SYSTEM_CFITSIO "Enables search for CFITSIO on the system." ON) #OFF)
option(USE_SYSTEM_CFITSIO "Enables search for CFITSIO on the system." OFF)
# Can choose whether to compile CFITSIO with or without cURL support
option(CFITSIO_USE_CURL "Installs CFITSIO with cURL support." OFF)
# HEALPix
option(USE_SYSTEM_HEALPIX "Enables search for HEALPIX on the system." ON) #OFF)
option(USE_SYSTEM_HEALPIX "Enables search for HEALPIX on the system." OFF)
# Doxygen
option(USE_SYSTEM_FLEX "Enables search for FLEX on the system." ON)
option(USE_SYSTEM_BISON "Enables search for BISON on the system." ON)
Expand Down
156 changes: 156 additions & 0 deletions commander3/config/config.ita_cmake_gnu
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
# Config file for a generic GCC based compile,
# Using the reference LAPACK/Blas and assuming
# both LAPACK and CFITSIO are in /usr/local.


# =============== Installation ===================

# Final install location. This defaults to a
# subdirectory of the top-level directory called
# install_$COMMANDER.
#export INSTALL := /usr/local

# To be used with the 'install_owl.sh' cmake script

ifeq ($(HOSTNAME), owl36.uio.no)
export LOCAL=../../build_owl3637_gnu/install
else ifeq ($(HOSTNAME), owl37.uio.no)
export LOCAL=../../build_owl3637_gnu/install
else ifeq ($(HOSTNAME), owl35.uio.no)
export LOCAL=../../build_owl3135_gnu/install
else ifeq ($(HOSTNAME), owl34.uio.no)
export LOCAL=../../build_owl3135_gnu/install
else ifeq ($(HOSTNAME), owl33.uio.no)
export LOCAL=../../build_owl3135_gnu/install
else ifeq ($(HOSTNAME), owl32.uio.no)
export LOCAL=../../build_owl3135_gnu/install
else ifeq ($(HOSTNAME), owl31.uio.no)
export LOCAL=../../build_owl3135_gnu/install
else ifeq ($(HOSTNAME), owl30.uio.no)
export LOCAL=../../build_owl2930_gnu/install
else ifeq ($(HOSTNAME), owl29.uio.no)
export LOCAL=../../build_owl2930_gnu/install
else ifeq ($(HOSTNAME), owl28.uio.no)
export LOCAL=../../build_owl2528_gnu/install
else ifeq ($(HOSTNAME), owl27.uio.no)
export LOCAL=../../build_owl2528_gnu/install
else ifeq ($(HOSTNAME), owl26.uio.no)
export LOCAL=../../build_owl2528_gnu/install
else ifeq ($(HOSTNAME), owl25.uio.no)
export LOCAL=../../build_owl2528_gnu/install
else ifeq ($(HOSTNAME), owl24.uio.no)
export LOCAL=../../build_owl1724_gnu/install
else ifeq ($(HOSTNAME), owl23.uio.no)
export LOCAL=../../build_owl1724_gnu/install
else ifeq ($(HOSTNAME), owl22.uio.no)
export LOCAL=../../build_owl1724_gnu/install
else ifeq ($(HOSTNAME), owl21.uio.no)
export LOCAL=../../build_owl1724_gnu/install
else ifeq ($(HOSTNAME), owl20.uio.no)
export LOCAL=../../build_owl1724_gnu/install
else ifeq ($(HOSTNAME), owl19.uio.no)
export LOCAL=../../build_owl1724_gnu/install
else ifeq ($(HOSTNAME), owl18.uio.no)
export LOCAL=../../build_owl1724_gnu/install
else ifeq ($(HOSTNAME), owl17.uio.no)
export LOCAL=../../build_owl1724_gnu/install
endif

# =============== System Tools ===================

# The defaults should be fine for any normal
# GNU/Linux operating system...

# Here you can override the make version to use
#export MAKE := gmake

# How to make a tar.gz file
#export CTAR := tar czvf

# The archive command
#export AR := ar

# Archive options to create a library
#export ARFLAGS := crv

# The ranlib command
#export RANLIB := ranlib


# ================= Compilers ====================

# Serial Fortran 90 compiler. Default is "f90".
export F90 := gfortran #ifort

# MPI Fortran 90 compiler. Default is "mpif90".
export MPF90 := mpif90 #mpiifort

# MPI Fortran 77 compiler. Default is "mpif77".
export MPF77 := mpif90 #mpiifort

# MPI C++ compiler. Default is "mpicxx".
export MPCC := mpicc

export OMPI_FC := gfortran
export OMPI_F77 := gfortran
export OMPI_CC := gcc

# =========== Compiler Optimizations =============
#main
# This is for GNU v10+
export F90FLAGS := -O2 -g -fcheck=all -fbounds-check -march=native -fbacktrace -finit-real=nan -fexternal-blas -fopenmp -ffree-line-length-none -fallow-argument-mismatch -cpp

# Fortran 77 compiler flags
export FFLAGS := -O2

# C compiler flags.
export CFLAGS := -O3

# Extra flags used for linking
export LDFLAGS := -lm -fopenmp -lstdc++

# ============== Language Mixing =================

export MPFCLIBS := -fopenmp

# ============== Fortran Features ================

# Set this variable to 1 if the fortran compiler
# produces module files with capitalization (*.MOD)
# instead of lowercase (*.mod).
#export FORTRAN_UPPER := 1

# =============== CFITSIO Linking ================

# The include and linking commands for cfitsio + zlib.
export CFITSIO_INCLUDE := -I$(LOCAL)/include
export CFITSIO_LINK := -L$(LOCAL)/lib -lcfitsio -lz

# =============== SHARP & HEALPix Linking ================

# The include and linking commands for libsharp.
export SHARP_INCLUDE := -I$(LOCAL)/healpix/include/libsharp
export SHARP_LINK := -L$(LOCAL)/healpix/lib -lsharp
# The include and linking commands for HEALPix
export HEALPIX := $(LOCAL)/healpix
export HEALPIX_INCLUDE := -I$(HEALPIX)/include
export HEALPIX_LINK := -L$(HEALPIX)/lib -lhealpix

# =============== FFTW & LAPACK Linking =================

# The include and linking commands for LAPACK.
#MKLPATH := $(MKLROOT)
export LAPACK_INCLUDE := -I$(LOCAL)/include
#export LAPACK_INCLUDE :=
export LAPACK_LINK := -L$(LOCAL)/lib -lopenblas -lfftw3 -lfftw3f -lfftw3_omp -lfftw3f_omp -lfftw3_threads -lfftw3f_threads
#export LAPACK_LINK := -shared-intel -Wl,-rpath,$(MKLPATH)/lib/intel64 -L$(MKLPATH)/lib/intel64 -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lpthread

# =============== HDF & AEC ============================
#export LOCAL=/mn/stornext/u3/hke/owl/local
export HDF_LINK := -L$(LOCAL)/lib/shared -lhdf5_fortran -lhdf5 -lhdf5_f90cstub -laec -lsz
export HDF_LINK_CPP := -L$(LOCAL)/lib -lhdf5_cpp -lhdf5 -laec -lsz
export HDF_INCLUDE := -I$(LOCAL)/include/shared

# =============== CAMB ============================
#export CAMB_LINK := -L$(LOCAL)/local/lib -lcamb
#export CAMB_INCLUDE := -I$(LOCAL)/mod
Loading

0 comments on commit f7ec2e3

Please sign in to comment.