Merge branch 'master' of github.com:UG4/ugcore

.github/workflows/jenkins-trigger.yml

@@ -1,25 +1,24 @@
 name: Trigger Jenkins CI
+
 # Controls when the workflow will run
 on:
   # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    name: Build
+  trigger-jenkins-job:
     runs-on: ubuntu-latest
     steps:
-      - name: Trigger jenkins job
-        uses: anaegel/jenkins-githubaction@master
+      - id: triggerjenkinsjob
+        uses: mickeygoussetorg/trigger-jenkins-job@v1
         with:
-          url: ${{ secrets.JENKINS_URL }}
-          job_name: ug-build-pipeline
-          username: ${{ secrets.JENKINS_USER }}
-          api_token: ${{ secrets.JENKINS_TOKEN }}
-          timeout: "3600"
-          interval: "300"
+          jenkins-server:  ${{ secrets.JENKINS_URL }} # URL of the jenkins server. ex: http://myjenkins.acme.com:8080
+          jenkins-job: "ug-build-pipeline" # The name of the jenkins job to run
+          jenkins-username: ${{ secrets.JENKINS_USER }} # user name for accessing jenkins
+          jenkins-pat: ${{ secrets.JENKINS_TOKEN }} # personal Access token for accessing Jenkins
+          poll-time: 90 # how often (seconds) to poll the jenkins server for results
+          timeout-value: 3600 # How long (seconds) to poll before timing out the action
+          verbose: true # true/false - turns on extra logging

scripts/shell/schedulers/pbs-generic

@@ -82,7 +82,7 @@ function UJS_Submit
 			exit
 		fi
 		jobid=`echo $jobid | sed 's/\([0-9]*\).*/\1/'`
-	fi
+	fi	
 }
 
 

ugbase/bridge/grid_bridges/file_io_bridge.cpp

@@ -35,6 +35,7 @@
 #include "lib_grid/multi_grid.h"
 #include "lib_grid/file_io/file_io.h"
 #include "lib_grid/file_io/file_io_ugx.h"
+#include "lib_grid/file_io/file_io_vtu.h"
 
 using namespace std;
 
@@ -77,6 +78,13 @@ bool SaveGridHierarchy(MultiGrid& mg, const char* filename)
 	return SaveGridToFile(mg, mg.get_hierarchy_handler(), filename);
 }
 
+void SetVTURegionOfInterestIdentifier( char const * regOfInt )
+{
+	PROFILE_FUNC_GROUP("grid");
+	GridReaderVTU::setRegionOfInterestIdentifier( std::string( regOfInt ) );
+	return;
+}
+
 
 void RegisterGridBridge_FileIO(Registry& reg, string parentGroup)
 {
@@ -129,7 +137,8 @@ void RegisterGridBridge_FileIO(Registry& reg, string parentGroup)
 		.add_function("SaveParallelGridLayout", &SaveParallelGridLayout,
 				grp, "", "mg#filename#offset")
 		.add_function("SaveSurfaceViewTransformed", &SaveSurfaceViewTransformed)
-		.add_function("SaveGridLevelToFile", &SaveGridLevelToFile);
+		.add_function("SaveGridLevelToFile", &SaveGridLevelToFile)
+		.add_function("SetVTURegionOfInterestIdentifier", static_cast<void (*)(char const *)>(&SetVTURegionOfInterestIdentifier) );
 }
 
 }//	end of namespace

ugbase/lib_grid/CMakeLists.txt

@@ -83,6 +83,7 @@ set(srcAlgorithms	algorithms/debug_util.cpp
 					algorithms/extrusion/extrude.cpp
 					algorithms/extrusion/cylinder_extrusion.cpp
 					algorithms/extrusion/expand_layers.cpp
+					algorithms/extrusion/expand_layers_arte.cpp
 					algorithms/projections/overlying_subset_finder.hpp
 					algorithms/projections/z_ray_tracer.hpp
 					refinement/projectors/projection_handler.cpp

ugbase/lib_grid/algorithms/extrusion/expand_layers.cpp

@@ -705,7 +705,6 @@ bool ExpandFractures2d(Grid& grid, SubsetHandler& sh, const vector<FractureInfo>
 	return true;
 }
 
-
 /**	Selects all involved geometic objects and assigns marks to them.
  * If required, som edges may be split, so that we always operate
  * on a fully expandable fracture.