Merge pull request #93 from UG4/arte-merge

Arte merge
UG4 · Jul 18, 2024 · fec4fe7 · fec4fe7
2 parents 9a75dc9 + 069afe1
commit fec4fe7
Show file tree

Hide file tree

Showing 9 changed files with 4,016 additions and 9 deletions.
diff --git a/scripts/shell/schedulers/pbs-generic b/scripts/shell/schedulers/pbs-generic
@@ -82,7 +82,7 @@ function UJS_Submit
 			exit
 		fi
 		jobid=`echo $jobid | sed 's/\([0-9]*\).*/\1/'`
-	fi
+	fi	
 }
 
 

diff --git a/ugbase/bridge/grid_bridges/file_io_bridge.cpp b/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

diff --git a/ugbase/lib_grid/CMakeLists.txt b/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