Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: remove parms library #582

Closed
wants to merge 17 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/fesom2.1.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

name: FESOM2 main test

# Controls when the action will run. Triggers the workflow on push or pull request.
# Controls when the action will run. Triggers the workflow on push or pull request.

on: [push, pull_request]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fesom2_icepack.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

name: FESOM2_icepack

# Controls when the action will run. Triggers the workflow on push or pull request.
# Controls when the action will run. Triggers the workflow on push or pull request.

on: [push, pull_request]

Expand Down
8 changes: 0 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ include Makefile.in

all:
make metis
make parms
make cleanfesom
make fesom_ini
make cleanfesom
Expand All @@ -11,26 +10,19 @@ all:
metis:
make -C ./lib/metis-5.1.0

parms:
make -C ./lib/parms

fesom_ini:
make -C ./src run_ini

fesom:
make -C ./src run

cleanparms:
make -C ./lib/parms cleanall

cleanmetis:
make -C ./lib/metis-5.1.0 clean

cleanfesom:
make -C ./src clean

cleanall:
make cleanparms
make cleanmetis
make cleanfesom

Expand Down
7 changes: 2 additions & 5 deletions Makefile.in_gnu_impi
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MPICC = mpicc
MPIFC = mpif90
LD = $(MPIFC)

# Optimization specs for compiler - used for FESOM an parms.
# Optimization specs for compiler - used for FESOM.
# Metis falls back to conservative and non-compiler specific -O2, as
# it is only used in the less runtime-critical setup phase.
OPT = -O3 -march=native -funroll-loops -ffree-line-length-none
Expand Down Expand Up @@ -35,11 +35,8 @@ MPI_INC =
METIS_DEFS = -DMETIS_VERSION=5 -DPART_WEIGHTED -DMETISRANDOMSEED=35243
# METISRANDDOMSEED: any integer

# Used to compile the fesom wrapper to parms
PARMS_DEFS = -DUSE_MPI -DREAL=double -DDBL -DVOID_POINTER_SIZE_8

#######################################################
# for pARMS and metis Library, archive and options
# for metis Library, archive and options

AR = ar qv
RANLIB = ranlib
7 changes: 2 additions & 5 deletions Makefile.in_intel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MPICC = mpiicc
MPIFC = mpiifort
LD = $(MPIFC)

# Optimization specs for compiler - used for FESOM an parms.
# Optimization specs for compiler - used for FESOM.
# Metis falls back to conservative and non-compiler specific -O2, as
# it is only used in the less runtime-critical setup phase.
OPT = -O3 -r8 -fp-model precise -xHost -ip -implicitnone -static-intel
Expand Down Expand Up @@ -35,11 +35,8 @@ MPI_INC =
METIS_DEFS = -DMETIS_VERSION=5 -DPART_WEIGHTED -DMETISRANDOMSEED=35243
# METISRANDDOMSEED: any integer

# Used to compile the fesom wrapper to parms
PARMS_DEFS = -DUSE_MPI -DREAL=double -DDBL -DVOID_POINTER_SIZE_8

#######################################################
# for pARMS and metis Library, archive and options
# for metis Library, archive and options

AR = ar qv
RANLIB = ranlib
2 changes: 1 addition & 1 deletion env/bsc/shell
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

module load intel/2017.4 impi/2017.4 mkl/2017.4 bsc/1.0 netcdf/4.2
module load intel/2020.1 impi/2018.4 mkl/2020.1 bsc/1.0 netcdf/4.2

export FC=mpiifort CC=mpiicc CXX=mpiicpc

Expand Down
21 changes: 0 additions & 21 deletions lib/parms/CMakeLists.txt

This file was deleted.

28 changes: 0 additions & 28 deletions lib/parms/COPYRIGHT

This file was deleted.

Loading
Loading