Skip to content
Snippets Groups Projects
Commit 70969ab2 authored by Lucie Bakels's avatar Lucie Bakels
Browse files

Merge branch 'master' into m_lcm

parents 0a7d8ade 2861005b
No related branches found
No related tags found
No related merge requests found
...@@ -2,14 +2,31 @@ stages: ...@@ -2,14 +2,31 @@ stages:
- build - build
- test - test
- compare - compare
# - container
default: default:
image:
name: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
pull_policy: always
tags: tags:
- podman - podman
setup:
stage: build
artifacts:
paths:
- tests/testdata/
expire_in: 30 min
when: on_success
script:
- mkdir tests/testdata/
- wget -r -nH --cut-dirs=2 --no-parent --reject="index.html*" -P tests/testdata/ "https://webdata.wolke.img.univie.ac.at/flexpart/"
alma8-build: alma8-build:
image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
stage: build stage: build
when: manual
script: script:
- export FC=gfortran - export FC=gfortran
...@@ -22,10 +39,9 @@ alma8-build: ...@@ -22,10 +39,9 @@ alma8-build:
paths: paths:
- ./src/FLEXPART - ./src/FLEXPART
- ./src/FLEXPART_ETA - ./src/FLEXPART_ETA
expire_in: never expire_in: 30 mins
rocky9-build: rocky9-build:
image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
stage: build stage: build
script: script:
...@@ -39,15 +55,13 @@ rocky9-build: ...@@ -39,15 +55,13 @@ rocky9-build:
paths: paths:
- ./src/FLEXPART - ./src/FLEXPART
- ./src/FLEXPART_ETA - ./src/FLEXPART_ETA
expire_in: never expire_in: 30 mins
options-test: options-test:
# image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
stage: test stage: test
needs: needs:
- alma8-build
- rocky9-build - rocky9-build
- setup
script: script:
- ulimit -s unlimited - ulimit -s unlimited
...@@ -59,15 +73,12 @@ options-test: ...@@ -59,15 +73,12 @@ options-test:
- ./tests/output_bkw - ./tests/output_bkw
- ./tests/output_settling_eta - ./tests/output_settling_eta
- ./tests/output_bkw_eta - ./tests/output_bkw_eta
expire_in: 5 mins expire_in: 10 mins
nests-test: nests-test:
# image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
stage: test stage: test
when: manual when: manual
needs: needs:
- alma8-build
- rocky9-build - rocky9-build
script: script:
...@@ -76,14 +87,14 @@ nests-test: ...@@ -76,14 +87,14 @@ nests-test:
artifacts: artifacts:
when: on_success when: on_success
paths: paths:
- ./tests/output_nests
expire_in: 10 mins
openmp-simulation: openmp-simulation:
# image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
stage: test stage: test
needs: needs:
- alma8-build
- rocky9-build - rocky9-build
- setup
script: script:
- ulimit -s unlimited - ulimit -s unlimited
...@@ -96,15 +107,12 @@ openmp-simulation: ...@@ -96,15 +107,12 @@ openmp-simulation:
- ./tests/output_omp32 - ./tests/output_omp32
- ./tests/output_omp1_eta - ./tests/output_omp1_eta
- ./tests/output_omp32_eta - ./tests/output_omp32_eta
expire_in: 5 mins expire_in: 10 mins
etex-simulation: etex-simulation:
# image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
stage: test stage: test
when: manual when: manual
needs: needs:
- alma8-build
- rocky9-build - rocky9-build
script: script:
...@@ -180,3 +188,7 @@ documentation: ...@@ -180,3 +188,7 @@ documentation:
script: script:
- cd ./documentation && mkdocs build -c --verbose - cd ./documentation && mkdocs build -c --verbose
- sshpass -p "$WOLKE_PASSWORD" rsync -autv --delete -e "ssh -o StrictHostKeyChecking=no" /tmp/cr-site/* "$WOLKE_USER@wolke.img.univie.ac.at:/var/www/flexpart/docs" - sshpass -p "$WOLKE_PASSWORD" rsync -autv --delete -e "ssh -o StrictHostKeyChecking=no" /tmp/cr-site/* "$WOLKE_USER@wolke.img.univie.ac.at:/var/www/flexpart/docs"
# base:
# stage: container
# image:
\ No newline at end of file
...@@ -15,7 +15,11 @@ ARG COMMIT=0 ...@@ -15,7 +15,11 @@ ARG COMMIT=0
ENV COMMIT=$COMMIT ENV COMMIT=$COMMIT
COPY ./src /src COPY ./src /src
COPY ./tests/default_options /options COPY ./tests/default_options /options
COPY ./tests/default_winds /inputs
# since the new data set is larger, we download the data for the container
RUN wget -P /inputs "https://webdata.wolke.img.univie.ac.at/flexpart/*"
# COPY ./tests/default_winds /inputs
COPY ./entrypoint.sh /entrypoint.sh COPY ./entrypoint.sh /entrypoint.sh
WORKDIR /src WORKDIR /src
# #
......
...@@ -2357,10 +2357,14 @@ subroutine partoutput_netcdf(itime,field,np,imass,ncid) ...@@ -2357,10 +2357,14 @@ subroutine partoutput_netcdf(itime,field,np,imass,ncid)
call nf90_err(nf90_put_var(ncid,tempIDend,oro(0:nx-1,0:ny-1), (/ 1,1 /),(/ nx,ny /))) call nf90_err(nf90_put_var(ncid,tempIDend,oro(0:nx-1,0:ny-1), (/ 1,1 /),(/ nx,ny /)))
topo_written=.true. topo_written=.true.
endif endif
else !HM or TR else if (partopt(np)%name.eq.'HM') then !HM
call nf90_err(nf90_inq_varid(ncid=ncid,name=trim(partopt(np)%short_name),varid=tempIDend)) call nf90_err(nf90_inq_varid(ncid=ncid,name=trim(partopt(np)%short_name),varid=tempIDend))
call nf90_err(nf90_put_var(ncid,tempIDend,hmix(0:nx-1,0:ny-1,1,memind(1)), & call nf90_err(nf90_put_var(ncid,tempIDend,hmix(0:nx-1,0:ny-1,1,memind(1)), &
(/ tpointer_part,1,1 /),(/ 1,nx,ny /))) (/ tpointer_part,1,1 /),(/ 1,nx,ny /)))
else !TR
call nf90_err(nf90_inq_varid(ncid=ncid,name=trim(partopt(np)%short_name),varid=tempIDend))
call nf90_err(nf90_put_var(ncid,tempIDend,tropopause(0:nx-1,0:ny-1,1,memind(1)), &
(/ tpointer_part,1,1 /),(/ 1,nx,ny /)))
endif endif
else if (partopt(np)%name.eq.'MA') then else if (partopt(np)%name.eq.'MA') then
......
./current/ ./current/
./output/ ./output/
./default_winds/ ./testdata/
./default_winds/AVAILABLE ./default_winds/AVAILABLE
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment