Merge branch 'danieljprice:master' into master

.github/workflows/krome.yml

@@ -0,0 +1,53 @@
+name: krome
+
+# Trigger on pull request, but only for the master branch
+on:
+  pull_request:
+    branches: [ master ]
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+
+env:
+  PREFIX: /usr/local/
+  PHANTOM_DIR: ${{ github.workspace }}
+  KROMEPATH: ${{ github.workspace }}/krome
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        toolchain: [{compiler: gcc}, {compiler: intel-classic}]
+        exclude:
+          - os: macos-latest
+            toolchain: {compiler: intel-classic}
+
+    steps:
+      - uses: awvwgk/setup-fortran@v1
+        with:
+          compiler: ${{ matrix.toolchain.compiler }}
+
+      - name: "Clone phantom"
+        uses: actions/checkout@v3
+
+      - name: "Clone krome"
+        run: git clone https://bitbucket.org/tgrassi/krome.git krome
+
+      - name: "make krome.setup"
+        run: echo -e "-n=networks/react_AGBwind_nucleation\n-cooling=ATOMIC,CHEM,H2,CIE,Z,CI,CII,OI,OII,CO,OH,H2O,HCN\n-heating=CHEM,CR\n-H2opacity=RIPAMONTI\n-gamma=EXACT\n-noSinkCheck\n-noRecCheck\n-noTlimits\n-useX\n-conserveLin\n-useTabs\n-unsafe\n-iRHS" > krome.setup && cat krome.setup
+
+      - name: "Compile phantom and link with krome"
+        run: make SYSTEM=${{ env.FC }} SETUP=wind KROME=krome KROMEPATH=${KROMEPATH} PREFIX=${PREFIX} RUNDIR=${{ github.workspace }}
+
+      - name: "Compile phantomsetup and link with krome"
+        run: make SYSTEM=${{ env.FC }} SETUP=wind KROME=krome KROMEPATH=${KROMEPATH} PREFIX=${PREFIX} RUNDIR=${PREFIX} setup
+
+      - name: "Compile phantomanalysis and link with krome"
+        run: make SYSTEM=${{ env.FC }} SETUP=wind KROME=krome KROMEPATH=${KROMEPATH} PREFIX=${PREFIX} RUNDIR=${PREFIX} analysis
+
+      - name: "Compile phantommoddump and link with krome"
+        run: make SYSTEM=${{ env.FC }} SETUP=wind KROME=krome KROMEPATH=${KROMEPATH} PREFIX=${PREFIX} RUNDIR=${PREFIX} moddump

.mailmap

@@ -80,8 +80,6 @@ Lionel Siess <[email protected]>
 Lionel Siess <[email protected]> <[email protected]>
 Lionel Siess <[email protected]> <[email protected]>
 Lionel Siess <[email protected]> <[email protected]>
-Mats Esseldeurs <[email protected]>
-Mats Esseldeurs <[email protected]> <[email protected]>
 David Liptai <[email protected]> <[email protected]>
 David Liptai <[email protected]> <[email protected]>
 David Liptai <[email protected]> <[email protected]>
@@ -117,6 +115,4 @@ Amena Faruqi <[email protected]> <[email protected]
 Amena Faruqi <[email protected]> Amena Faruqi <[email protected]>
 Alison Young <[email protected]> Alison Young <[email protected]>
 Simone Ceppi <[email protected]> Simone Ceppi <[email protected]>
-Mats Esseldeurs <[email protected]> mats esseldeurs <[email protected]>
-Mats Esseldeurs <[email protected]> MatsEsseldeurs <[email protected]>
 Nicolás Cuello <[email protected]> Nicolas Cuello <[email protected]>

AUTHORS

@@ -16,14 +16,13 @@ Daniel Mentiplay <[email protected]>
 Megha Sharma <[email protected]>
 Arnaud Vericel <[email protected]>
 Mark Hutchison <[email protected]>
+Mats Esseldeurs <[email protected]>
 Rebecca Nealon <[email protected]>
 Elisabeth Borchert <[email protected]>
 Ward Homan <[email protected]>
 Christophe Pinte <[email protected]>
 Terrence Tricco <[email protected]>
 Simone Ceppi <[email protected]>
-Mats Esseldeurs <[email protected]>
-Mats Esseldeurs <[email protected]>
 Stephane Michoulier <[email protected]>
 Spencer Magnall <[email protected]>
 Caitlyn Hardiman <[email protected]>
@@ -32,8 +31,8 @@ Sergei Biriukov <[email protected]>
 Cristiano Longarini <[email protected]>
 Giovanni Dipierro <[email protected]>
 Roberto Iaconi <[email protected]>
-Hauke Worpel <[email protected]>
 Amena Faruqi <[email protected]>
+Hauke Worpel <[email protected]>
 Alison Young <[email protected]>
 Stephen Neilson <[email protected]>
 Martina Toscani <[email protected]>
@@ -43,26 +42,28 @@ Simon Glover <[email protected]>
 Thomas Reichardt <[email protected]>
 Jean-François Gonzalez <[email protected]>
 Christopher Russell <[email protected]>
-Phantom benchmark bot <[email protected]>
 Alessia Franchini <[email protected]>
-Jolien Malfait <[email protected]>
 Alex Pettitt <[email protected]>
-Nicole Rodrigues <[email protected]>
+Jolien Malfait <[email protected]>
+Phantom benchmark bot <[email protected]>
 Kieran Hirsh <[email protected]>
+Nicole Rodrigues <[email protected]>
 David Trevascus <[email protected]>
-Nicolás Cuello <[email protected]>
 Farzana Meru <[email protected]>
+Nicolás Cuello <[email protected]>
 Chris Nixon <[email protected]>
 Miguel Gonzalez-Bolivar <[email protected]>
-Mike Lau <[email protected]>
 Benoit Commercon <[email protected]>
-Orsola De Marco <[email protected]>
 Giulia Ballabio <[email protected]>
-Maxime Lombart <[email protected]>
 Joe Fisher <[email protected]>
+Maxime Lombart <[email protected]>
+Mike Lau <[email protected]>
+Orsola De Marco <[email protected]>
 Zachary Pellow <[email protected]>
 s-neilson <[email protected]>
 Cox, Samuel <[email protected]>
+Jeremy Smallwood <[email protected]>
+Jorge Cuadra <[email protected]>
 Steven Rieder <[email protected]>
 Stéven Toupin <[email protected]>
-Jorge Cuadra <[email protected]>
+Taj Jankovič <[email protected]>

build/MakeKrome

@@ -3,7 +3,12 @@
 
 KROME_BUILD_DIR = ${KROMEPATH}/build
 
-KFLAGS="$(FFLAGS)"
+KFLAGS=$(filter-out -std=f2008, $(FFLAGS))
+ifeq ($(SYSTEM), ifort)
+    KFLAGS  += -O3 -ipo -ip -unroll -xHost -g -fp-model precise
+else
+    KFLAGS  += -ffree-line-length-none -w -fallow-argument-mismatch
+endif
 FFLAGS+= -I$(KROME_BUILD_DIR)
 PASSED=0
 
@@ -21,23 +26,22 @@ endif
 ifeq ("$(wildcard ${KROMEPATH}/build/optionsKrome.opt)","")
 	cp $(RUNDIR)/krome.setup ${KROMEPATH}/build/optionsKrome.opt
 	cd ${KROMEPATH}; ./krome -options=build/optionsKrome.opt
-	cp -f ${KROMEPATH}/data/coolCO.dat ${KROMEPATH}/data/coolH2O.dat ${KROMEPATH}/data/coolOH.dat ${KROMEPATH}/data/coolHCN.dat ${KROMEPATH}/build/reactions_verbatim.dat ${RUNDIR}
+	cp -f ${KROMEPATH}/build/*.dat ${KROMEPATH}/build/*.gfe ${RUNDIR}
 	make clean_krome
 override PASSED:=1
 endif
 ifeq ("$(PASSED)$(wildcard ${KROMEPATH}/build/reactions_verbatim.dat)","0")
 	cd ${KROMEPATH}; ./krome -options=build/optionsKrome.opt
-	cp ${KROMEPATH}/data/coolCO.dat ${KROMEPATH}/data/coolH2O.dat ${KROMEPATH}/data/coolOH.dat ${KROMEPATH}/data/coolHCN.dat ${KROMEPATH}/build/reactions_verbatim.dat ${RUNDIR}
+	cp -f ${KROMEPATH}/build/*.dat ${KROMEPATH}/build/*.gfe ${RUNDIR}
 endif
 
 krome: $(KROME_OBJS)
 ifeq ("$(wildcard coolCO.dat)","")
-	cp -f ${KROMEPATH}/data/coolCO.dat ${KROMEPATH}/data/coolH2O.dat ${KROMEPATH}/data/coolOH.dat ${KROMEPATH}/data/coolHCN.dat ${KROMEPATH}/build/reactions_verbatim.dat ${RUNDIR}
+	cp -f ${KROMEPATH}/build/*.dat ${KROMEPATH}/build/*.gfe ${RUNDIR}
 endif
 
-
 $(KROME_OBJS):
-	$(MAKE) -C $(KROME_BUILD_DIR) fc=$(FC) switch=$(KFLAGS)
+	$(MAKE) -C $(KROME_BUILD_DIR) fc=$(FC) switch="$(KFLAGS)"
 
 clean_krome:
 	$(MAKE) -C $(KROME_BUILD_DIR) clean

build/Makefile

@@ -289,9 +289,10 @@ endif
 ifeq ($(KROME), krome)
     FPPFLAGS += -DKROME
 ifeq ($(SYSTEM), ifort)
-    LDFLAGS  += -mkl
+    LDFLAGS  += -llapack
 else
-    LDFLAGS  += -L/usr/lib/x86_64-linux-gnu -lmkl_core -lmkl_gnu_thread -lmkl_gf_lp64 -fopenmp
+    # LDFLAGS  += -L/usr/lib/x86_64-linux-gnu -lmkl_core -lmkl_gnu_thread -lmkl_gf_lp64 -fopenmp
+    LDFLAGS  += -llapack
 endif
 endif
 
@@ -554,7 +555,7 @@ OBJECTS = $(OBJECTS1:.F90=.o)
 ifeq ($(KROME), krome)
     .PHONY: all
 
-    all: checksystem krome_setup krome phantom
+    all: checksystem checkparams krome_setup krome phantom
     include MakeKrome
 else
     .PHONY: phantom
@@ -689,7 +690,7 @@ SRCTESTS=utils_testsuite.f90 ${TEST_FASTMATH} test_kernel.f90 \
          test_derivs.F90 test_cooling.f90 test_eos_stratified.f90 \
          test_eos.f90 test_externf.f90 test_rwdump.f90 \
          test_step.F90 test_indtstep.F90 set_disc.F90 test_setdisc.F90 \
-         test_hierarchical.f90 test_damping.f90 test_wind.f90 \
+         test_hierarchical.f90 test_damping.f90 test_wind.f90 test_iorig.f90 \
          test_link.F90 test_kdtree.F90 test_part.f90 test_ptmass.f90 test_luminosity.F90\
          test_gnewton.f90 test_corotate.f90 test_geometry.f90 \
          ${SRCTESTMPI} test_sedov.F90 test_poly.f90 test_radiation.F90 \