From b1d0e9c5beefcad1cdcc407020056a6e45fa80d7 Mon Sep 17 00:00:00 2001 From: gforney Date: Fri, 1 Jul 2016 14:12:49 -0400 Subject: [PATCH 01/12] smokeview source: optimize 360 rendering code Former-commit-id: 58c5479cbdc451cc6f61051f0c67e2ffbf8aa3bf [formerly d798e9c73307faf6245472d00b0e353e65610115] Former-commit-id: 59a6d8ab3ee2268e4db656840cda625b6d7ad95a Former-commit-id: f0dfe2c1e56fb326bba3bf4c60855128c654d685 From 5083d9ff5ba9c7f28c40092952b85f28b6de16a2 Mon Sep 17 00:00:00 2001 From: gforney Date: Sun, 3 Jul 2016 23:14:29 -0400 Subject: [PATCH 02/12] smokeview source: fix bug and remove unused variables in classify geometry routine Former-commit-id: 40f46e82d08dd47b8b76cae4603627cb5a9beeeb [formerly 2ccfeadeba8d30531088035b91f40ba51c792c8c] Former-commit-id: 3082c41673e760c36cdddc18c167a3fd553ee6a7 Former-commit-id: fb80edbeb4fb3bd1aa05e5aba2b2f5639395736f From b0e09dd2a876089dfafb76bd0424ade8bdb810fa Mon Sep 17 00:00:00 2001 From: gforney Date: Sun, 3 Jul 2016 23:18:09 -0400 Subject: [PATCH 03/12] smokeview source: interim 360 rendering commit Former-commit-id: b259fa0ca17dbbbd7369861e6773cbea38ce5272 [formerly 23ab27fffe6ce3f9db548a69e7fa7be366cf8b03] Former-commit-id: cbac93e72c714dd67ee20189e00c50df6ef2643f Former-commit-id: aeaa812df3e38dc9a48fd410d77ab455293070ac From 0e61714f03d694d6d60fd20bc97dc50e5e1c2af2 Mon Sep 17 00:00:00 2001 From: gforney Date: Mon, 4 Jul 2016 12:19:20 -0400 Subject: [PATCH 04/12] smv vv: add test case for 360 render option Former-commit-id: 9d57a91cd548847d90d2fc7dd304f926465b6e48 [formerly 6b0b4f18d57c773a213ead4a76719dd288676b1a] Former-commit-id: 5db37d90fd312474da715848b6732b0625713e4e Former-commit-id: 468d7691f0b5df3835247bfef3074e9d2160bb7b --- Verification/Visualization/render360.fds | 15 + Verification/Visualization/render360.ini | 603 +++++++++++++++++++++++ 2 files changed, 618 insertions(+) create mode 100644 Verification/Visualization/render360.fds create mode 100644 Verification/Visualization/render360.ini diff --git a/Verification/Visualization/render360.fds b/Verification/Visualization/render360.fds new file mode 100644 index 00000000000..6e498cb4db4 --- /dev/null +++ b/Verification/Visualization/render360.fds @@ -0,0 +1,15 @@ +&HEAD CHID='render360',TITLE='test generation of 360 deg render files' / + + +&MESH IJK=20,20,20, XB=0.0,10.0,0.0,10.0,0.0,10.0 / + +&OBST XB= 0.0,10.0, 0.0,10.0, 0.0, 0.0,COLOR="GRAY" / +&OBST XB= 0.0,10.0, 0.0,10.0,10.0,10.0,COLOR="WHITE" / +&OBST XB= 0.0, 0.0, 0.0,10.0, 0.0,10.0,COLOR="GREEN" / +&OBST XB=10.0,10.0, 0.0,10.0, 0.0,10.0,COLOR="YELLOW" / +&OBST XB= 0.0,10.0, 0.0, 0.0, 0.0,10.0,COLOR="BLUE" / +&OBST XB= 0.0,10.0,10.0,10.0, 0.0,10.0,COLOR="MAGENTA" / + +&TIME T_END=0. / Total simulation time + +&TAIL / diff --git a/Verification/Visualization/render360.ini b/Verification/Visualization/render360.ini new file mode 100644 index 00000000000..061c4ea8f67 --- /dev/null +++ b/Verification/Visualization/render360.ini @@ -0,0 +1,603 @@ +# NIST Smokeview configuration file, Release Jul 3 2016 + + + ------------ global ini settings ------------ + + *** COLOR/LIGHTING *** + +AMBIENTLIGHT + 0.600000 0.600000 0.600000 +BACKGROUNDCOLOR + 0.000000 0.000000 0.000000 +BLOCKCOLOR + 1.000000 0.800000 0.400000 +BLOCKSHININESS + 100.000000 +BLOCKSPECULAR + 0.000000 0.000000 0.000000 +BOUNDCOLOR + 0.500000 0.500000 0.500000 +COLORBAR + 12 1 -1 5 + 0.000000 0.000000 1.000000 + 0.000000 0.359375 1.000000 + 0.000000 0.718750 1.000000 + 0.000000 1.000000 0.921875 + 0.000000 1.000000 0.562500 + 0.000000 1.000000 0.203125 + 0.171875 1.000000 0.000000 + 0.531250 1.000000 0.000000 + 0.890625 1.000000 0.000000 + 1.000000 0.746032 0.000000 + 1.000000 0.380952 0.000000 + 1.000000 0.000000 0.000000 +COLOR2BAR + 8 + 1.000000 1.000000 1.000000 :white + 1.000000 1.000000 0.000000 :yellow + 0.000000 0.000000 1.000000 :blue + 1.000000 0.000000 0.000000 :red + 0.000000 1.000000 0.000000 :green + 1.000000 0.000000 1.000000 :magenta + 0.000000 1.000000 1.000000 :cyan + 0.000000 0.000000 0.000000 :black +COLORBAR_FLIP + 0 +COLORBAR_SPLIT + 0 0 0 64 64 255 + 0 192 0 255 0 0 + -1.000000 0.000000 1.000000 +DIFFUSELIGHT + 0.500000 0.500000 0.500000 +DIRECTIONCOLOR + 0.152941 0.250980 0.545098 +FLIP + 1 +FOREGROUNDCOLOR + 1.000000 1.000000 1.000000 +HEATOFFCOLOR + 1.000000 0.000000 0.000000 +HEATONCOLOR + 1.000000 0.000000 0.000000 +ISOCOLORS + 10.000000 0.800000 : shininess, default opaqueness + 0.700000 0.700000 0.700000 : specular + 10 : number of levels + 0.957255 0.000392 0.957255 0.800392 : red, green, blue, alpha (opaqueness) + 0.750000 0.800000 0.800000 0.800000 + 0.000000 0.960000 0.280000 0.800000 + 0.000000 0.000000 1.000000 0.800000 + 0.000000 0.718750 1.000000 0.800000 + 0.000000 1.000000 0.562500 0.800000 + 0.171875 1.000000 0.000000 0.800000 + 0.890625 1.000000 0.000000 0.800000 + 1.000000 0.380952 0.000000 0.800000 + 1.000000 0.000000 0.000000 0.800000 +COLORTABLE + 2 + 210 180 140 255 % tan + 178 34 34 255 % firebrick +LIGHT0 + 1 +LIGHT1 + 1 +LIGHTMODELLOCALVIEWER + 0 +LIGHTMODELSEPARATESPECULARCOLOR + 0 +LIGHTPOS0 + 1.000000 1.000000 4.000000 0.000000 +LIGHTPOS1 + -1.000000 1.000000 4.000000 0.000000 +SENSORCOLOR + 1.000000 1.000000 0.000000 +SENSORNORMCOLOR + 1.000000 1.000000 0.000000 +SETBW + 0 0 +SPRINKOFFCOLOR + 1.000000 0.000000 0.000000 +SPRINKONCOLOR + 0.000000 1.000000 0.000000 +STATICPARTCOLOR + 0.000000 1.000000 0.000000 +TIMEBARCOLOR + 0.600000 0.600000 0.600000 +VENTCOLOR + 1.000000 0.000000 1.000000 + + *** SIZES/OFFSETS *** + +GRIDLINEWIDTH + 2.000000 +ISOLINEWIDTH + 2.000000 +ISOPOINTSIZE + 4.000000 +LINEWIDTH + 2.000000 +PARTPOINTSIZE + 4.000000 +PLOT3DLINEWIDTH + 2.000000 +PLOT3DPOINTSIZE + 4.000000 +SENSORABSSIZE + 0.038000 +SENSORRELSIZE + 1.000000 +SLICEOFFSET + 0.100000 +SMOOTHLINES + 1 +SPHERESEGS + 6 +SPRINKLERABSSIZE + 0.076000 +STREAKLINEWIDTH + 1.000000 +TICKLINEWIDTH + 2.000000 +USENEWDRAWFACE + 0 +VECCONTOURS + 0 +VECLENGTH + 4 1.000000 1.0 +VECTORLINEWIDTH + 1.000000 1.000000 +VECTORPOINTSIZE + 2.000000 +VENTLINEWIDTH + 2.000000 +VENTOFFSET + 0.100000 +WINDOWOFFSET + 45 +WINDOWWIDTH + 640 +WINDOWHEIGHT + 480 + + *** DATA LOADING *** + +BOUNDZIPSTEP + 1 +FED + 0 +FEDCOLORBAR + FED +ISOZIPSTEP + 1 +NOPART + 1 +SHOWFEDAREA + 1 +SLICEAVERAGE + 0 10.000000 0 +SLICEDATAOUT + 0 +SLICEZIPSTEP + 1 +SMOKE3DZIPSTEP + 1 +USER_ROTATE + 0 0 0.250000 0.250000 0.500000 + + *** VIEW PARAMETERS *** + +APERTURE + 2 +AXISSMOOTH + 1 +BLOCKLOCATION + 5 +BOUNDARYTWOSIDE + 0 +CLIP + 0.001000 3.000000 +CONTOURTYPE + 0 +CULLFACES + 1 +ENABLETEXTURELIGHTING + 0 +EYEVIEW + 0 +EYEX + 0.500000 +EYEY + -1.770423 +EYEZ + 0.500000 +FONTSIZE + 0 +FRAMERATEVALUE + 1000 +GEOMDIAGS + 0 0 0 0 0 0 0 +GEOMSHOW + 0 1 1 1 1 + 0 1 1 0 + 1.000000 30.000000 +GVERSION + 0 +ISOTRAN2 + 4 +NORTHANGLE + 0 + 0.000000 0.000000 0.100000 +OFFSETSLICE + 0 +OUTLINEMODE + 1 0 +P3DSURFACETYPE + 1 +P3DSURFACESMOOTH + 1 +PROJECTION + 0 +SCALEDFONT + 12 1.000000 1 + 32 1.000000 1 +SHOWALLTEXTURES + 0 +SHOWAXISLABELS + 0 +SHOWBLOCKLABEL + 0 +SHOWBLOCKS + 1 +SHOWCADANDGRID + 0 +SHOWCADOPAQUE + 0 +SHOWCEILING + 0 +SHOWCOLORBARS + 1 +SHOWCVENTS + 0 0 +SHOWDUMMYVENTS + 1 +SHOWEVACSLICES + 0 1 0 +SHOWFLOOR + 0 +SHOWFRAME + 1 +SHOWFRAMELABEL + 0 +SHOWFRAMERATE + 0 +SHOWGRID + 0 +SHOWGRIDLOC + 0 +SHOWHMSTIMELABEL + 0 +SHOWHRRCUTOFF + 0 +SHOWHRRLABEL + 0 +SHOWISO + 1 +SHOWISONORMALS + 0 +SHOWLABELS + 0 +SHOWMEMLOAD + 0 +SHOWOPENVENTS + 0 0 +SHOWOTHERVENTS + 1 +SHOWSENSORS + 1 1 +SHOWSLICEINOBST + 0 +SHOWSMOKEPART + 2 +SHOWSPRINKPART + 1 +SHOWSTREAK + 0 0 1 -2 +SHOWTERRAIN + 0 +SHOWTETRAS + 1 0 +SHOWTHRESHOLD + 0 0 400.000000 +SHOWTICKS + 0 +SHOWTIMEBAR + 1 +SHOWTIMELABEL + 1 +SHOWTITLE + 0 +SHOWTRACERSALWAYS + 0 +SHOWTRIANGLES + 1 0 0 0 1 1 +SHOWTRANSPARENT + 0 +SHOWTRANSPARENTVENTS + 1 +SHOWTRIANGLECOUNT + 0 +SHOWVENTFLOW + 1 0 1 1 1 +SHOWVENTS + 1 +SHOWWALLS + 0 +SKIPEMBEDSLICE + 0 +SMOKESENSORS + 1 0 +STARTUPLANG + en +STEREO + 0 +SURFINC + 0 +TERRAINPARMS + 90 50 50 + 200 200 200 + 1.000000 +TITLESAFE + 0 +TRAINERVIEW + 1 +TRANSPARENT + 1 0.800000 +TREEPARMS + 3 0 0 1 +TWOSIDEDVENTS + 1 0 +VECTORSKIP + 1 +VOLSMOKE + 0 1 1 0 0 + 20.000000 700.000000 1200.000000 3.000000 8700.000000 1.000000 1.000000 +ZOOM + 2 1.000000 + + *** MISC *** + +CELLCENTERTEXT + 0 +INPUT_FILE + render360.fds +LABELSTARTUPVIEW + external +PIXELSKIP + 0 +RENDERCLIP + 0 0 0 0 0 +RENDERFILELABEL + 0 +RENDERFILETYPE + 0 0 +RENDEROPTION + 993 2 +UNITCLASSES + 6 + 0 + 0 + 0 + 0 + 0 + 0 + + *** 3D SMOKE INFO *** + +ADJUSTALPHA + 2 +COLORBARTYPE + 0 % Rainbow +EXTREMECOLORS + 0 0 0 0 0 0 +FIRECOLOR + 255 128 0 +FIRECOLORMAP + 0 8 +FIREDEPTH + 2.000000 +SHOWEXTREMEDATA + 0 0 0 +SMOKECOLOR + 0 0 0 +SMOKECULL + 0 +SMOKESKIP + 0 +SMOKEALBEDO + 0.000000 +SMOKERTHICK + 1.000000 +USEGPU + 0 +VOLSMOKE + 0 1 1 0 0 + 20.000000 700.000000 1200.000000 3.000000 8700.000000 + + *** ZONE FIRE PARAMETRES *** + +SHOWHAZARDCOLORS + 0 +SHOWHZONE + 0 +SHOWSZONE + 0 +SHOWVZONE + 1 +SHOWZONEFIRE + 1 + + *** TOUR INFO *** + +SHOWPATHNODES + 0 +SHOWTOURROUTE + 0 +TOURCOLORS + 1.000000 0.000000 0.000000 :selected path line + 1.000000 0.000000 0.000000 :selected path line knots + 0.000000 1.000000 0.000000 :selected knot + -1.000000 -1.000000 -1.000000 :path line + -1.000000 -1.000000 -1.000000 :path knots + -1.000000 -1.000000 -1.000000 :text + 1.000000 0.000000 0.000000 :avatar +TOURCONSTANTVEL + 0 +VIEWALLTOURS + 0 +VIEWTIMES + 0.000000 0.010000 1000 +VIEWTOURFROMPATH + 0 + + ------------ local ini settings ------------ + +AVATAREVAC + 0 +GEOMETRYTEST + 0 1 2.000000 10.000000 + 1 1 1 1 1 + 1 1 1 1 1 + 2.500000 7.500000 2.500000 7.500000 2.500000 7.500000 + 2.000000 2.000000 2.000000 8.000000 2.000000 2.000000 + 5.000000 8.000000 2.000000 5.000000 5.000000 8.000000 + 0.000000 0.000000 0.000000 +DEVICEVECTORDIMENSIONS + 1.000000 0.100000 0.200000 0.200000 +DEVICEBOUNDS + 0.000000 1.000000 +DEVICEORIENTATION + 0 1.000000 +GRIDPARMS + 0 1 0 + 10 10 10 +GSLICEPARMS + 0 0 0 0 + 5.000000 5.000000 5.000000 + 0.000000 90.000000 +LOADFILESATSTARTUP + 0 +MSCALE + 1.000000 1.000000 1.000000 +COMPRESSAUTO + 0 +PROPINDEX + 2 + 0 0 + 1 0 +SHOOTER + 0.500000 0.000000 0.500000 + 0.250000 0.000000 0.000000 + 0.000000 0.000000 0.000000 + 1.000000 0.000000 4.000000 + 10 1 100 0 0 + 1.000000 1.000000 +SHOWDEVICES + 8 + sensor + human_fixed + human_altered_with_data + ellipsoid + disk + fire_fighter + airpack + helmit +SHOWDEVICEVALS + 0 0 0 0 0 0 1 1 +SHOWMISSINGOBJECTS + 1 +TOURINDEX + -1 +USERTICKS + 0 1 5 1 1 1 + 0.000000 0.000000 0.000000 + 0.000000 0.000000 0.000000 + 10.000000 10.000000 10.000000 + 1.000000 1.000000 1.000000 + 1 1 1 +XYZCLIP + 0 + 0 -0.010000 0 10.010000 + 0 -0.010000 0 10.010000 + 0 -0.010000 0 10.010000 + + *** TIME/DATA BOUNDS *** + (0/1 min max skip (1=set, 0=unset) + +C_PARTICLES + 0 1.000000 0 0.000000 +C_PLOT3D + 5 + 1 0 1.000000 0 -0.000000 + 2 0 1.000000 0 -0.000000 + 3 0 1.000000 0 -0.000000 + 4 0 1.000000 0 -0.000000 + 5 0 1.000000 0 -0.000000 +CACHE_BOUNDARYDATA + 0 +CACHE_QDATA + 1 +PATCHDATAOUT + 0 1.000000 -1.000000 1.000000 -1.000000 1.000000 -1.000000 1.000000 -1.000000 +PERCENTILELEVEL + 0.010000 +TIMEOFFSET + 0.000000 +TLOAD + 0 0.000000 0 1.000000 0 0 +V_PARTICLES + 0 1.000000 0 0.000000 +V_PLOT3D + 5 + 1 0 1.000000 0 1.000000 + 2 0 1.000000 0 1.000000 + 3 0 1.000000 0 1.000000 + 4 0 1.000000 0 1.000000 + 5 0 1.000000 0 1.000000 +V_TARGET + 0 1.000000 0 0.000000 +VIEWPOINT5 + 0 1 2 + 0.586704 0.265493 0.500000 1.000000 2 + 0.000000 0.000000 0.000000 0 + 0.500000 0.500000 0.500000 + 1.000000 -1.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 + -0.010000 -0.010000 -0.010000 10.010000 10.010000 10.010000 + view 1 + + +# FDS/Smokeview Environment +# ------------------------- + +# Smokeview Version: Test +# Smokeview Build: unknown +# Smokeview Build Date: Jul 3 2016 +# FDS Version: FDS 6.5.0 +# FDS Build: Git-r14-0-gec73757 +# Platform: WIN64 + + +# Graphics Environment +# -------------------- + +# OpenGL Version: 4.5.0 NVIDIA 353.62 +# Red bits:8 +# Green bits:8 +# Blue bits:8 +# Alpha bits:0 +# Depth bits:24 + From ac3019d8b94c0f42361c59ec1b583f985d75fc0a Mon Sep 17 00:00:00 2001 From: gforney Date: Mon, 4 Jul 2016 20:57:36 -0400 Subject: [PATCH 05/12] smv vv: update 360 render test case Former-commit-id: 2a2171a1cb8019f464f9a4d3b5b97b9c3bf7fd87 [formerly 5175c618b7280b937ed0b8a2d4a876fd7466dd3b] Former-commit-id: d768801df099e44527f240c39cee124998934e9f Former-commit-id: 6cf479c845a4ed7d1d337402f3c4385c83f85e9b --- Verification/Visualization/render360.fds | 20 +++++++++------- Verification/Visualization/render360.ini | 29 +++++++++++++++++------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/Verification/Visualization/render360.fds b/Verification/Visualization/render360.fds index 6e498cb4db4..4fd2faba392 100644 --- a/Verification/Visualization/render360.fds +++ b/Verification/Visualization/render360.fds @@ -1,14 +1,18 @@ &HEAD CHID='render360',TITLE='test generation of 360 deg render files' / -&MESH IJK=20,20,20, XB=0.0,10.0,0.0,10.0,0.0,10.0 / - -&OBST XB= 0.0,10.0, 0.0,10.0, 0.0, 0.0,COLOR="GRAY" / -&OBST XB= 0.0,10.0, 0.0,10.0,10.0,10.0,COLOR="WHITE" / -&OBST XB= 0.0, 0.0, 0.0,10.0, 0.0,10.0,COLOR="GREEN" / -&OBST XB=10.0,10.0, 0.0,10.0, 0.0,10.0,COLOR="YELLOW" / -&OBST XB= 0.0,10.0, 0.0, 0.0, 0.0,10.0,COLOR="BLUE" / -&OBST XB= 0.0,10.0,10.0,10.0, 0.0,10.0,COLOR="MAGENTA" / +&MESH IJK=40,40,40, XB=0.0,10.0,0.0,10.0,0.0,10.0 / + +&OBST XB= 0.0,10.0, 0.0,10.0, 0.0, 0.0,RGB=64,64,64 / +&OBST XB= 0.0,10.0, 0.0,10.0,10.0,10.0,RGB=192,192,192 / + +&OBST XB= 0.0, 0.0, 0.0,10.0, 0.0,10.0,RGB= 255, 0, 0 / + +&OBST XB=10.0,10.0, 0.0,10.0, 0.0,10.0,RGB= 0,255, 0 / + +&OBST XB= 0.0,10.0, 0.0, 0.0, 0.0,10.0,RGB= 0,0,255 / + +&OBST XB= 0.0,10.0,10.0,10.0, 0.0,10.0,RGB=0,255,255 / &TIME T_END=0. / Total simulation time diff --git a/Verification/Visualization/render360.ini b/Verification/Visualization/render360.ini index 061c4ea8f67..0853f6ea656 100644 --- a/Verification/Visualization/render360.ini +++ b/Verification/Visualization/render360.ini @@ -1,4 +1,4 @@ -# NIST Smokeview configuration file, Release Jul 3 2016 +# NIST Smokeview configuration file, Release Jul 4 2016 ------------ global ini settings ------------ @@ -155,9 +155,9 @@ VENTOFFSET WINDOWOFFSET 45 WINDOWWIDTH - 640 + 1024 WINDOWHEIGHT - 480 + 1024 *** DATA LOADING *** @@ -187,7 +187,7 @@ USER_ROTATE *** VIEW PARAMETERS *** APERTURE - 2 + 1 AXISSMOOTH 1 BLOCKLOCATION @@ -207,7 +207,7 @@ EYEVIEW EYEX 0.500000 EYEY - -1.770423 + -1.327817 EYEZ 0.500000 FONTSIZE @@ -371,7 +371,7 @@ CELLCENTERTEXT INPUT_FILE render360.fds LABELSTARTUPVIEW - external + view 2 PIXELSKIP 0 RENDERCLIP @@ -512,7 +512,7 @@ SHOWDEVICES airpack helmit SHOWDEVICEVALS - 0 0 0 0 0 0 1 1 + 0 0 -1 0 0 0 1 1 SHOWMISSINGOBJECTS 1 TOURINDEX @@ -565,6 +565,19 @@ V_PLOT3D 5 0 1.000000 0 1.000000 V_TARGET 0 1.000000 0 0.000000 +VIEWPOINT5 + 0 1 3 + 0.500000 0.500000 0.500000 1.000000 2 + 0.000000 0.000000 0.000000 0 + 0.500000 0.500000 0.500000 + 1.000000 -1.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 + -0.010000 -0.010000 -0.010000 10.010000 10.010000 10.010000 + view 2 VIEWPOINT5 0 1 2 0.586704 0.265493 0.500000 1.000000 2 @@ -585,7 +598,7 @@ VIEWPOINT5 # Smokeview Version: Test # Smokeview Build: unknown -# Smokeview Build Date: Jul 3 2016 +# Smokeview Build Date: Jul 4 2016 # FDS Version: FDS 6.5.0 # FDS Build: Git-r14-0-gec73757 # Platform: WIN64 From d0637e3553f79a5bbf35f9380816a2b872b19865 Mon Sep 17 00:00:00 2001 From: gforney Date: Mon, 4 Jul 2016 20:58:12 -0400 Subject: [PATCH 06/12] smokeview source: update render 360 code Former-commit-id: 1345a5a55e55198efce29087333d0abfd73759d0 [formerly 6a5511a4824acfef65e42aba55f5e43342f84ad6] Former-commit-id: 393ee907bbfd7e07886cfa8f2a960764fbf81eab Former-commit-id: a91ee2b1160e003768f6607a15cdb24cea8ad580 From f9cbc8a19645be59747cfe28466e7dfabb634f66 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 Jul 2016 09:28:39 -0400 Subject: [PATCH 07/12] bundle scripts: correct test for 64 bit windows in bundle wrapup script - addresses issue 4051 Former-commit-id: 898386411c999973a49c00fbf1ea41b7e8ad8c8d [formerly f76e597b62d2bd69bd241e41b778d41fd7150fdf] Former-commit-id: b5fbe7eedab92767fc16044f77e20d3b90365014 Former-commit-id: a2cd3b16c6b1790c377a8c98f5082369a6da8966 --- Utilities/Scripts/for_bundle/wrapup_fds_install.bat | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Utilities/Scripts/for_bundle/wrapup_fds_install.bat b/Utilities/Scripts/for_bundle/wrapup_fds_install.bat index 51beef66b18..3baeb9fa936 100644 --- a/Utilities/Scripts/for_bundle/wrapup_fds_install.bat +++ b/Utilities/Scripts/for_bundle/wrapup_fds_install.bat @@ -6,18 +6,12 @@ echo. echo *** Testing whether Windows is 64 bit echo. -set is64bitfile="%TEMP%\is64bit" -systeminfo | findstr /C:"System Type" | findstr /C:"x64" | find /V /C "^"> %is64bitfile% -set /p is64bit=<%is64bitfile% - - -erase %is64bitfile% -if %is64bit% == 1 ( - echo *** Congratulations! Windows is 64 bit +if defined PROGRAMFILES(X86) ( + echo *** 64 bit Windows detected echo *** Wrapup proceeding echo. ) else ( - echo *** Fatal error: Windows is not 64 bit. + echo *** Fatal error: 32 bit Windows detected echo FDS and Smokeview only run on 64 bit systems echo Installation wrap up aborted echo *** Press any key to continue. *** @@ -25,7 +19,6 @@ pause>NUL goto abort ) - echo *** Removing previous FDS/Smokeview entries from the system and user path. call "%CD%\set_path.exe" -s -m -b -r "nist\fds" >Nul call "%CD%\set_path.exe" -u -m -b -r "FDS\FDS5" >Nul From 1a9a173740cbfb5ae1a5749630a3d5ccfad65c44 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 Jul 2016 12:40:39 -0400 Subject: [PATCH 08/12] smv vv: add texture map render360 test case Former-commit-id: 44cc0017e18332ed6402e972894dbaee181aa43d [formerly ba0c6f40928fe06e14b585195f685e6e56d200ec] Former-commit-id: 6c37d89084b8efe2e287a7602a890a5dc7cf6230 Former-commit-id: f55bb4c77d05b1389e71499d5c2ab58e041173f8 --- Verification/Visualization/render360t.fds | 35 ++ Verification/Visualization/render360t.ini | 616 ++++++++++++++++++++++ 2 files changed, 651 insertions(+) create mode 100644 Verification/Visualization/render360t.fds create mode 100644 Verification/Visualization/render360t.ini diff --git a/Verification/Visualization/render360t.fds b/Verification/Visualization/render360t.fds new file mode 100644 index 00000000000..1c8dfb443ec --- /dev/null +++ b/Verification/Visualization/render360t.fds @@ -0,0 +1,35 @@ +&HEAD CHID='render360t',TITLE='test generation of 360 deg render files' / +&MISC TEXTURE_ORIGIN=0.1,0.1,0.1 / + +&MESH IJK=40,40,40, XB=0.0,10.0,0.0,10.0,0.0,10.0 / + +&SURF ID = 'TEXTURE 1' + TEXTURE_MAP= 'nistleft.jpg' + TEXTURE_WIDTH=5.0 + TEXTURE_HEIGHT=2.5 / + +&VENT XB= 0.0,10.0, 0.0,10.0, 0.0, 0.0,RGB=64,64,64, SURF_ID='TEXTURE 1' + TEXTURE_ORIGIN=0.0,0.0,0.0 / +/ +&VENT XB= 0.0,10.0, 0.0,10.0,10.0,10.0,RGB=192,192,192, SURF_ID='TEXTURE 1' + TEXTURE_ORIGIN=0.0,0.0,10.0 / + +&VENT XB= 0.0, 0.0, 0.0,10.0, 0.0,10.0,RGB= 255, 0, 0, SURF_ID='TEXTURE 1' + TEXTURE_ORIGIN=0.0,0.0,0.0 / + + +&VENT XB=10.0,10.0, 0.0,10.0, 0.0,10.0,RGB= 0,255, 0, SURF_ID='TEXTURE 1' + TEXTURE_ORIGIN=10.0,0.0,0.0 / + + +&VENT XB= 0.0,10.0, 0.0, 0.0, 0.0,10.0,RGB= 0,0,255, SURF_ID='TEXTURE 1' + TEXTURE_ORIGIN=0.0,0.0,0.0 / + + +&VENT XB= 0.0,10.0,10.0,10.0, 0.0,10.0,RGB=0,255,255, SURF_ID='TEXTURE 1' + TEXTURE_ORIGIN=0.0,10.0,0.0 / + + +&TIME T_END=0. / Total simulation time + +&TAIL / diff --git a/Verification/Visualization/render360t.ini b/Verification/Visualization/render360t.ini new file mode 100644 index 00000000000..0853f6ea656 --- /dev/null +++ b/Verification/Visualization/render360t.ini @@ -0,0 +1,616 @@ +# NIST Smokeview configuration file, Release Jul 4 2016 + + + ------------ global ini settings ------------ + + *** COLOR/LIGHTING *** + +AMBIENTLIGHT + 0.600000 0.600000 0.600000 +BACKGROUNDCOLOR + 0.000000 0.000000 0.000000 +BLOCKCOLOR + 1.000000 0.800000 0.400000 +BLOCKSHININESS + 100.000000 +BLOCKSPECULAR + 0.000000 0.000000 0.000000 +BOUNDCOLOR + 0.500000 0.500000 0.500000 +COLORBAR + 12 1 -1 5 + 0.000000 0.000000 1.000000 + 0.000000 0.359375 1.000000 + 0.000000 0.718750 1.000000 + 0.000000 1.000000 0.921875 + 0.000000 1.000000 0.562500 + 0.000000 1.000000 0.203125 + 0.171875 1.000000 0.000000 + 0.531250 1.000000 0.000000 + 0.890625 1.000000 0.000000 + 1.000000 0.746032 0.000000 + 1.000000 0.380952 0.000000 + 1.000000 0.000000 0.000000 +COLOR2BAR + 8 + 1.000000 1.000000 1.000000 :white + 1.000000 1.000000 0.000000 :yellow + 0.000000 0.000000 1.000000 :blue + 1.000000 0.000000 0.000000 :red + 0.000000 1.000000 0.000000 :green + 1.000000 0.000000 1.000000 :magenta + 0.000000 1.000000 1.000000 :cyan + 0.000000 0.000000 0.000000 :black +COLORBAR_FLIP + 0 +COLORBAR_SPLIT + 0 0 0 64 64 255 + 0 192 0 255 0 0 + -1.000000 0.000000 1.000000 +DIFFUSELIGHT + 0.500000 0.500000 0.500000 +DIRECTIONCOLOR + 0.152941 0.250980 0.545098 +FLIP + 1 +FOREGROUNDCOLOR + 1.000000 1.000000 1.000000 +HEATOFFCOLOR + 1.000000 0.000000 0.000000 +HEATONCOLOR + 1.000000 0.000000 0.000000 +ISOCOLORS + 10.000000 0.800000 : shininess, default opaqueness + 0.700000 0.700000 0.700000 : specular + 10 : number of levels + 0.957255 0.000392 0.957255 0.800392 : red, green, blue, alpha (opaqueness) + 0.750000 0.800000 0.800000 0.800000 + 0.000000 0.960000 0.280000 0.800000 + 0.000000 0.000000 1.000000 0.800000 + 0.000000 0.718750 1.000000 0.800000 + 0.000000 1.000000 0.562500 0.800000 + 0.171875 1.000000 0.000000 0.800000 + 0.890625 1.000000 0.000000 0.800000 + 1.000000 0.380952 0.000000 0.800000 + 1.000000 0.000000 0.000000 0.800000 +COLORTABLE + 2 + 210 180 140 255 % tan + 178 34 34 255 % firebrick +LIGHT0 + 1 +LIGHT1 + 1 +LIGHTMODELLOCALVIEWER + 0 +LIGHTMODELSEPARATESPECULARCOLOR + 0 +LIGHTPOS0 + 1.000000 1.000000 4.000000 0.000000 +LIGHTPOS1 + -1.000000 1.000000 4.000000 0.000000 +SENSORCOLOR + 1.000000 1.000000 0.000000 +SENSORNORMCOLOR + 1.000000 1.000000 0.000000 +SETBW + 0 0 +SPRINKOFFCOLOR + 1.000000 0.000000 0.000000 +SPRINKONCOLOR + 0.000000 1.000000 0.000000 +STATICPARTCOLOR + 0.000000 1.000000 0.000000 +TIMEBARCOLOR + 0.600000 0.600000 0.600000 +VENTCOLOR + 1.000000 0.000000 1.000000 + + *** SIZES/OFFSETS *** + +GRIDLINEWIDTH + 2.000000 +ISOLINEWIDTH + 2.000000 +ISOPOINTSIZE + 4.000000 +LINEWIDTH + 2.000000 +PARTPOINTSIZE + 4.000000 +PLOT3DLINEWIDTH + 2.000000 +PLOT3DPOINTSIZE + 4.000000 +SENSORABSSIZE + 0.038000 +SENSORRELSIZE + 1.000000 +SLICEOFFSET + 0.100000 +SMOOTHLINES + 1 +SPHERESEGS + 6 +SPRINKLERABSSIZE + 0.076000 +STREAKLINEWIDTH + 1.000000 +TICKLINEWIDTH + 2.000000 +USENEWDRAWFACE + 0 +VECCONTOURS + 0 +VECLENGTH + 4 1.000000 1.0 +VECTORLINEWIDTH + 1.000000 1.000000 +VECTORPOINTSIZE + 2.000000 +VENTLINEWIDTH + 2.000000 +VENTOFFSET + 0.100000 +WINDOWOFFSET + 45 +WINDOWWIDTH + 1024 +WINDOWHEIGHT + 1024 + + *** DATA LOADING *** + +BOUNDZIPSTEP + 1 +FED + 0 +FEDCOLORBAR + FED +ISOZIPSTEP + 1 +NOPART + 1 +SHOWFEDAREA + 1 +SLICEAVERAGE + 0 10.000000 0 +SLICEDATAOUT + 0 +SLICEZIPSTEP + 1 +SMOKE3DZIPSTEP + 1 +USER_ROTATE + 0 0 0.250000 0.250000 0.500000 + + *** VIEW PARAMETERS *** + +APERTURE + 1 +AXISSMOOTH + 1 +BLOCKLOCATION + 5 +BOUNDARYTWOSIDE + 0 +CLIP + 0.001000 3.000000 +CONTOURTYPE + 0 +CULLFACES + 1 +ENABLETEXTURELIGHTING + 0 +EYEVIEW + 0 +EYEX + 0.500000 +EYEY + -1.327817 +EYEZ + 0.500000 +FONTSIZE + 0 +FRAMERATEVALUE + 1000 +GEOMDIAGS + 0 0 0 0 0 0 0 +GEOMSHOW + 0 1 1 1 1 + 0 1 1 0 + 1.000000 30.000000 +GVERSION + 0 +ISOTRAN2 + 4 +NORTHANGLE + 0 + 0.000000 0.000000 0.100000 +OFFSETSLICE + 0 +OUTLINEMODE + 1 0 +P3DSURFACETYPE + 1 +P3DSURFACESMOOTH + 1 +PROJECTION + 0 +SCALEDFONT + 12 1.000000 1 + 32 1.000000 1 +SHOWALLTEXTURES + 0 +SHOWAXISLABELS + 0 +SHOWBLOCKLABEL + 0 +SHOWBLOCKS + 1 +SHOWCADANDGRID + 0 +SHOWCADOPAQUE + 0 +SHOWCEILING + 0 +SHOWCOLORBARS + 1 +SHOWCVENTS + 0 0 +SHOWDUMMYVENTS + 1 +SHOWEVACSLICES + 0 1 0 +SHOWFLOOR + 0 +SHOWFRAME + 1 +SHOWFRAMELABEL + 0 +SHOWFRAMERATE + 0 +SHOWGRID + 0 +SHOWGRIDLOC + 0 +SHOWHMSTIMELABEL + 0 +SHOWHRRCUTOFF + 0 +SHOWHRRLABEL + 0 +SHOWISO + 1 +SHOWISONORMALS + 0 +SHOWLABELS + 0 +SHOWMEMLOAD + 0 +SHOWOPENVENTS + 0 0 +SHOWOTHERVENTS + 1 +SHOWSENSORS + 1 1 +SHOWSLICEINOBST + 0 +SHOWSMOKEPART + 2 +SHOWSPRINKPART + 1 +SHOWSTREAK + 0 0 1 -2 +SHOWTERRAIN + 0 +SHOWTETRAS + 1 0 +SHOWTHRESHOLD + 0 0 400.000000 +SHOWTICKS + 0 +SHOWTIMEBAR + 1 +SHOWTIMELABEL + 1 +SHOWTITLE + 0 +SHOWTRACERSALWAYS + 0 +SHOWTRIANGLES + 1 0 0 0 1 1 +SHOWTRANSPARENT + 0 +SHOWTRANSPARENTVENTS + 1 +SHOWTRIANGLECOUNT + 0 +SHOWVENTFLOW + 1 0 1 1 1 +SHOWVENTS + 1 +SHOWWALLS + 0 +SKIPEMBEDSLICE + 0 +SMOKESENSORS + 1 0 +STARTUPLANG + en +STEREO + 0 +SURFINC + 0 +TERRAINPARMS + 90 50 50 + 200 200 200 + 1.000000 +TITLESAFE + 0 +TRAINERVIEW + 1 +TRANSPARENT + 1 0.800000 +TREEPARMS + 3 0 0 1 +TWOSIDEDVENTS + 1 0 +VECTORSKIP + 1 +VOLSMOKE + 0 1 1 0 0 + 20.000000 700.000000 1200.000000 3.000000 8700.000000 1.000000 1.000000 +ZOOM + 2 1.000000 + + *** MISC *** + +CELLCENTERTEXT + 0 +INPUT_FILE + render360.fds +LABELSTARTUPVIEW + view 2 +PIXELSKIP + 0 +RENDERCLIP + 0 0 0 0 0 +RENDERFILELABEL + 0 +RENDERFILETYPE + 0 0 +RENDEROPTION + 993 2 +UNITCLASSES + 6 + 0 + 0 + 0 + 0 + 0 + 0 + + *** 3D SMOKE INFO *** + +ADJUSTALPHA + 2 +COLORBARTYPE + 0 % Rainbow +EXTREMECOLORS + 0 0 0 0 0 0 +FIRECOLOR + 255 128 0 +FIRECOLORMAP + 0 8 +FIREDEPTH + 2.000000 +SHOWEXTREMEDATA + 0 0 0 +SMOKECOLOR + 0 0 0 +SMOKECULL + 0 +SMOKESKIP + 0 +SMOKEALBEDO + 0.000000 +SMOKERTHICK + 1.000000 +USEGPU + 0 +VOLSMOKE + 0 1 1 0 0 + 20.000000 700.000000 1200.000000 3.000000 8700.000000 + + *** ZONE FIRE PARAMETRES *** + +SHOWHAZARDCOLORS + 0 +SHOWHZONE + 0 +SHOWSZONE + 0 +SHOWVZONE + 1 +SHOWZONEFIRE + 1 + + *** TOUR INFO *** + +SHOWPATHNODES + 0 +SHOWTOURROUTE + 0 +TOURCOLORS + 1.000000 0.000000 0.000000 :selected path line + 1.000000 0.000000 0.000000 :selected path line knots + 0.000000 1.000000 0.000000 :selected knot + -1.000000 -1.000000 -1.000000 :path line + -1.000000 -1.000000 -1.000000 :path knots + -1.000000 -1.000000 -1.000000 :text + 1.000000 0.000000 0.000000 :avatar +TOURCONSTANTVEL + 0 +VIEWALLTOURS + 0 +VIEWTIMES + 0.000000 0.010000 1000 +VIEWTOURFROMPATH + 0 + + ------------ local ini settings ------------ + +AVATAREVAC + 0 +GEOMETRYTEST + 0 1 2.000000 10.000000 + 1 1 1 1 1 + 1 1 1 1 1 + 2.500000 7.500000 2.500000 7.500000 2.500000 7.500000 + 2.000000 2.000000 2.000000 8.000000 2.000000 2.000000 + 5.000000 8.000000 2.000000 5.000000 5.000000 8.000000 + 0.000000 0.000000 0.000000 +DEVICEVECTORDIMENSIONS + 1.000000 0.100000 0.200000 0.200000 +DEVICEBOUNDS + 0.000000 1.000000 +DEVICEORIENTATION + 0 1.000000 +GRIDPARMS + 0 1 0 + 10 10 10 +GSLICEPARMS + 0 0 0 0 + 5.000000 5.000000 5.000000 + 0.000000 90.000000 +LOADFILESATSTARTUP + 0 +MSCALE + 1.000000 1.000000 1.000000 +COMPRESSAUTO + 0 +PROPINDEX + 2 + 0 0 + 1 0 +SHOOTER + 0.500000 0.000000 0.500000 + 0.250000 0.000000 0.000000 + 0.000000 0.000000 0.000000 + 1.000000 0.000000 4.000000 + 10 1 100 0 0 + 1.000000 1.000000 +SHOWDEVICES + 8 + sensor + human_fixed + human_altered_with_data + ellipsoid + disk + fire_fighter + airpack + helmit +SHOWDEVICEVALS + 0 0 -1 0 0 0 1 1 +SHOWMISSINGOBJECTS + 1 +TOURINDEX + -1 +USERTICKS + 0 1 5 1 1 1 + 0.000000 0.000000 0.000000 + 0.000000 0.000000 0.000000 + 10.000000 10.000000 10.000000 + 1.000000 1.000000 1.000000 + 1 1 1 +XYZCLIP + 0 + 0 -0.010000 0 10.010000 + 0 -0.010000 0 10.010000 + 0 -0.010000 0 10.010000 + + *** TIME/DATA BOUNDS *** + (0/1 min max skip (1=set, 0=unset) + +C_PARTICLES + 0 1.000000 0 0.000000 +C_PLOT3D + 5 + 1 0 1.000000 0 -0.000000 + 2 0 1.000000 0 -0.000000 + 3 0 1.000000 0 -0.000000 + 4 0 1.000000 0 -0.000000 + 5 0 1.000000 0 -0.000000 +CACHE_BOUNDARYDATA + 0 +CACHE_QDATA + 1 +PATCHDATAOUT + 0 1.000000 -1.000000 1.000000 -1.000000 1.000000 -1.000000 1.000000 -1.000000 +PERCENTILELEVEL + 0.010000 +TIMEOFFSET + 0.000000 +TLOAD + 0 0.000000 0 1.000000 0 0 +V_PARTICLES + 0 1.000000 0 0.000000 +V_PLOT3D + 5 + 1 0 1.000000 0 1.000000 + 2 0 1.000000 0 1.000000 + 3 0 1.000000 0 1.000000 + 4 0 1.000000 0 1.000000 + 5 0 1.000000 0 1.000000 +V_TARGET + 0 1.000000 0 0.000000 +VIEWPOINT5 + 0 1 3 + 0.500000 0.500000 0.500000 1.000000 2 + 0.000000 0.000000 0.000000 0 + 0.500000 0.500000 0.500000 + 1.000000 -1.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 + -0.010000 -0.010000 -0.010000 10.010000 10.010000 10.010000 + view 2 +VIEWPOINT5 + 0 1 2 + 0.586704 0.265493 0.500000 1.000000 2 + 0.000000 0.000000 0.000000 0 + 0.500000 0.500000 0.500000 + 1.000000 -1.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 + -0.010000 -0.010000 -0.010000 10.010000 10.010000 10.010000 + view 1 + + +# FDS/Smokeview Environment +# ------------------------- + +# Smokeview Version: Test +# Smokeview Build: unknown +# Smokeview Build Date: Jul 4 2016 +# FDS Version: FDS 6.5.0 +# FDS Build: Git-r14-0-gec73757 +# Platform: WIN64 + + +# Graphics Environment +# -------------------- + +# OpenGL Version: 4.5.0 NVIDIA 353.62 +# Red bits:8 +# Green bits:8 +# Blue bits:8 +# Alpha bits:0 +# Depth bits:24 + From b78f67c9db73b71f50471ebbff2eac723cd828d6 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 Jul 2016 12:50:13 -0400 Subject: [PATCH 09/12] smokeview source: flip 'right' vector when rendering scenes below the horizon/equator - preliminary working version of 360 rendering Former-commit-id: 6fa09d580a26673c5bd5119311f6437ee8d6d61d [formerly c26cd094325d668e6acc3fcfc7a0459abc349e6a] Former-commit-id: 57108034158cffccea2feb190adfbdca773e6ebb Former-commit-id: eb5d9110fef576824e1f003f08d71d818456fecc From e8bf6072e525161ff33eda41f70fabcb98a81c5e Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 Jul 2016 19:51:25 -0400 Subject: [PATCH 10/12] smokeview source: remove trailing white space Former-commit-id: 35f32a5cdf750b4a5aff7d75ffe96db73f2ea143 [formerly cec447cd91634e9138f0a107589eb1f9d2236c7a] Former-commit-id: 29be57538d8d418d9fbd25279c7d8fad1e29ff4d Former-commit-id: 108e15de6bf2f0b5059b995bdb8768e55901245a From b04a5ed24ef0732c1cb20fb5dea71b9658ce7224 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 Jul 2016 19:52:23 -0400 Subject: [PATCH 11/12] smokeview source: bump version number to 6.3.9 Former-commit-id: 9cfba13aba9b6d5498ae949bd4f08616bc2de382 [formerly fee1d2decafbfc081e689ad5915fba64a7dfcf4e] Former-commit-id: 376e6ec595e08f27292ce8ba6a6d65280ab1c093 Former-commit-id: 62e5db48fc13f93cd72af9868dda7696422aa8b1 From c02c571af8c5788f796dc8bbb7260f7f112eb764 Mon Sep 17 00:00:00 2001 From: gforney Date: Tue, 5 Jul 2016 19:53:38 -0400 Subject: [PATCH 12/12] smv manuals: bump version number to 6.3.9 in smokeview manuals Former-commit-id: d019cc6b3c65fa6b43f96510ef90e1e54f390c57 [formerly 013e191373865ef7235930700f7936378ab142e5] Former-commit-id: fa8b237a0f97bfe48e1ba064c37816fed025b022 Former-commit-id: f733839a3fa13d22bacd9a7b95fbce71bc7fcb2e --- Manuals/Bibliography/commoncommands.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Manuals/Bibliography/commoncommands.tex b/Manuals/Bibliography/commoncommands.tex index 43499d0c826..1dde0731f0e 100644 --- a/Manuals/Bibliography/commoncommands.tex +++ b/Manuals/Bibliography/commoncommands.tex @@ -57,7 +57,7 @@ \newcommand{\fdsversion}{6.5.1} % Smokeview Version String -\newcommand{\smvversion}{6.3.8} +\newcommand{\smvversion}{6.3.9} \newcommand{\nopart}{\expandafter\def\csname Parent-1\endcsname{}} % To fix table of contents in pdf. \newcommand{\ct}{\tt\small} % eventually will be deprecated due to http://www.tex.ac.uk/cgi-bin/texfaq2html?label=2letterfontcmd