diff --git a/ApplicationLibCode/Application/RiaTimer.h b/ApplicationLibCode/Application/RiaTimer.h index 727cb58a60..0a9f6df8ca 100644 --- a/ApplicationLibCode/Application/RiaTimer.h +++ b/ApplicationLibCode/Application/RiaTimer.h @@ -36,7 +36,7 @@ class RiaTimer : public QObject, public caf::SignalEmitter public: RiaTimer(); - ~RiaTimer(); + ~RiaTimer() override; void start( int intervalMs = 1000 ); void stop(); diff --git a/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLocal.h b/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLocal.h index b4d5d1bf9e..c33717b67b 100644 --- a/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLocal.h +++ b/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLocal.h @@ -30,7 +30,7 @@ class RimBatchQueueLocal : public RimBatchQueue public: RimBatchQueueLocal(); - ~RimBatchQueueLocal(); + ~RimBatchQueueLocal() override; void queueProcess( std::shared_ptr process, int nProcessesPerTask ) override; void stopProcess() override; diff --git a/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLsf.h b/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLsf.h index 68aa2cae0f..11e1563d51 100644 --- a/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLsf.h +++ b/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueLsf.h @@ -30,7 +30,7 @@ class RimBatchQueueLsf : public RimBatchQueueSlurm public: RimBatchQueueLsf(); - ~RimBatchQueueLsf(); + ~RimBatchQueueLsf() override; QStringList generateCommand( QString script, QString jobName, diff --git a/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueSlurm.h b/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueSlurm.h index d4a1c588f9..72bab475ff 100644 --- a/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueSlurm.h +++ b/ApplicationLibCode/ProjectDataModel/Batch/RimBatchQueueSlurm.h @@ -32,7 +32,7 @@ class RimBatchQueueSlurm : public RimBatchQueue public: RimBatchQueueSlurm( RiaDefines::BatchSchedulerType schedulerType = RiaDefines::BatchSchedulerType::SLURM ); - ~RimBatchQueueSlurm(); + ~RimBatchQueueSlurm() override; void queueProcess( std::shared_ptr process, int nProcessesPerTask ) override; void stopProcess() override; diff --git a/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputTool.cpp b/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputTool.cpp index 5383c1477a..ec25b79c03 100644 --- a/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputTool.cpp +++ b/ApplicationLibCode/ReservoirDataModel/SimulationFile/RigSimulationInputTool.cpp @@ -1407,7 +1407,7 @@ static std::optional const double size2 = cellProperties->cellSize[d2]; double perm1 = cellProperties->permeability[d1]; double perm2 = cellProperties->permeability[d2]; - if ( !( perm1 > 0.0 && perm2 > 0.0 ) ) + if ( perm1 <= 0.0 || perm2 <= 0.0 ) { perm1 = 1.0; perm2 = 1.0; @@ -1443,7 +1443,7 @@ static std::optional const double originalDenominator = std::log( originalRadius / wellRadius ) + skin; const double refinedDenominator = std::log( refinedRadius / wellRadius ) + skin; - if ( !( wellRadius > 0.0 && originalDenominator > 0.0 && refinedDenominator > 0.0 ) ) + if ( wellRadius <= 0.0 || originalDenominator <= 0.0 || refinedDenominator <= 0.0 ) { warning( std::format( "refined pressure equivalent radius {:.4g} is too small compared to well radius {:.4g}", refinedRadius, wellRadius ) );