Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CHS
MPR
Commits
f95e3f66
Commit
f95e3f66
authored
Mar 31, 2021
by
Robert Schweppe
Browse files
- fixed bug in CMakeLists.txt
- removed info message in mo_mpr_coordinate.f90 according to
#54
parent
048ae3db
Pipeline
#20917
failed with stages
in 17 minutes and 26 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mo_mpr_coordinate.f90
View file @
f95e3f66
...
...
@@ -129,12 +129,11 @@ contains
coordIndex
=
get_index_in_coordinate
(
dimIdentifier
)
nCoords
=
get_n_initialized
(
MPR_COORDINATES
)
if
(
coordIndex
(
1
)
>
nCoords
)
then
log_info
(
*
)
"Coordinate name '"
,
trim
(
dimIdentifier
),
"' is not found in target coordinates."
,
&
" Add the target coordinate or an appropriate alias in the file "
,
trim
(
filenameNamelistMprDefault
)
if
(
present
(
ierr
))
then
ierr
=
1_i4
else
log_error
(
*
)
"The previous info message is a critical error"
log_error
(
*
)
"Coordinate name '"
,
trim
(
dimIdentifier
),
"' is not defined explicitly."
,
&
" Add the target coordinate or an appropriate alias in the file "
,
trim
(
filenameNamelistMprDefault
)
stop
1
end
if
return
...
...
@@ -157,7 +156,6 @@ contains
errorMessage
=
"Coordinate id '"
//
trim
(
compress
(
num2str
(
dimIdentifier
)))//
"' is not found in target coordinates."
//
&
" Add the target coordinate or an appropriate alias in the file "
//
trim
(
filenameNamelistMprDefault
)
if
(
present
(
ierr
))
then
log_debug
(
*
)
trim
(
errorMessage
)
ierr
=
1_i4
else
log_error
(
*
)
trim
(
errorMessage
)
...
...
@@ -189,7 +187,6 @@ contains
errorMessage
=
"Coordinate dim '"
//
trim
(
dimIdentifier
%
name
)//
"' is not found in target coordinates."
//
&
" Add the target coordinate or an appropriate alias in the file "
//
trim
(
filenameNamelistMprDefault
)
if
(
present
(
ierr
))
then
log_debug
(
*
)
trim
(
errorMessage
)
ierr
=
1_i4
else
log_error
(
*
)
trim
(
errorMessage
)
...
...
src_python/pre_proc/CMakeLists.txt
View file @
f95e3f66
...
...
@@ -7,7 +7,7 @@ find_package(Python3 COMPONENTS Interpreter)
if
(
PYTHON3_FOUND
)
# TODO: this is another dirty hack, as CMake has problems detecting the right Python version in lieu of
# conda or virtualenv
if
(
DEFINED
$
ENV{PYTHON}
)
if
(
DEFINED ENV{PYTHON}
)
set
(
Python3_EXECUTABLE $ENV{PYTHON}
)
message
(
STATUS
"Overwriting Python3_EXECUTABLE to "
${
Python3_EXECUTABLE
}
" as set in env var 'PYTHON'"
)
endif
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment