Revision: 76738
http://sourceforge.net/p/brlcad/code/76738
Author: starseeker
Date: 2020-08-13 17:02:24 +0000 (Thu, 13 Aug 2020)
Log Message:
-----------
Separate out reference files
Modified Paths:
--------------
brlcad/branches/RELEASE/regress/weight/CMakeLists.txt
brlcad/branches/RELEASE/regress/weight/weight.sh
Added Paths:
-----------
brlcad/branches/RELEASE/regress/weight/weight.ref
brlcad/branches/RELEASE/regress/weight/weight.test2.ref
Modified: brlcad/branches/RELEASE/regress/weight/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/regress/weight/CMakeLists.txt 2020-08-13
16:46:04 UTC (rev 76737)
+++ brlcad/branches/RELEASE/regress/weight/CMakeLists.txt 2020-08-13
17:02:24 UTC (rev 76738)
@@ -8,6 +8,8 @@
CMAKEFILES(
weight.sh
+ weight.ref
+ weight.test2.ref
)
# list of temporary files
@@ -19,13 +21,11 @@
weight.mged
weight.out
weight.out_ns
- weight.ref
weight.ref_ns
weight.test2.g
weight.test2.mged
weight.test2.out
weight.test2.out_ns
- weight.test2.ref
weight.test2.ref_ns
)
Added: brlcad/branches/RELEASE/regress/weight/weight.ref
===================================================================
(Binary files differ)
Index: brlcad/branches/RELEASE/regress/weight/weight.ref
===================================================================
--- brlcad/branches/RELEASE/regress/weight/weight.ref 2020-08-13 16:46:04 UTC
(rev 76737)
+++ brlcad/branches/RELEASE/regress/weight/weight.ref 2020-08-13 17:02:24 UTC
(rev 76738)
Property changes on: brlcad/branches/RELEASE/regress/weight/weight.ref
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: brlcad/branches/RELEASE/regress/weight/weight.sh
===================================================================
--- brlcad/branches/RELEASE/regress/weight/weight.sh 2020-08-13 16:46:04 UTC
(rev 76737)
+++ brlcad/branches/RELEASE/regress/weight/weight.sh 2020-08-13 17:02:24 UTC
(rev 76738)
@@ -82,47 +82,9 @@
rm -f weight.out
run $RTWEIGHT -a 25 -e 35 -s128 -o weight.out weight.g box.r
-rm -f weight.ref
-cat >> weight.ref <<EOF
-RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Day Mon 0 00:00:00 0000
-
-
-Density Table Used:/path/to/.density
-
-Material Density(g/cm^3) Name
- 1 7.8295 steel
- Weight by region name (in grams, density given in g/cm^3):
-
- Weight Matl LOS Material Name Density Name
--------- ------ --- --------------- ------- -------------
- 7.829 1 100 steel 7.8295 /box.r
- Weight by region ID (in grams):
-
- ID Weight Region Names
------ -------- --------------------
- 1000 7.829 /box.r
- RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Day Mon 0 00:00:00 0000
-
-
-Total volume = 0.999991 cm^3
-
-Centroid: X = 0.5 cm
- Y = 0.5 cm
- Z = 0.5 cm
-
-Total mass = 7.82943 grams
-
-EOF
-
# eliminate the time stamp lines which are obviously different and
# the file path which is not germane to the test
-tr -d ' \t' < weight.ref | grep -v DensityTableUsed | grep -v TimeStamp >
weight.ref_ns
+tr -d ' \t' < "$PATH_TO_THIS/weight.ref" | grep -v DensityTableUsed | grep -v
TimeStamp > weight.ref_ns
tr -d ' \t' < weight.out | grep -v DensityTableUsed | grep -v TimeStamp >
weight.out_ns
run cmp weight.ref_ns weight.out_ns
@@ -192,60 +154,9 @@
run $RTWEIGHT -a 25 -e 35 -s128 -o weight.test2.out weight.test2.g boxes
-rm -f weight.test2.ref
-cat >> weight.test2.ref <<EOF
-RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Sat Jan 14 09:01:50 2012
-
-
-Density Table Used:/path/to/.density
-
-Material Density(g/cm^3) Name
- 2 7.8200 Carbon Tool Steel
- 3 2.7000 Aluminum, 6061-T6
- 4 2.7400 Aluminum, 7079-T6
- 6 19.3200 Gold, pure
- 7 8.0300 Stainless, 18Cr-8Ni
- 8 7.4700 Stainless 27Cr
- 9 7.7150 Steel, tool
- 10 7.8400 Carbon Steel
- 12 3.0000 Gunner
- 14 10.0000 Fuel
- Weight by region name (in grams, density given in g/cm^3):
-
- Weight Matl LOS Material Name Density Name
--------- ------ --- --------------- ------- -------------
- 7.822 2 100 Carbon Tool Ste 7.8200 /boxes/box1.r
- 8.021 7 100 Stainless, 18Cr 8.0300 /boxes/box2.r
- 3.001 12 100 Gunner 3.0000 /boxes/box3.r
- Weight by region ID (in grams):
-
- ID Weight Region Names
------ -------- --------------------
- 1000 15.843 /boxes/box1.r
- /boxes/box2.r
- 1010 3.001 /boxes/box3.r
- RT Weight Program Output:
-
-Database Title: "Untitled BRL-CAD Database"
-Time Stamp: Sat Jan 14 09:01:50 2012
-
-
-Total volume = 2.99933 cm^3
-
-Centroid: X = 1.98812 cm
- Y = 1.98833 cm
- Z = 1.98831 cm
-
-Total mass = 18.8433 grams
-
-EOF
-
# eliminate the time stamp lines which are obviously different and
# the file path which is not germane to the test
-tr -d ' \t' < weight.test2.ref | grep -v DensityTableUsed | grep -v TimeStamp
> weight.test2.ref_ns
+tr -d ' \t' < "$PATH_TO_THIS/weight.test2.ref" | grep -v DensityTableUsed |
grep -v TimeStamp > weight.test2.ref_ns
tr -d ' \t' < weight.test2.out | grep -v DensityTableUsed | grep -v TimeStamp
> weight.test2.out_ns
run cmp weight.test2.ref_ns weight.test2.out_ns
Added: brlcad/branches/RELEASE/regress/weight/weight.test2.ref
===================================================================
(Binary files differ)
Index: brlcad/branches/RELEASE/regress/weight/weight.test2.ref
===================================================================
--- brlcad/branches/RELEASE/regress/weight/weight.test2.ref 2020-08-13
16:46:04 UTC (rev 76737)
+++ brlcad/branches/RELEASE/regress/weight/weight.test2.ref 2020-08-13
17:02:24 UTC (rev 76738)
Property changes on: brlcad/branches/RELEASE/regress/weight/weight.test2.ref
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
