Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cdo
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mpim-sw
cdo
Commits
bddb3caf
Commit
bddb3caf
authored
1 year ago
by
Uwe Schulzweida
Browse files
Options
Downloads
Patches
Plain Diff
Replace throw() by noexcept
parent
d88b782d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!143
M214003/develop
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
config/default
+8
-7
8 additions, 7 deletions
config/default
src/cdo_syntax_error.cc
+1
-1
1 addition, 1 deletion
src/cdo_syntax_error.cc
src/cdo_syntax_error.h
+1
-1
1 addition, 1 deletion
src/cdo_syntax_error.h
with
10 additions
and
9 deletions
config/default
+
8
−
7
View file @
bddb3caf
...
...
@@ -355,7 +355,6 @@ case "${HOSTNAME}" in
;;
# levante
levante
*
)
INTELONEAPI
=
/sw/spack-levante/intel-oneapi-compilers-2022.0.1-an2cbq/compiler/2022.0.1/linux
NETCDFPATH
=
/sw/spack-levante/netcdf-c-4.8.1-qk24yp
HDF5PATH
=
/sw/spack-levante/hdf5-1.12.1-akf2kp
UDUNITS2PATH
=
/sw/spack-levante/udunits-2.2.28-da6pla
...
...
@@ -382,23 +381,25 @@ case "${HOSTNAME}" in
LDFLAGS
=
"
$LDFLAGS
-Wl,-rpath,
$HDF5PATH
/lib"
LDFLAGS
=
"
$LDFLAGS
-Wl,-rpath,
$UDUNITS2PATH
/lib"
# LDFLAGS="$LDFLAGS -Wl,-rpath,$PROJPATH/lib"
LDFLAGS
=
"
$LDFLAGS
-Wl,-rpath,
$INTELONEAPI
/compiler/lib/intel64"
LDFLAGS
=
"
$LDFLAGS
-L
$FFTW3PATH
/lib -Wl,-rpath,
$FFTW3PATH
/lib"
LDFLAGS
=
"
$LDFLAGS
-Wl,-rpath,/sw/spack-levante/gcc-11.2.0-bcn7mb/lib64"
if
test
"
$COMP
"
=
intel
;
then
INTELONEAPI
=
/sw/spack-levante/intel-oneapi-compilers-2022.0.1-an2cbq/compiler/2022.0.1/linux
LDFLAGS
=
"
$LDFLAGS
-Wl,-rpath,
$INTELONEAPI
/compiler/lib/intel64"
${
CONFPATH
}
configure
--prefix
=
$HOME
/local
\
$CDOLIBS
\
LDFLAGS
=
"
$LDFLAGS
"
\
F77
=
ifx
FFLAGS
=
"-g -O2"
\
CXX
=
icpx
CXXFLAGS
=
"-g -Wall -O2
-march=core-avx2
-I
${
FFTW3PATH
}
/include"
\
CXX
=
icpx
CXXFLAGS
=
"-g -Wall -O2 -I
${
FFTW3PATH
}
/include"
\
CC
=
icx
CFLAGS
=
"-g -Wall -O2"
elif
test
"
$COMP
"
=
pgi
;
then
${
CONFPATH
}
configure
--
without
-fortran
\
${
CONFPATH
}
configure
--
disable
-fortran
--disable-openmp
\
$CDOLIBS
\
LDFLAGS
=
"
$LDFLAGS
-lpgf90 -lpgf90_rpm1 -lpgf902 -lpgf90rtl -lpgftnrtl -lnspgc
-lpgc -lrt -lm -lgcc -lc -lgcc"
\
LDFLAGS
=
"
$LDFLAGS
-lpgc -lrt -lm -lgcc -lc -lgcc"
\
F77
=
pgf90
\
CXX
=
pgc++
CXXFLAGS
=
"-g -
fast
-D_REENTRANT -I
${
FFTW3PATH
}
/include"
\
CC
=
pgcc
CFLAGS
=
"-g -
fast
-D_REENTRANT"
CXX
=
pgc++
CXXFLAGS
=
"-g -
O2
-D_REENTRANT -I
${
FFTW3PATH
}
/include"
\
CC
=
pgcc
CFLAGS
=
"-g -
O2
-D_REENTRANT"
elif
test
"
$COMP
"
=
clang
;
then
${
CONFPATH
}
configure
--disable-fortran
\
$CDOLIBS
LIBS
=
"-lm"
\
...
...
This diff is collapsed.
Click to expand it.
src/cdo_syntax_error.cc
+
1
−
1
View file @
bddb3caf
...
...
@@ -38,7 +38,7 @@ CdoSyntaxError::CdoSyntaxError(InternalCdoSyntaxError &e, std::vector<std::strin
}
const
char
*
CdoSyntaxError
::
what
()
const
throw
()
CdoSyntaxError
::
what
()
const
noexcept
{
return
message
.
c_str
();
};
This diff is collapsed.
Click to expand it.
src/cdo_syntax_error.h
+
1
−
1
View file @
bddb3caf
...
...
@@ -19,7 +19,7 @@ struct CdoSyntaxError : InternalCdoSyntaxError
CdoSyntaxError
(
InternalCdoSyntaxError
&
e
,
std
::
vector
<
std
::
string
>
&
p_argv
);
CdoSyntaxError
(
InternalCdoSyntaxError
&
e
);
const
char
*
what
()
const
throw
()
override
;
const
char
*
what
()
const
noexcept
override
;
};
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment