Merge branch 'master' of gitlab.obspm.fr:roy/pFoF

.gitlab-ci.yml

+# stages:
+#     - deploy
+
+# pages:
+#     stage: deploy
+#     image: gitlab.obspm.fr:4567/roy/pfof:latest
+#     script:
+#         - mkdir public
+#         - cd doc
+#         - doxygen doxypfof
+#         - doxygen doxypfof
+#         - mv html/ ../public/
+#         - cd ..
+#     artifacts:
+#         paths:
+#             - public
+#     only:
+#         - master
+#     tags:
+#         - docker_dio
+   
 stages:
-    - pages
+    - deploy
+
+pages: 
+    stage: deploy
+    image: alpine
 
-pages:
-    stage: pages
+    before_script:
+        - apk update
+        - apk add doxygen
+        ## Uncomment the following line if you use graphviz dot graphs
+        - apk add ttf-freefont graphviz
     script:
         - cd doc
         - doxygen doxypfof
-        - doxygen doxypfof
-        - cp -r html ../public/
-        - cd ..
+        - mv html/ ../public/
     artifacts:
         paths:
-            - public
+        - public
     only:
-        - hydro
-    tags:
-        - shell
-
-        
+        - master
+    tags: 
+        - docker_dio
\ No newline at end of file

README.md

@@ -18,7 +18,7 @@ The stable version can be found in the trunk directory.
 There are 2 different versions of pFoF: pfof_snap for RAMSES snapshots, pfof_cone for RAMSES lightcones. 
 
 
-The reference documentation can be found [here](https://roy.pages.obspm.fr/pFoF_dev). 
+The reference documentation can be found [here](https://roy.pages.obspm.fr/pFoF). 
 ## Install
 
 pFoF needs:

docker/pfof-alpine-inteloneapi/Dockerfile

+FROM alpine:latest
+
+LABEL maintainer="fabrice.roy@observatoiredeparis.psl.eu"
+
+RUN apk add 
+
+RUN apt-get clean && \
+rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+CMD /bin/bash

docker/pfof-inteloneapi/Dockerfile

+
+FROM intel/oneapi-hpckit
+
+LABEL maintainer="fabrice.roy@observatoiredeparis.psl.eu"
+
+RUN apt-get update --fix-missing && \
+    DEBIAN_FRONTEND="noninteractive"  apt-get install -y doxygen graphviz git
+
+RUN apt-get clean && \
+rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+
+CMD /bin/bash
+COPY hdf5-1.12.1.tar.bz2 .
+RUN tar xjf hdf5-1.12.1.tar.bz2 ; mkdir build-hdf5 ; cd build-hdf5 ; ../hdf5-1.12.1/configure --prefix=/opt/hdf5 --enable-fortran --enable-parallel CC=mpiicc FC=mpiifort ; make ; make install
+RUN rm -rf build-hdf5 hdf5-1.12.1*
+ENV PATH="${PATH}:/opt/hdf5/bin"
+ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/hdf5/lib"
+RUN h5pfc -show
\ No newline at end of file