Merge branch 'master' into master

.github/workflows/build.yml

@@ -11,8 +11,6 @@ on:
     paths-ignore:
       - 'docs/**'
       - 'README.md'
-#  schedule:
-#    - cron: "0 0 * * *"
 
 env:
   OMP_STACKSIZE: 512M
@@ -22,13 +20,10 @@ env:
   WEB_SERVER: data.phantom.cloud.edu.au
   WEB_HTML_DIR: /var/www/html
   BUILD_LOG_DIR: /ci/build/logs
-  RSYNC_RSH: ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"
   NPARALLEL: 32
 
 jobs:
   matrix_prep:
-    # Skip scheduled runs on forks
-    if: ${{ github.event_name != 'schedule' || github.repository == 'danieljprice/phantom' }}
     runs-on: ubuntu-latest
     outputs:
       batch: ${{ steps.set-sequence.outputs.batch }}
@@ -70,40 +65,11 @@ jobs:
     - name: Update package list
       run: sudo apt-get update
 
-    - name: Setup Intel repo
+    - name: Setup Intel compiler
       if: matrix.system == 'ifort'
-      id: intel-repo
-      run: |
-        wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-        rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-        sudo echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-        sudo apt-get update
-        INTELVERSION=$(apt-cache show intel-oneapi-compiler-fortran | grep Version | head -1)
-        echo "::set-output name=intelversion::$INTELVERSION"
-
-    - name: Cache intel installation
-      if: matrix.system == 'ifort'
-      id: cache-intel
-      uses: actions/cache@v4
+      uses: fortran-lang/setup-fortran@v1
       with:
-        path: |
-          /opt/intel
-        key: ${{ steps.intel-repo.outputs.intelversion }}
-
-    - name: Install Intel compilers
-      if: ${{ steps.cache-intel.outputs.cache-hit != 'true' && matrix.system == 'ifort' }}
-      run: |
-        sudo apt-get install -y intel-oneapi-common-vars
-        sudo apt-get install -y intel-oneapi-compiler-fortran
-        sudo apt-get install -y intel-oneapi-mpi
-        sudo apt-get install -y intel-oneapi-mpi-devel
-
-    - name: Setup Intel oneAPI environment
-      if: matrix.system == 'ifort'
-      run: |
-        source /opt/intel/oneapi/setvars.sh
-        printenv >> $GITHUB_ENV
+          compiler: intel-classic
 
     - name: Install numpy and matplotlib for analysis unit tests
       run: |
@@ -123,36 +89,13 @@ jobs:
       if: github.event_name == 'schedule'
       run: mkdir logs
 
-#    - name: "Grab previous build logs from web server"
-#      if: github.event_name == 'schedule'
-#      env:
-#        WGET: wget --recursive --no-parent --reject "index.html*" --cut-dirs=2 --no-host-directories
-#      run: ${WGET} -A '*${{ matrix.system[1] }}.txt' http://${WEB_SERVER}${BUILD_LOG_DIR}/ || true
-
     - name: "Run buildbot.sh"
       run: ./buildbot.sh --maxdim 17000000 --url http://${WEB_SERVER}/${BUILD_LOG_DIR} --parallel ${{ matrix.batch }} ${{ env.NPARALLEL }}
       working-directory: scripts
       env:
         SYSTEM: ${{ matrix.system }}
         RETURN_ERR: yes
 
-#    - name: "Install SSH Key"
-#      if: github.event_name == 'schedule'
-#      uses: webfactory/[email protected]
-#      with:
-#        ssh-private-key: ${{ secrets.RUNNER_PRIVATE_KEY }}
-
-#    - name: "Copy new build logs to web server"
-#      if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
-#      run: rsync -vau logs/*.txt ${WEB_USER}@${WEB_SERVER}:${WEB_HTML_DIR}/${BUILD_LOG_DIR}
-
-#    - name: "Copy HTML files to web server"
-#      if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
-#      run: |
-#        export WEB_BUILD_DIR=${WEB_HTML_DIR}/nightly/build/$(date "+%Y%m%d")
-#        ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" ${WEB_USER}@${WEB_SERVER} -- mkdir -p ${WEB_BUILD_DIR}
-#        rsync -vau logs/*.html ${WEB_USER}@${WEB_SERVER}:${WEB_BUILD_DIR}/
-
     - name: logs/build-failures-${{ matrix.system }}.txt
       if: always()
       run: cat logs/build-failures-${{ matrix.system }}.txt || true

.github/workflows/krome.yml

@@ -12,6 +12,7 @@ env:
   PREFIX: /usr/local/
   PHANTOM_DIR: ${{ github.workspace }}
   KROMEPATH: ${{ github.workspace }}/krome
+  FC: gfortran  # default if not overwritten by matrix
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -27,7 +28,8 @@ jobs:
             toolchain: {compiler: intel-classic}
 
     steps:
-      - uses: fortran-lang/setup-fortran@v1
+      - name: "Install gfortran compiler"
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: ${{ matrix.toolchain.compiler }}
 

.github/workflows/mcfost.yml

@@ -23,7 +23,8 @@ jobs:
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    - uses: fortran-lang/setup-fortran@v1
+    - name: install gfortran compiler
+      uses: fortran-lang/setup-fortran@v1
       with:
          compiler: gcc
 

.github/workflows/test.yml

@@ -32,7 +32,7 @@ jobs:
           - ['testkd', '']
           - ['testdust', 'dust']
           - ['testgr', 'gr']
-          - ['testgrav', 'gravity ptmass']
+          - ['testgrav', 'gravity ptmass setstar']
           - ['testgrowth', 'dustgrowth']
           - ['testnimhd', 'nimhd']
           - ['test2', '']
@@ -53,38 +53,9 @@ jobs:
 
     - name: Setup Intel repo
       if: matrix.system == 'ifort'
-      id: intel-repo
-      run: |
-        wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-        sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-        rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-        sudo echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-        sudo apt-get update
-        INTELVERSION=$(apt-cache show intel-oneapi-compiler-fortran | grep Version | head -1)
-        echo "::set-output name=intelversion::$INTELVERSION"
-
-    - name: Cache intel installation
-      if: matrix.system == 'ifort'
-      id: cache-intel
-      uses: actions/cache@v4
+      uses: fortran-lang/setup-fortran@v1
       with:
-        path: |
-          /opt/intel
-        key: ${{ steps.intel-repo.outputs.intelversion }}
-
-    - name: Install Intel compilers
-      if: ${{ steps.cache-intel.outputs.cache-hit != 'true' && matrix.system == 'ifort' }}
-      run: |
-        sudo apt-get install -y intel-oneapi-common-vars
-        sudo apt-get install -y intel-oneapi-compiler-fortran
-        sudo apt-get install -y intel-oneapi-mpi
-        sudo apt-get install -y intel-oneapi-mpi-devel
-
-    - name: Setup Intel oneAPI environment
-      if: matrix.system == 'ifort'
-      run: |
-        source /opt/intel/oneapi/setvars.sh
-        printenv >> $GITHUB_ENV
+          compiler: intel-classic
 
     - name: "Clone phantom"
       uses: actions/checkout@v4

.gitignore

@@ -12,6 +12,9 @@ build/phantom-version.h
 *~
 */*~
 */*/*~
+eos_binary_table.dat
+helm_data.tab
+forcing.dat
 *.bindata
 *.pyc
 #*
@@ -23,7 +26,14 @@ build/phantom-version.h
 *.tar
 .DS_Store
 _build
+build/wind_profile1D.dat
+build/radiation-test01explicit.ev
+build/radiation-test01implicit.ev
+build/radiation-test02explicit.ev
+build/radiation-test02implicit.ev
+build/test000
 *.cmdx
 *.cmod
 *.ilm
 *.stb
+

.mailmap

@@ -96,14 +96,16 @@ Megha Sharma <[email protected]> megha sharma <[email protected]>
 Megha Sharma <[email protected]> Megha Sharma <[email protected]>
 Megha Sharma <[email protected]> Megha Sharma <[email protected]>
 Megha Sharma <[email protected]> Megha Sharma <[email protected]> 
-Mike Lau <[email protected]> Mike Lau <[email protected]>
+Mike Lau <[email protected]> Mike Lau <[email protected]>
+Mike Lau <[email protected]> Mike Lau <[email protected]>
 Elisabeth Borchert <[email protected]> emborchert <[email protected]>
 Ward Homan <[email protected]> ward <[email protected]>
 Ward Homan <[email protected]> wardhoman <[email protected]>
 Benedetta Veronesi <[email protected]> benedetta veronesi <[email protected]>
 Benedetta Veronesi <[email protected]> <[email protected]>
 Phantom benchmark bot <[email protected]> Ubuntu <[email protected]>
 Stephane Michoulier <[email protected]> StephaneMichoulier <[email protected]>
+Stephane Michoulier <[email protected]> MICHOULIER Stephane <smichoulier@sidus11>
 Jolien Malfait <[email protected]> Jolien128 <[email protected]>
 Martina Toscani <[email protected]> <[email protected]>
 Martina Toscani <[email protected]> <[email protected]>
@@ -115,4 +117,11 @@ 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]>
+Madeline Overton <[email protected]> Madeline Nicole Overton <[email protected]>
+Madeline Overton <[email protected]> Madeline Overton <[email protected]>
 Nicolás Cuello <[email protected]> Nicolas Cuello <[email protected]>
+Rebecca Martin <[email protected]> rebeccagmartin <[email protected]>
+Stephen Nielson <[email protected]> s-neilson <[email protected]>
+Stephen Nielson <[email protected]> Stephen Neilson <[email protected]>
+Yann Bernard <[email protected]> Yrisch <[email protected]>
+David Bamba <[email protected]> DavidBamba <[email protected]>

AUTHORS

@@ -6,12 +6,13 @@
 # Edit .mailmap if your name or email are wrong         #
 #-------------------------------------------------------#
 Daniel Price <[email protected]>
-Mike Lau <mike.lau@monash.edu>
+Mike Lau <mike.lau@h-its.org>
 Conrad Chan <[email protected]>
 James Wurster <[email protected]>
 David Liptai <[email protected]>
 Lionel Siess <[email protected]>
 Fangyi (Fitz) Hu <[email protected]>
+Yann Bernard <[email protected]>
 Daniel Mentiplay <[email protected]>
 Megha Sharma <[email protected]>
 Arnaud Vericel <[email protected]>
@@ -24,49 +25,54 @@ Christophe Pinte <[email protected]>
 Terrence Tricco <[email protected]>
 Stephane Michoulier <[email protected]>
 Simone Ceppi <[email protected]>
-Yrisch <[email protected]>
 Spencer Magnall <[email protected]>
-Enrico Ragusa <[email protected]>
 Caitlyn Hardiman <[email protected]>
-Sergei Biriukov <svbiriukov@gmail.com>
+Enrico Ragusa <enr.ragusa@gmail.com>
 Cristiano Longarini <[email protected]>
+Sergei Biriukov <[email protected]>
 Giovanni Dipierro <[email protected]>
 Roberto Iaconi <[email protected]>
 Amena Faruqi <[email protected]>
 Hauke Worpel <[email protected]>
 Alison Young <[email protected]>
-Stephen Neilson <36410751+s-neilson@users.noreply.github.com>
+Stephen Nielson <stephen.neilson@students.mq.edu.au>
 Martina Toscani <[email protected]>
 Benedetta Veronesi <[email protected]>
-Simon Glover <[email protected]>
 Sahl Rowther <[email protected]>
+Simon Glover <[email protected]>
 Thomas Reichardt <[email protected]>
 Jean-François Gonzalez <[email protected]>
 Christopher Russell <[email protected]>
-Alex Pettitt <[email protected]>
+Madeline Overton <[email protected]>
 Alessia Franchini <[email protected]>
+Alex Pettitt <[email protected]>
 Jolien Malfait <[email protected]>
 Phantom benchmark bot <[email protected]>
-Nicole Rodrigues <[email protected]>
 Kieran Hirsh <[email protected]>
+Nicole Rodrigues <[email protected]>
+Ana Lourdes Juarez <[email protected]>
+David Trevascus <[email protected]>
 Farzana Meru <[email protected]>
 Nicolás Cuello <[email protected]>
-David Trevascus <[email protected]>
-Mike Lau <[email protected]>
-Miguel Gonzalez-Bolivar <[email protected]>
 Chris Nixon <[email protected]>
-Orsola De Marco <[email protected]>
-Maxime Lombart <[email protected]>
-Joe Fisher <[email protected]>
-Giulia Ballabio <[email protected]>
+Miguel Gonzalez-Bolivar <[email protected]>
 Benoit Commercon <[email protected]>
+Christopher Russell <[email protected]>
+Giulia Ballabio <[email protected]>
+Joe Fisher <[email protected]>
+Maxime Lombart <[email protected]>
+Orsola De Marco <[email protected]>
+Shunquan Huang <[email protected]>
 Zachary Pellow <[email protected]>
-s-neilson <[email protected]>
-Steven Rieder <[email protected]>
-Taj Jankovič <[email protected]>
+Ariel Chitan <[email protected]>
 Chunliang Mu <[email protected]>
-MICHOULIER Stephane <smichoulier@sidus11>
-Jorge Cuadra <[email protected]>
 Cox, Samuel <[email protected]>
+David Bamba <[email protected]>
+Hugh Griffiths <[email protected]>
 Jeremy Smallwood <[email protected]>
+Jorge Cuadra <[email protected]>
+Rebecca Martin <[email protected]>
+Shunquan Huang <[email protected]>
+Steven Rieder <[email protected]>
 Stéven Toupin <[email protected]>
+Taj Jankovič <[email protected]>

build/MakeKrome

@@ -6,9 +6,13 @@ KROME_BUILD_DIR = ${KROMEPATH}/build
 KFLAGS=$(filter-out -std=f2008, $(FFLAGS))
 ifeq ($(SYSTEM), ifort)
     KFLAGS  += -O3 -ipo -ip -unroll -xHost -g -fp-model precise
+else
+ifeq ($(SYSTEM), ifx)
+    KFLAGS  += -O3 -ipo -ip -unroll -xHost -g -fp-model precise
 else
     KFLAGS  += -ffree-line-length-none -w -fallow-argument-mismatch
 endif
+endif
 FFLAGS+= -I$(KROME_BUILD_DIR)
 PASSED=0