OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'upstream/master' into tof_utilities

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-10-29 08:46:26 +01:00
commit 87169cfa86
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m4/ax_lapack.m4
View File

@ -104,7 +104,7 @@ fi
# don't probe if explicitly defined; by bailing out here if the
# argument is set, we guard against typo, incompatible libs. etc.
# being inadvertedly overrided by another (random) implementation
if test "x$with_lapack" == x; then
if test "x$with_lapack" = x; then
# LAPACK linked to by default? (is sometimes included in BLAS lib)
if test $ax_lapack_ok = no; then

4
m4/cxx0x_compiler.m4
View File

@ -33,7 +33,7 @@ AC_DEFUN([GXX0X],[
dune_cv_gplusplus_accepts_cplusplus11=disabled
fi
])
if test "x$dune_cv_gplusplus_accepts_cplusplus11" == "xyes" ; then
if test "x$dune_cv_gplusplus_accepts_cplusplus11" = "xyes" ; then
CXX="$save_CXX -std=c++11"
CXXCPP="$CXXCPP -std=c++11"
else
@ -56,7 +56,7 @@ AC_DEFUN([GXX0X],[
dune_cv_gplusplus_accepts_cplusplus0x=disabled
fi
])
if test "x$dune_cv_gplusplus_accepts_cplusplus0x" == "xyes" ; then
if test "x$dune_cv_gplusplus_accepts_cplusplus0x" = "xyes" ; then
CXX="$save_CXX -std=c++0x"
CXXCPP="$CXXCPP -std=c++0x"
else

2
m4/ert.m4
View File

@ -48,7 +48,7 @@ AS_IF([test x"${with_ert}" != x"no"],
LDFLAGS="${_ert_LDFLAGS_SAVE}"
CFLAGS="${_ert_CFLAGS_SAVE}"
AS_IF([test x"${use_ert}" == x"yes"],
AS_IF([test x"${use_ert}" = x"yes"],
[AC_SUBST([ERT_CPPFLAGS])
AC_SUBST([ERT_LDFLAGS])
AC_SUBST([ERT_LIBS])

2
opm/core/vag_format/vag.cpp
View File

@ -64,7 +64,7 @@ namespace OPM
}
//cout << endl;
}
if(!(int(pos_struct.value.size())==pos_struct.pos[n])){
if(int(pos_struct.value.size()) != pos_struct.pos[n]){
cerr << "Failed to read pos structure" << endl;
cerr << "pos_struct.value.size()" << pos_struct.value.size() << endl;
cerr << "pos_struct.pos[n+1]" << pos_struct.pos[n] << endl;

4
opm/core/wells/WellsGroup.cpp
View File

@ -783,7 +783,7 @@ namespace Opm
&& (injSpec().control_mode_ != InjectionSpecification::GRUP && injSpec().control_mode_ != InjectionSpecification::NONE)) {
return;
}
if (!wells_->type[self_index_] == INJECTOR) {
if (wells_->type[self_index_] != INJECTOR) {
ASSERT(target == 0.0);
return;
}
@ -860,7 +860,7 @@ namespace Opm
std::cout << "Returning" << std::endl;
return;
}
if (!wells_->type[self_index_] == PRODUCER) {
if (wells_->type[self_index_] != PRODUCER) {
ASSERT(target == 0.0);
return;
}