Merge branch 'develop-pre-release' of...

Merge branch 'develop-pre-release' of develop.openfoam.com:Development/OpenFOAM-plus into develop-pre-release

applications/test/checkDecomposePar/Make/files

 Test-checkDecomposePar.C
 
-EXE = $(FOAM_APPBIN)/Test-checkDecomposePar
+EXE = $(FOAM_USER_APPBIN)/Test-checkDecomposePar

applications/test/surfaceMeshConvert/Make/files

 Test-surfaceMeshConvert.C
 
-EXE = $(FOAM_APPBIN)/Test-surfaceMeshConvert
+EXE = $(FOAM_USER_APPBIN)/Test-surfaceMeshConvert

applications/test/surfaceReading/Make/files

 Test-surfaceReading.C
 
-EXE = $(FOAM_APPBIN)/Test-surfaceReading
+EXE = $(FOAM_USER_APPBIN)/Test-surfaceReading

bin/mergedDyM → bin/deprecated/mergedDyMsolver

@@ -23,7 +23,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
-#     mergedDyM
+#     mergedDyMsolver
 #
 # Description
 #     Script to inform that dynamic mesh (DyM) functionality has been

bin/interDyMFoam

-mergedDyM
\ No newline at end of file
+deprecated/mergedDyMsolver
\ No newline at end of file

bin/multiphaseInterDyMFoam

-mergedDyM
\ No newline at end of file
+deprecated/mergedDyMsolver
\ No newline at end of file

bin/pimpleDyMFoam

-mergedDyM
\ No newline at end of file
+deprecated/mergedDyMsolver
\ No newline at end of file

bin/rhoPimpleDyMFoam

-mergedDyM
\ No newline at end of file
+deprecated/mergedDyMsolver
\ No newline at end of file

tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/system/scripts/writeMesh.py

-from paraview.simple import *
-from paraview import coprocessing
-
-#--------------------------------------------------------------
-# Code generated from cpstate.py to create the CoProcessor.
-# paraview version 5.5.0
-
-#--------------------------------------------------------------
-# Global screenshot output options
-imageFileNamePadding=0
-rescale_lookuptable=False
-
-# ----------------------- CoProcessor definition -----------------------
-
-def CreateCoProcessor():
-  def _CreatePipeline(coprocessor, datadescription):
-    class Pipeline:
-      # a producer from a simulation input
-      input1 = coprocessor.CreateProducer(datadescription, 'mesh')
-
-      writer1 = servermanager.writers.XMLMultiBlockDataWriter(Input=input1)
-      coprocessor.RegisterWriter(writer1, filename='insitu/mesh_%t.vtm', freq=1, paddingamount=0)
-
-    return Pipeline()
-
-  class CoProcessor(coprocessing.CoProcessor):
-    def CreatePipeline(self, datadescription):
-      self.Pipeline = _CreatePipeline(self, datadescription)
-
-  coprocessor = CoProcessor()
-  # Frequencies at which the coprocessor updates.
-  freqs = {'mesh': [5]}
-  coprocessor.SetUpdateFrequencies(freqs)
-  return coprocessor
-
-
-#--------------------------------------------------------------
-# Global variable that will hold the pipeline for each timestep
-# Creating the CoProcessor object, doesn't actually create the ParaView pipeline.
-# It will be automatically setup when coprocessor.UpdateProducers() is called the
-# first time.
-coprocessor = CreateCoProcessor()
-
-#--------------------------------------------------------------
-# Enable Live-Visualizaton with ParaView and the update frequency
-coprocessor.EnableLiveVisualization(False, 1)
-
-# ---------------------- Data Selection method ----------------------
-
-def RequestDataDescription(datadescription):
-    "Callback to populate the request for current timestep"
-    global coprocessor
-    if datadescription.GetForceOutput() == True:
-        # We are just going to request all fields and meshes from the simulation
-        # code/adaptor.
-        for i in range(datadescription.GetNumberOfInputDescriptions()):
-            datadescription.GetInputDescription(i).AllFieldsOn()
-            datadescription.GetInputDescription(i).GenerateMeshOn()
-        return
-
-    # setup requests for all inputs based on the requirements of the
-    # pipeline.
-    coprocessor.LoadRequestedData(datadescription)
-
-# ------------------------ Processing method ------------------------
-
-def DoCoProcessing(datadescription):
-    "Callback to do co-processing for current timestep"
-    global coprocessor
-
-    # Update the coprocessor by providing it the newly generated simulation data.
-    # If the pipeline hasn't been setup yet, this will setup the pipeline.
-    coprocessor.UpdateProducers(datadescription)
-
-    # Write output data, if appropriate.
-    coprocessor.WriteData(datadescription);
-
-    # Write image capture (Last arg: rescale lookup table), if appropriate.
-    coprocessor.WriteImages(datadescription, rescale_lookuptable=rescale_lookuptable,
-        image_quality=0, padding_amount=imageFileNamePadding)
-
-    # Live Visualization, if enabled.
-    coprocessor.DoLiveVisualization(datadescription, "localhost", 22222)