From 594a836693ccf12ebaeb686a9ad8a03cd169395f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 18 Jun 2020 11:29:07 +0200
Subject: [PATCH] STYLE: use simpler libs () syntax
---
README.md | 21 ++++++++-----------
.../system/autoAreaToVolumeMapping | 11 +++++-----
tutorials/simpleslope/system/gridfileWrite | 14 ++++++-------
tutorials/simpleslope/system/shapefileWrite | 11 +++++-----
tutorials/wolfsgrube/system/areaWrite | 2 +-
.../wolfsgrube/system/autoAreaToVolumeMapping | 11 +++++-----
tutorials/wolfsgrube/system/gridfileWrite | 16 +++++++-------
tutorials/wolfsgrube/system/shapefileWrite | 11 +++++-----
8 files changed, 43 insertions(+), 54 deletions(-)
diff --git a/README.md b/README.md
index 9dac31a..1d3078c 100644
--- a/README.md
+++ b/README.md
@@ -605,9 +605,8 @@ Parameters:
```java
shapefileWrite
{
- type shapefileWrite;
-
- libs ("libfaAvalanche.so");
+ type shapefileWrite;
+ libs (faAvalanche);
//fields (".*"); //All fields
fields (h Us);
@@ -653,13 +652,12 @@ Parameters:
```java
gridfileWrite
{
- type gridfileWrite;
-
- secondOrder on;
+ type gridfileWrite;
+ libs (faAvalanche);
- libs ("libfaAvalanche.so");
+ fields (h Us);
- fields (h Us);
+ secondOrder on;
writeOption autoWrite;
//writeOption anyWrite;
@@ -690,11 +688,10 @@ Parameters:
```java
autoAreaToVolumeMapping
{
- type autoAreaToVolumeMapping;
-
- libs ("libfaAvalanche.so");
+ type autoAreaToVolumeMapping;
+ libs (faAvalanche);
- fields (".*");
+ fields (".*");
writeOption autoWrite;
//writeOption anyWrite;
diff --git a/tutorials/simpleslope/system/autoAreaToVolumeMapping b/tutorials/simpleslope/system/autoAreaToVolumeMapping
index c142e8e..e520b5d 100644
--- a/tutorials/simpleslope/system/autoAreaToVolumeMapping
+++ b/tutorials/simpleslope/system/autoAreaToVolumeMapping
@@ -1,13 +1,12 @@
// -*- C++ -*-
-// Use the areaWrite function object
+// Use autoAreaToVolumeMapping function object
autoAreaToVolumeMapping
{
- type autoAreaToVolumeMapping;
-
- libs ("libfaAvalanche.so");
-
- fields (".*");
+ type autoAreaToVolumeMapping;
+ libs (faAvalanche);
+
+ fields (".*");
writeOption autoWrite;
//writeOption noWrite;
diff --git a/tutorials/simpleslope/system/gridfileWrite b/tutorials/simpleslope/system/gridfileWrite
index e74e972..3c43ee8 100644
--- a/tutorials/simpleslope/system/gridfileWrite
+++ b/tutorials/simpleslope/system/gridfileWrite
@@ -1,15 +1,14 @@
// -*- C++ -*-
-// Use the areaWrite function object
+// Use gridfileWrite function object
gridfileWrite
{
- type gridfileWrite;
-
- secondOrder on;
+ type gridfileWrite;
+ libs (faAvalanche);
+
+ fields (".*");
- libs ("libfaAvalanche.so");
-
- fields (".*");
+ secondOrder on;
writeOption autoWrite;
//writeOption noWrite;
@@ -17,7 +16,6 @@ gridfileWrite
postfix ".asc";
-
dx 0.01;
dy 0.01;
}
diff --git a/tutorials/simpleslope/system/shapefileWrite b/tutorials/simpleslope/system/shapefileWrite
index 2f2fbe7..6ee63bd 100644
--- a/tutorials/simpleslope/system/shapefileWrite
+++ b/tutorials/simpleslope/system/shapefileWrite
@@ -1,13 +1,12 @@
// -*- C++ -*-
-// Use the areaWrite function object
+// Use shapefileWrite function object
shapefileWrite
{
- type shapefileWrite;
-
- libs ("libfaAvalanche.so");
-
- fields (".*");
+ type shapefileWrite;
+ libs (faAvalanche);
+
+ fields (".*");
writeOption autoWrite;
//writeOption noWrite;
diff --git a/tutorials/wolfsgrube/system/areaWrite b/tutorials/wolfsgrube/system/areaWrite
index dd2b052..0c03e77 100644
--- a/tutorials/wolfsgrube/system/areaWrite
+++ b/tutorials/wolfsgrube/system/areaWrite
@@ -4,7 +4,7 @@
areaWrite
{
type areaWrite;
- libs ("libutilityFunctionObjects.so");
+ libs (utilityFunctionObjects);
log true;
writeControl writeTime;
diff --git a/tutorials/wolfsgrube/system/autoAreaToVolumeMapping b/tutorials/wolfsgrube/system/autoAreaToVolumeMapping
index c142e8e..e520b5d 100644
--- a/tutorials/wolfsgrube/system/autoAreaToVolumeMapping
+++ b/tutorials/wolfsgrube/system/autoAreaToVolumeMapping
@@ -1,13 +1,12 @@
// -*- C++ -*-
-// Use the areaWrite function object
+// Use autoAreaToVolumeMapping function object
autoAreaToVolumeMapping
{
- type autoAreaToVolumeMapping;
-
- libs ("libfaAvalanche.so");
-
- fields (".*");
+ type autoAreaToVolumeMapping;
+ libs (faAvalanche);
+
+ fields (".*");
writeOption autoWrite;
//writeOption noWrite;
diff --git a/tutorials/wolfsgrube/system/gridfileWrite b/tutorials/wolfsgrube/system/gridfileWrite
index 3928a61..b9be7aa 100644
--- a/tutorials/wolfsgrube/system/gridfileWrite
+++ b/tutorials/wolfsgrube/system/gridfileWrite
@@ -1,15 +1,14 @@
// -*- C++ -*-
-// Use the areaWrite function object
+// Use gridfileWrite function object
gridfileWrite
{
- type gridfileWrite;
-
- secondOrder on;
+ type gridfileWrite;
+ libs (faAvalanche);
+
+ fields (".*");
- libs ("libfaAvalanche.so");
-
- fields (".*");
+ secondOrder on;
writeOption autoWrite;
//writeOption noWrite;
@@ -26,9 +25,8 @@ gridfileWrite
postfix ".asc";
- //offset is interpreterpreted such that the same signs than in gridToSTLDict can be used
+ //offset is interpreted such that the same signs than in gridToSTLDict can be used
offset (5000.0 -220000.0 0);
-
}
// ************************************************************************* //
diff --git a/tutorials/wolfsgrube/system/shapefileWrite b/tutorials/wolfsgrube/system/shapefileWrite
index 5529829..d6238db 100644
--- a/tutorials/wolfsgrube/system/shapefileWrite
+++ b/tutorials/wolfsgrube/system/shapefileWrite
@@ -1,13 +1,12 @@
// -*- C++ -*-
-// Use the areaWrite function object
+// Use shapefileWrite function object
shapefileWrite
{
- type shapefileWrite;
-
- libs ("libfaAvalanche.so");
-
- fields (".*");
+ type shapefileWrite;
+ libs (faAvalanche);
+
+ fields (".*");
writeOption autoWrite;
//writeOption noWrite;
--
GitLab