Merge remote-tracking branch 'origin/master' into develop.mol

CONFIG: set API level to 2106 in ramp-up for release
2021-06-18 17:17:11 +02:00 · 2021-06-18 17:17:11 +02:00 · 521a9e4dd6
commit 521a9e4dd6
parent e2148b587e 3b29395a66
3 changed files with 4 additions and 4 deletions
--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@ -1,2 +1,2 @@
-api=2103
-patch=210414
+api=2106
+patch=0
--- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
+++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
@ -1250,7 +1250,7 @@ bool Foam::functionObjects::fieldValues::surfaceFieldValue::write()


    // Process the fields
-    if (vectorWeights.size())
+    if (returnReduce(!vectorWeights.empty(), orOp<bool>()))
    {
        if (scalarWeights.size())
        {
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@ -1,5 +1,5 @@
 #-------------------------------*- makefile -*---------------------------------
-WM_VERSION = OPENFOAM=2103
+WM_VERSION = OPENFOAM=2106

 AR         = ar
 ARFLAGS    = cr