Skip to content

Commit ad9e8a3

Browse files
seb-wahlseb-wahl
committed
get focioifs-5.0 going on glogin with gcc11 and openmpi 4.1.7
fixed nemo.yaml and xios.yaml to correctly use arch files for gnu and intel
1 parent 7a1c104 commit ad9e8a3

9 files changed

Lines changed: 240 additions & 54 deletions

File tree

‎configs/components/nemo/nemo.yaml‎

Lines changed: 90 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ nemo:
2525
cd ..
2626

2727
archfile: ESMTOOLS_generic_oasis_intel
28-
choose_computer.name:
29-
glogin:
30-
choose_computer.compiler_mpi:
31-
gcc11_ompi416:
32-
archfile: ESMTOOLS_generic_oasis_GNU
33-
levante:
34-
choose_computer.compiler_mpi:
35-
gnu11_ompi4:
36-
archfile: ESMTOOLS_generic_oasis_gnu
28+
# choose_computer.name:
29+
# glogin:
30+
# choose_computer.compiler_mpi:
31+
# gcc11_ompi417:
32+
# archfile: ESMTOOLS_generic_oasis_gnu
33+
# gcc14_ompi417:
34+
# archfile: ESMTOOLS_generic_oasis_gnu
35+
# levante:
36+
# choose_computer.compiler_mpi:
37+
# gnu11_ompi4:
38+
# archfile: ESMTOOLS_generic_oasis_gnu
3739

3840
destination: ${version}
3941
install_bins: BLD/bin/oceanx
@@ -350,7 +352,7 @@ nemo:
350352
./makenemo -n ${version} -m ${archfile} -r ${version} -j 24 ;
351353
cp -p cfgs/${version}/BLD/bin/nemo.exe cfgs/${version}/BLD/bin/oceanx
352354
clean_command: ./makenemo -n ${nemo.version} -m ${archfile} -r ${nemo.version} clean
353-
archfile: ESMTOOLS_generic_oasis_intel
355+
#archfile: ESMTOOLS_generic_oasis_intel
354356
destination: nemo-${nemo.version}
355357
install_bins: cfgs/${nemo.version}/BLD/bin/oceanx
356358

@@ -646,6 +648,15 @@ nemo:
646648
cp -p cfgs/${version}/BLD/bin/nemo.exe cfgs/${version}/BLD/bin/oceanx
647649
clean_command: ./makenemo -n ${nemo.version} -m ${archfile} -r ${version} clean
648650
#archfile: ESMTOOLS_generic_oasis_gnu
651+
choose_computer.compiler_mpi:
652+
gcc11_ompi417:
653+
archfile: ESMTOOLS_generic_oasis_gnu
654+
gcc14_ompi417:
655+
archfile: ESMTOOLS_generic_oasis_gnu
656+
gnu11_ompi4:
657+
archfile: ESMTOOLS_generic_oasis_gnu
658+
"*":
659+
archfile: ESMTOOLS_generic_oasis_intel
649660
destination: nemo-${nemo.version}
650661
install_bins: cfgs/${nemo.version}/BLD/bin/oceanx
651662

@@ -769,7 +780,7 @@ nemo:
769780
./makenemo -n ${version} -m ${archfile} -r ${version} -j 24 ;
770781
cp -p cfgs/${version}/BLD/bin/nemo.exe cfgs/${version}/BLD/bin/oceanx
771782
clean_command: ./makenemo -n ${nemo.version} -m ${archfile} -r ${nemo.version} clean
772-
archfile: ESMTOOLS_generic_oasis_intel
783+
#archfile: ESMTOOLS_generic_oasis_intel
773784
destination: nemo-${nemo.version}
774785
install_bins: cfgs/${nemo.version}/BLD/bin/oceanx
775786

@@ -905,11 +916,15 @@ nemo:
905916
./makenemo -n ${version} -m ${archfile} -r eORCA_SI3_AGRIF_COUPLED_NEMO5 -j 24 ;
906917
cp -p cfgs/${version}/BLD/bin/nemo.exe cfgs/${version}/BLD/bin/oceanx
907918
clean_command: ./makenemo -n ${nemo.version} -m ${archfile} -r eORCA_SI3_AGRIF_COUPLED_NEMO5 clean
908-
choose_computer.compiler_mpi:
909-
gnu11_ompi4:
910-
archfile: ESMTOOLS_generic_oasis_gnu
911-
"*":
912-
archfile: ESMTOOLS_generic_oasis_intel
919+
choose_computer.compiler_mpi:
920+
gcc11_ompi417:
921+
archfile: ESMTOOLS_generic_oasis_gnu
922+
gcc14_ompi417:
923+
archfile: ESMTOOLS_generic_oasis_gnu
924+
gnu11_ompi4:
925+
archfile: ESMTOOLS_generic_oasis_gnu
926+
"*":
927+
archfile: ESMTOOLS_generic_oasis_intel
913928
destination: nemo-${nemo.version}
914929
install_bins: cfgs/${nemo.version}/BLD/bin/oceanx
915930

@@ -1120,7 +1135,7 @@ nemo:
11201135
./makenemo -n ${version} -m ${archfile} -r ICE_AGRIF_CPL -j 24 ;
11211136
cp -p cfgs/${version}/BLD/bin/nemo.exe cfgs/${version}/BLD/bin/oceanx
11221137
clean_command: ./makenemo -n ${nemo.version} -m ${archfile} -r ICE_AGRIF_CPL clean
1123-
archfile: ESMTOOLS_generic_oasis_intel
1138+
#archfile: ESMTOOLS_generic_oasis_intel
11241139
destination: nemo-${nemo.version}
11251140
install_bins: cfgs/${nemo.version}/BLD/bin/oceanx
11261141

@@ -1455,11 +1470,16 @@ nemo:
14551470
./makenemo -n ${version} -m ${archfile} -r ${version} -j 24 ;
14561471
cp -p cfgs/${version}/BLD/bin/nemo.exe cfgs/${version}/BLD/bin/oceanx
14571472
clean_command: ./makenemo -n ${nemo.version} -m ${archfile} -r ${version} clean
1458-
choose_computer.compiler_mpi:
1459-
gnu11_ompi4:
1460-
archfile: ESMTOOLS_generic_oasis_gnu
1461-
"*":
1462-
archfile: ESMTOOLS_generic_oasis_intel
1473+
#archfile: ESMTOOLS_generic_oasis_intel
1474+
choose_computer.compiler_mpi:
1475+
gcc11_ompi417:
1476+
archfile: ESMTOOLS_generic_oasis_gnu
1477+
gcc14_ompi417:
1478+
archfile: ESMTOOLS_generic_oasis_gnu
1479+
gnu11_ompi4:
1480+
archfile: ESMTOOLS_generic_oasis_gnu
1481+
"*":
1482+
archfile: ESMTOOLS_generic_oasis_intel
14631483
destination: nemo-${nemo.version}
14641484
install_bins: cfgs/${nemo.version}/BLD/bin/oceanx
14651485

@@ -1575,7 +1595,16 @@ nemo:
15751595
branch: master
15761596
destination: nemo-${nemo.version}/CONFIG/${nemo.version}
15771597
git-repository: https://git.geomar.de/foci/src/nemo_config/${nemo.version}.git
1578-
archfile: ESMTOOLS_generic_oasis_intel_agrif
1598+
#archfile: ESMTOOLS_generic_oasis_intel_agrif
1599+
choose_computer.compiler_mpi:
1600+
gcc11_ompi417:
1601+
archfile: ESMTOOLS_generic_oasis_gnu
1602+
gcc14_ompi417:
1603+
archfile: ESMTOOLS_generic_oasis_gnu
1604+
gnu11_ompi4:
1605+
archfile: ESMTOOLS_generic_oasis_gnu
1606+
"*":
1607+
archfile: ESMTOOLS_generic_oasis_intel_agrif
15791608

15801609
# use tracer in AGRIF?
15811610
use_tracer: false
@@ -1692,7 +1721,16 @@ nemo:
16921721
branch: master
16931722
destination: nemo-${nemo.version}/CONFIG/${nemo.version}
16941723
git-repository: https://git.geomar.de/foci/src/nemo_config/${nemo.version}.git
1695-
archfile: ESMTOOLS_generic_oasis_intel_agrif
1724+
#archfile: ESMTOOLS_generic_oasis_intel_agrif
1725+
choose_computer.compiler_mpi:
1726+
gcc11_ompi417:
1727+
archfile: ESMTOOLS_generic_oasis_gnu
1728+
gcc14_ompi417:
1729+
archfile: ESMTOOLS_generic_oasis_gnu
1730+
gnu11_ompi4:
1731+
archfile: ESMTOOLS_generic_oasis_gnu
1732+
"*":
1733+
archfile: ESMTOOLS_generic_oasis_intel_agrif
16961734

16971735
# use tracer in AGRIF?
16981736
use_tracer_agrif: true
@@ -1807,7 +1845,15 @@ nemo:
18071845
branch: esm-tools
18081846
destination: nemo-${nemo.version}/CONFIG/${nemo.version}
18091847
git-repository: https://git.geomar.de/foci/src/nemo_config/${nemo.version}.git
1810-
archfile: ESMTOOLS_generic_oasis_intel_agrif
1848+
choose_computer.compiler_mpi:
1849+
gcc11_ompi417:
1850+
archfile: ESMTOOLS_generic_oasis_gnu
1851+
gcc14_ompi417:
1852+
archfile: ESMTOOLS_generic_oasis_gnu
1853+
gnu11_ompi4:
1854+
archfile: ESMTOOLS_generic_oasis_gnu
1855+
"*":
1856+
archfile: ESMTOOLS_generic_oasis_intel_agrif
18111857

18121858
# use tracer in AGRIF?
18131859
use_tracer_agrif: true
@@ -1953,7 +1999,15 @@ nemo:
19531999
branch: esm-tools
19542000
destination: nemo-${nemo.version}/CONFIG/${nemo.version}
19552001
git-repository: https://git.geomar.de/foci/src/nemo_config/${nemo.version}.git
1956-
archfile: ESMTOOLS_generic_oasis_intel_agrif
2002+
choose_computer.compiler_mpi:
2003+
gcc11_ompi417:
2004+
archfile: ESMTOOLS_generic_oasis_gnu
2005+
gcc14_ompi417:
2006+
archfile: ESMTOOLS_generic_oasis_gnu
2007+
gnu11_ompi4:
2008+
archfile: ESMTOOLS_generic_oasis_gnu
2009+
"*":
2010+
archfile: ESMTOOLS_generic_oasis_intel_agrif
19572011

19582012
# use tracer in AGRIF?
19592013
use_tracer_agrif: true
@@ -2093,7 +2147,16 @@ nemo:
20932147
branch: esm-tools
20942148
git-repository: https://git.geomar.de/foci/src/nemo_config/ORCA05_LIM2_FOCI_AGRIF_MOPS.git
20952149
destination: nemo-${nemo.version}/CONFIG/${nemo.version}
2096-
archfile: ESMTOOLS_generic_oasis_intel_agrif
2150+
#archfile: ESMTOOLS_generic_oasis_intel_agrif
2151+
choose_computer.compiler_mpi:
2152+
gcc11_ompi417:
2153+
archfile: ESMTOOLS_generic_oasis_gnu
2154+
gcc14_ompi417:
2155+
archfile: ESMTOOLS_generic_oasis_gnu
2156+
gnu11_ompi4:
2157+
archfile: ESMTOOLS_generic_oasis_gnu
2158+
"*":
2159+
archfile: ESMTOOLS_generic_oasis_intel_agrif
20972160

20982161
# use tracer in AGRIF?
20992162
use_tracer_agrif: true

‎configs/components/oasis3mct/oasis3mct.env.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@ computer:
2323
CCFLAGS: '"-fPIC"'
2424
FFLAGS: '"-fPIC"'
2525
FCFLAGS: '"-fPIC"'
26+
glogin:
27+
choose_compiler_mpi:
28+
gcc11_ompi417:
29+
add_export_vars:
30+
OASIS_FFLAGS: '"-fPIC -O3 -fallow-argument-mismatch -fallow-invalid-boz -ffree-line-length-512"'
31+
OASIS_CFLAGS: '"-fPIC -O3"'
32+
CFLAGS: '"-fPIC"'
33+
CCFLAGS: '"-fPIC"'
34+
FFLAGS: '"-fPIC"'
35+
FCFLAGS: '"-fPIC"'
36+
gcc14_ompi417:
37+
add_export_vars:
38+
OASIS_FFLAGS: '"-fPIC -O3 -fallow-argument-mismatch -fallow-invalid-boz -ffree-line-length-512"'
39+
OASIS_CFLAGS: '"-fPIC -O3"'
40+
CFLAGS: '"-fPIC"'
41+
CCFLAGS: '"-fPIC"'
42+
FFLAGS: '"-fPIC"'
43+
FCFLAGS: '"-fPIC"'
2644
albedo:
2745
choose_computer.compiler_suite:
2846
gcc:

‎configs/components/oifs/oifs43.env.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ computer:
285285
OIFS_CFLAGS: '"-qopenmp -fp-model precise -O3 -g -traceback -xCORE_AVX2 -qopt-report=0 -std=gnu89"'
286286
OIFS_CCDEFS: '"LINUX LITTLE INTEGER_IS_INT _ABI64 BLAS"'
287287

288-
gcc11_ompi416:
288+
gcc11_ompi417:
289289
add_export_vars:
290290
LAPACK_LIB: '"-mkl=sequential"'
291291
LAPACK_LIB_DEFAULT: '"-L$MKLROOT/lib/intel64 -lmkl_intel_lp64 -lmkl_core -lmkl_sequential"'

‎configs/components/rnfmap/rnfmap.env.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@ computer:
2323
#OIFS_FC: $FC
2424

2525
choose_computer.name:
26+
glogin:
27+
add_export_vars:
28+
# oasis
29+
RNF_OASIS_BASE: '$(pwd)/oasis'
30+
RNF_OASIS_INCLUDE: '"-I$RNF_OASIS_BASE/build/lib/psmile -I$RNF_OASIS_BASE/build/lib/psmile/scrip -I$RNF_OASIS_BASE/build/lib/psmile/mct -I$RNF_OASIS_BASE/build/lib/psmile/mct/mpeu"'
31+
RNF_OASIS_LIB: '"-L$RNF_OASIS_BASE/build/lib/psmile -L$RNF_OASIS_BASE/build/lib/psmile/scrip -L$RNF_OASIS_BASE/build/lib/psmile/mct -L$RNF_OASIS_BASE/build/lib/psmile/mct/mpeu -lpsmile -lmct -lmpeu -lscrip"'
32+
# netcdf
33+
RNF_NETCDF_INCLUDE: '"-I$NETCDFROOT/include"'
34+
RNF_NETCDF_LIB: '"-L$NETCDFROOT/lib -lnetcdf"'
35+
RNF_NETCDFF_INCLUDE: '"-I$NETCDFFROOT/include"'
36+
RNF_NETCDFF_LIB: '"-L$NETCDFFROOT/lib -lnetcdff"'
37+
RNF_MPI_LIB: '"$MPI_LIB"'
38+
# compilers and compile switches
39+
choose_computer.compiler_mpi:
40+
"*":
41+
add_export_vars:
42+
RNF_FFLAGS: '"-fdefault-real-8 -O3 -fopenmp -g -fbacktrace -fconvert=big-endian"'
43+
RNF_CFLAG: '"-O3 -fopenmp -g -fbacktrace -fno-opt-report -fpe0"'
2644
juwels:
2745
add_export_vars:
2846
RNF_OASIS_BASE: '$(pwd)/oasis'

‎configs/components/rnfmap/rnfmap.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ computer:
250250
cflags: -fp-model precise -O3 -march=core-avx2 -mtune=core-avx2 -g -traceback -qopt-report=0 -fpe0
251251
glogin:
252252
choose_computer.compiler_mpi:
253-
gcc11_ompi416:
253+
gcc11_ompi417:
254254
fflags: -fdefault-real-8 -O3 -g -fbacktrace -fconvert=big-endian -fallow-argument-mismatch -fallow-invalid-boz
255255
cflags: -fdefault-real-8 -O3 -g -fbacktrace -fconvert=big-endian -fallow-argument-mismatch -fallow-invalid-boz
256256
'*':

‎configs/components/xios/xios.yaml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ xios:
183183
choose_computer.name:
184184
glogin:
185185
choose_computer.compiler_mpi:
186-
gcc11_ompi416:
187-
archfile: ESMTOOLS_generic_oasis_GNU
186+
gcc11_ompi417:
187+
archfile: ESMTOOLS_generic_oasis_gnu
188188
'*':
189189
archfile: ESMTOOLS_generic_oasis_intel
190190
'*':
@@ -206,8 +206,11 @@ xios:
206206
archfile: ESMTOOLS_generic_oasis_intel
207207
glogin:
208208
choose_computer.compiler_mpi:
209-
gcc11_ompi416:
210-
archfile: ESMTOOLS_generic_oasis_GNU
209+
# glogin's gcc14 environent
210+
gcc14_ompi417:
211+
archfile: ESMTOOLS_generic_oasis_gnu
212+
gcc11_ompi417:
213+
archfile: ESMTOOLS_generic_oasis_gnu
211214
'*':
212215
archfile: ESMTOOLS_generic_oasis_intel
213216
'*':

0 commit comments

Comments
 (0)