Merge pull request #925 from gforney/master

add scripts and update smokeview to output cell centered slices to json files
firemodels · Jan 13, 2020 · 93a1e64 · 93a1e64
2 parents 2cfdd0a + c366c78
commit 93a1e64
Show file tree

Hide file tree

Showing 37 changed files with 366 additions and 149 deletions.
diff --git a/Build/dem2fds/data/campfire.bat b/Build/dem2fds/data/campfire.bat
@@ -0,0 +1,19 @@
+@echo off
+:: generate terrain with &GEOM
+set option=-geom
+
+set dem2fds=..\intel_win_64\dem2fds_win_64.exe
+set dem2fds=dem2fds
+set "terrain1=%userprofile%\terrain"
+set "terrain2=%userprofile%\Google drive\documents\terrain"
+
+set terrain=
+if EXIST "%terrain1%" set "terrain=%terrain1%"
+if EXIST "%terrain2%" set "terrain=%terrain2%"
+if NOT "x%terrain%" == "x" goto endif1
+  echo ***error: the terrain file directory does not exist
+  exit /b
+:endif1
+
+%dem2fds% %option%       -dir "%terrain%\campfire" campfire1.in 
+%dem2fds% %option% -show -dir "%terrain%\campfire" campfire2.in 
diff --git a/Build/dem2fds/data/cfire.in → Build/dem2fds/data/campfire1.in b/Build/dem2fds/data/cfire.in → Build/dem2fds/data/campfire1.in
diff --git a/Build/dem2fds/data/cfire2.ini → Build/dem2fds/data/campfire1.ini b/Build/dem2fds/data/cfire2.ini → Build/dem2fds/data/campfire1.ini
@@ -1,4 +1,4 @@
-# NIST Smokeview configuration file, Release Aug 20 2019
+# NIST Smokeview configuration file, Release Jan  9 2020
 
 
  ------------ global ini settings ------------
@@ -52,6 +52,10 @@ FLIP
  1
 FOREGROUNDCOLOR
  1.000000 1.000000 1.000000
+GEOMSELECTCOLOR
+ 255 255 255
+ 0 0 0
+ 255 128 0
 HEATOFFCOLOR
  1.000000 0.000000 0.000000
 HEATONCOLOR
@@ -97,13 +101,18 @@ SPRINKONCOLOR
  0.000000 1.000000 0.000000
 STATICPARTCOLOR
  0.000000 1.000000 0.000000
+SURFCOLORS
+ 1 0
+ 121 116 48 : surf1
 TIMEBARCOLOR
  0.600000 0.600000 0.600000
 VENTCOLOR
  1.000000 0.000000 1.000000
 
    *** SIZES/OFFSETS ***
 
+GEOMSAXIS
+ 1.000000 1.000000
 GRIDLINEWIDTH
  2.000000
 ISOLINEWIDTH
@@ -153,9 +162,9 @@ VENTOFFSET
 WINDOWOFFSET
  45
 WINDOWWIDTH
- 1248
+ 800
 WINDOWHEIGHT
- 1255
+ 640
 
  *** DATA LOADING ***
 
@@ -174,7 +183,7 @@ NOPART
 PARTFAST
  0 0 4
 RESEARCHMODE
- 1
+ 1 1
 SHOWFEDAREA
  1
 SLICEAVERAGE
@@ -186,7 +195,7 @@ SLICEZIPSTEP
 SMOKE3DZIPSTEP
  1
 USER_ROTATE
- 0 0 0.384253 0.500000 0.032253
+ 0 0 0.384408 0.500000 0.034456
 
  *** VIEW PARAMETERS ***
 
@@ -200,6 +209,8 @@ BEAM
  1 4.000000 0 0 0 0
 BLENDMODE
  0 0 0
+BOUNDARYMESH
+ 0
 BOUNDARYTWOSIDE
  0
 CLIP
@@ -215,11 +226,11 @@ EYEVIEW
 EYEX
  0.500000
 EYEY
- -1.020437
+ -1.020847
 EYEZ
  0.500000
 FONTSIZE
- 0
+ 1
 FIREPARAMS
  1.000000 0.500000 0.100000 0.800000 0.900000 0.000000 300.000000 0.000000
 FRAMERATEVALUE
@@ -228,8 +239,6 @@ FREEZEVOLSMOKE
  0 1
 GEOMBOUNDARYPROPS
  1 0 0 5.000000 5.000000
-GEOMOFFSET
- 0.000000 0.000000 0.000000 0
 GEOMCELLPROPS
  2
  2 2 2
@@ -240,10 +249,14 @@ GEOMDIAGS
  0 0 0 0 0 0 0
 GEOMDOMAIN
  1 1
+GEOMOFFSET
+ 0.000000 0.000000 0.000000 0
 GEOMSHOW
  0 1 1 0 1 0 0.500000 2.000000
  0 0 1 0
  1.000000 30.000000
+GEOMSLICEPROPS
+ 5.000000 5.000000
 GVERSION
  0
 GVECDOWN
@@ -285,9 +298,9 @@ SHOWCEILING
 SHOWCOLORBARS
  1 0
 SHOWCVENTS
- 0 0
+ 2 0
 SHOWDUMMYVENTS
- 1
+ 0
 SHOWEVACSLICES
  0 1 0
 SHOWFIRECUTOFF
@@ -297,7 +310,7 @@ SHOWFLOOR
 SHOWFRAME
  0
 SHOWFRAMELABEL
- 0
+ 1
 SHOWFRAMERATE
  0
 SHOWGRID
@@ -313,13 +326,13 @@ SHOWISO
 SHOWISONORMALS
  0
 SHOWLABELS
- 0
+ 1
 SHOWMEMLOAD
  0
 SHOWOPENVENTS
  0 0
 SHOWOTHERVENTS
- 1
+ 0
 SHOWSENSORS
  1 1
 SHOWSLICEINOBST
@@ -331,7 +344,7 @@ SHOWSPRINKPART
 SHOWSTREAK
  0 0 1 -2
 SHOWTERRAIN
- 0
+ 3
 SHOWTETRAS
  1 0
 SHOWTHRESHOLD
@@ -343,7 +356,7 @@ SHOWTIMEBAR
 SHOWTIMELABEL
  1
 SHOWTITLE
- 0
+ 0 0
 SHOWCHID
  0
 SHOWTRACERSALWAYS
@@ -363,7 +376,7 @@ SHOWROOMS
 SHOWTARGETS
  1 
 SHOWVENTS
- 1
+ 0
 SHOWWALLS
  0 0
 SKIPEMBEDSLICE
@@ -409,18 +422,18 @@ ZOOM
 CELLCENTERTEXT
  0
 INPUT_FILE
- cfire2.fds
+ campfire1.fds
 LABELSTARTUPVIEW
  view 2
 RENDERCLIP
  0 0 0 0 0
 RENDERFILELABEL
  0
 RENDERFILETYPE
- 0 0
+ 0 1
 MOVIEFILETYPE
 MOVIEFILETYPE
- 0 10 5000 1 17
+ 1 10 5000 1 17
 RENDEROPTION
  993 1 512
 UNITCLASSES
@@ -481,6 +494,8 @@ SHOWZONEFIRE
 
  *** TOUR INFO ***
 
+SHOWAVATAR
+ 1
 SHOWPATHNODES
  0
 SHOWTOURROUTE
@@ -498,7 +513,7 @@ TOURCONSTANTVEL
 VIEWALLTOURS
  0
 VIEWTIMES
- 0.000000 0.010000 1000
+ 0.000000 30.000000 200
 VIEWTOURFROMPATH
  0
 
@@ -519,6 +534,18 @@ GSLICEPARMS
  0 0 0 0
  4274.307617 5559.601074 502.141083
  0.000000 90.000000
+TICKLABEL
+ 409.141571 1650.211182 441.288788 1.000000 1.000000 1.000000 0.000000 10.000000 0 0
+ 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0
+ event 1 - 0->10s
+TICKLABEL
+ 2970.190430 4656.718750 544.207031 1.000000 1.000000 1.000000 10.000000 20.000000 0 0
+ 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0
+ event 2 - 10->20s
+TICKLABEL
+ 5004.051758 8154.215820 1073.466064 1.000000 1.000000 1.000000 20.000000 30.000000 0 0
+ 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0
+ event 3 - 20->30s
 LOADFILESATSTARTUP
  0
 MSCALE
@@ -554,9 +581,37 @@ SMOKE3DCUTOFFS
  1.000000 0.507220
 TOURCIRCLE
 4274.307617 5559.601074 502.141052 4274.307617 5559.601074 502.141052 20834.478516 0.000000TOURINDEX
- -1
+ 3
+TOURS
+ 3
+ Circular
+ 16 1 0.000000 0 1
+ 0.0 25108.800781 5559.601074 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.000667 23307.552734 14033.746094 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.001333 18215.292969 21042.636719 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.002 10712.515625 25374.369141 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.002667 2096.510742 26279.947266 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.003333 -6142.932617 23602.789063 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.004 -12581.141602 17805.798828 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.004667 -16104.888672 9891.331055 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.005333 -16104.888672 1227.867188 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.006 -12581.137695 -6686.600098 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.006667 -6142.929688 -12483.587891 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.007333 2096.51416 -15160.744141 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.008 10712.517578 -14255.164063 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.008667 18215.296875 -9923.431641 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.009333 23307.552734 -2914.541504 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ 0.01 25108.785156 5559.604492 502.141052  1  4274.307617 5559.601074 502.141052 0.0 0.0 0.0 1.0  0
+ Tour 2
+ 2 1 0.000000 0 1
+ 0.0 -1.0 -1.0 10000.0  1  0.0 0.0 0.0 0.0 0.0 0.0 1.0  0
+ 0.01 8549.615234 11120.200195 10000.099609  1  0.0 0.0 0.0 0.0 0.0 0.0 1.0  0
+ Tour 4
+ 2 1 0.000000 0 1
+ 0.0 -1.0 -1.0 10000.0  1  0.0 0.0 0.0 0.0 0.0 0.0 1.0  0
+ 30.0 8549.615234 11120.200195 10000.0  1  0.0 0.0 0.0 0.0 0.0 0.0 1.0  0
 USERTICKS
- 0 1 5 1 1 1 1.000000
+ 0 1 5 1 1 1 1.000000 1
  0.000000 0.000000 119.018639
  0.000000 0.000000 119.018639
  8548.615234 11119.202148 885.263489
@@ -604,7 +659,7 @@ V_PLOT3D
 V_TARGET
  0 1.000000 0 0.000000
 VIEWPOINT5
- 0 1 2
+ 0 1 4
  0.348041 -1.174209 0.034456 1.000000 2
  0.000000 0.000000 0.000000 0
  0.384408 0.500000 0.034456
@@ -618,6 +673,19 @@ VIEWPOINT5
  view 1
 VIEWPOINT5
  0 1 3
+ 0.389085 -1.030730 -0.073254 1.000000 2
+ 0.000000 0.000000 0.000000 0
+ 0.384408 0.500000 0.034456
+ -1.000000 50.000000
+ 1.000000 0.000000 0.000000 0.000000
+ 0.000000 1.000000 0.000000 0.000000
+ 0.000000 0.000000 1.000000 0.000000
+ 0.000000 0.000000 0.000000 1.000000
+ 0 0 0 0 0 0 0
+ -8.548615 -11.119203 118.252396 8557.164063 11130.321289 886.029724
+ view 3
+VIEWPOINT5
+ 0 1 2
  0.379580 -0.749753 -0.073254 1.000000 2
  0.000000 0.000000 0.000000 0
  0.384408 0.500000 0.034456
@@ -635,10 +703,10 @@ VIEWPOINT5
 # -------------------------
 
 # Smokeview Version: Test
-# Smokeview Build: SMV6.7.8-34-gf73c19cdf-dirty
-# Smokeview Build Date: Aug 20 2019
-# FDS Version: FDS6.7.1-891-gc691886f7-master
-# FDS Build: unknown
+# Smokeview Build: unknown
+# Smokeview Build Date: Jan  9 2020
+# FDS Version: FDS6.7.3-299-gc8762c9c7-master
+# FDS Build: FDS6.7.3-299-gc8762c9c7-master
 # Platform: WIN64
 
 

diff --git a/Build/dem2fds/data/cfire2.in → Build/dem2fds/data/campfire2.in b/Build/dem2fds/data/cfire2.in → Build/dem2fds/data/campfire2.in
diff --git a/Build/dem2fds/data/cfire.ini → Build/dem2fds/data/campfire2.ini b/Build/dem2fds/data/cfire.ini → Build/dem2fds/data/campfire2.ini
diff --git a/Build/dem2fds/data/cfire.bat b/Build/dem2fds/data/cfire.bat
diff --git a/Build/smokeview/scripts/set_smv_opts.bat → Build/scripts/set_smv_opts.bat b/Build/smokeview/scripts/set_smv_opts.bat → Build/scripts/set_smv_opts.bat
@@ -6,6 +6,8 @@ set GLUT=glut
 set ICON=
 set inc=
 set release=
+set SMV_PROFILEFLAG=
+set SMV_PROFILESTRING=
 set setglut=
 set smv_mpi=false
 set stopscript=0
@@ -61,6 +63,11 @@ goto eof
    set valid=1
    set smv_mpi=true
  )
+ if /I "%1" EQU "-profile" (
+   set valid=1
+   set SMV_PROFILEFLAG=-pg
+   set SMV_PROFILESTRING=p
+ )
  if /I "%1" EQU "-release" (
    set valid=1
    set release=-r

diff --git a/Build/scripts/setopts.sh b/Build/scripts/setopts.sh
@@ -34,8 +34,8 @@ case $OPTION in
    TESTFLAG=$TESTFLAG" -D pp_MPI"
   ;;
   p)
-   SMV_MAKE_OPTS=$SMV_MAKE_OPTS"SMV_PROFILEFLAG=\"-p\" "
-   SMV_MAKE_OPTS=$SMV_MAKE_OPTS"SMV_PROFILESTRING=\"profile\" "
+   SMV_MAKE_OPTS=$SMV_MAKE_OPTS"SMV_PROFILEFLAG=\"-pg\" "
+   SMV_MAKE_OPTS=$SMV_MAKE_OPTS"SMV_PROFILESTRING=\"p\" "
   ;;
   q)
    QUARTZ=use_quartz