Skip to content

Commit

Permalink
Merge pull request #903 from gforney/master
Browse files Browse the repository at this point in the history 
fix several issues (see commit messages), update summary web pages
  • Loading branch information
@gforney
gforney committed Dec 4, 2019
2 parents 2be4647 + 3cf60f5 commit 49fe555
Show file tree
Hide file tree
Showing 16 changed files with 1,268 additions and 936 deletions.
22 changes: 9 additions & 13 deletions Manuals/SMV_Summary/index.html → Manuals/SMV_Summary/index_template.html
View file
@@ -1,21 +1,19 @@
<html>
<head>
<TITLE>Smokeview Verification Test</TITLE>
<TITLE>Smokebot Summary - stills</TITLE>
</HEAD>
<BODY BGCOLOR="#FFFFFF" >
<h2>Smokeview Verification Tests</h2>

<h2>Smokebot Summary - &&DATE&&</h2>
<h3>
FDS build: &&FDS_BUILD&&<br>
Smokeview build: &&SMV_BUILD&&
</h3>

<p>
<a href="movies.html"><font size=5>Animations</font></a> -
<font size=5>Stills</font> -
<a href="manuals.html"><font size=5>Manuals</font></a>

<hr>
<p><table>
<tr><td><img width=500 src="images/fds_smv_version.png"></td></tr>
</table>

<font size=5>Stills</font> -
<a href="manuals.html"><font size=5>Manuals</font></a>
<p><hr>

<td>
<ul>
Expand All @@ -37,8 +35,6 @@ <h2>Smokeview Verification Tests</h2>
</ul>
</td>

<p><hr>

<a name="slice"></a>
<p><table>
<tr><th></th><th colspan=3> Slice</th></tr>
Expand Down
13 changes: 8 additions & 5 deletions Manuals/SMV_Summary/manuals.html → Manuals/SMV_Summary/manuals_template.html
View file
@@ -1,23 +1,26 @@
<html>
<head>
<TITLE>Smokeview Verification Test</TITLE>
<TITLE>Smokebot Summary - Manuals</TITLE>
</HEAD>
<BODY BGCOLOR="#FFFFFF" >
<h2>Smokeview Verification Tests</h2>
<h2>Smokebot Summary - &&DATE&&</h2>
<h3>
FDS build: &&FDS_BUILD&&<br>
Smokeview build: &&SMV_BUILD&&
</h3>

<p>
<a href="movies.html"><font size=5>Animations</font></a> -
<a href="index.html"><font size=5>Stills</font></a> -
<font size=5>Manuals</font>
<p><hr>


<p><table>
<tr><td><img width=500 src="images/fds_smv_version.png"></td></tr>
</table>
<ul>
<li><a href="manuals/SMV_Technical_Reference_Guide.pdf">Smokeview Technical Reference Guide</a>
<li><a href="manuals/SMV_User_Guide.pdf">Smokeview User Guide</a>
<li><a href="manuals/SMV_Verification_Guide.pdf">Smokeview Verification Guide</a>
<li><a href="manuals/SMV_Summary.pdf">Smokebot Summary</a>
</ul>


Expand Down
15 changes: 9 additions & 6 deletions Manuals/SMV_Summary/movies.html → Manuals/SMV_Summary/movies_template.html
View file
@@ -1,19 +1,20 @@
<html>
<head>
<TITLE>Smokeview Verification Test</TITLE>
<TITLE>Smokebot Summary - Animations</TITLE>
</HEAD>
<BODY BGCOLOR="#FFFFFF" >
<h2>Smokeview Verification Tests</h2>
<h2>Smokebot Summary - &&DATE&&</h2>
<h3>
FDS build: &&FDS_BUILD&&<br>
Smokeview build: &&SMV_BUILD&&
</h3>

<p>
<font size=5>Animations</font> -
<a href="index.html"><font size=5>Stills</font></a> -
<a href="manuals.html"><font size=5>Manuals</font></a>
<p><hr>

<p><table>
<tr><td><img width=500 src="images2/fds_smv_version2.png"></td></tr>
</table>

<td>
<ul>
<li><a href="#plume5c">plume5c</a>
Expand Down Expand Up @@ -47,6 +48,7 @@ <h3>plume5c</h3>
</tr>
</table>

<p><hr>
<a name="thouse5"></a>
<h3>thouse5</h3>
<table>
Expand All @@ -60,6 +62,7 @@ <h3>thouse5</h3>
</tr>
</table>

<p><hr>
<a name="WUI"></a>
<h3>WUI</h3>
<table>
Expand Down
83 changes: 64 additions & 19 deletions Source/smokeview/IOboundary.c
View file
Expand Up @@ -534,7 +534,7 @@ int NodeInInternalVent(const meshdata *meshi, int i, int j, int k, int dir, int
if(vi->imin == i&&i == vi->imax&&
vi->jmin < j&&j < vi->jmax&&
vi->kmin < k&&k < vi->kmax){
if((i == 0 && meshi->is_extface[0] == 0) || (i == meshi->ibar&&meshi->is_extface[1] == 0)){
if((i == 0 && meshi->is_extface[0] == MESH_INT) || (i == meshi->ibar&&meshi->is_extface[1] == MESH_INT)){
if(NodeInBlockage(meshi, i, j, k, &imesh, &iblockage) == 1)return YES;
}
return NO;
Expand All @@ -544,7 +544,7 @@ int NodeInInternalVent(const meshdata *meshi, int i, int j, int k, int dir, int
if(vi->jmin == j&&j == vi->jmax&&
vi->imin < i&&i < vi->imax&&
vi->kmin < k&&k < vi->kmax){
if((j == 0 && meshi->is_extface[2] == 0) || (j == meshi->jbar&&meshi->is_extface[3] == 0)){
if((j == 0 && meshi->is_extface[2] == MESH_INT) || (j == meshi->jbar&&meshi->is_extface[3] == MESH_INT)){
if(NodeInBlockage(meshi, i, j, k, &imesh, &iblockage) == 1)return YES;
}
return NO;
Expand All @@ -554,7 +554,7 @@ int NodeInInternalVent(const meshdata *meshi, int i, int j, int k, int dir, int
if(vi->kmin == k&&k == vi->kmax&&
vi->imin < i&&i < vi->imax&&
vi->jmin < j&&j < vi->jmax){
if((k == 0 && meshi->is_extface[4] == 0) || (k == meshi->kbar&&meshi->is_extface[5] == 0)){
if((k == 0 && meshi->is_extface[4] == MESH_INT) || (k == meshi->kbar&&meshi->is_extface[5] == MESH_INT)){
if(NodeInBlockage(meshi, i, j, k, &imesh, &iblockage) == 1)return YES;
}
return NO;
Expand Down Expand Up @@ -1696,15 +1696,28 @@ FILE_SIZE ReadBoundaryBndf(int ifile, int flag, int *errorcode){
ext_wall=0;
mesh_boundary = NO;
if(j1==0&&j2==jbartemp&&k1==0&&k2==kbartemp){
if((i1==0 &&meshi->nabors[MLEFT]==NULL)||
(i2==ibartemp&&meshi->nabors[MRIGHT]==NULL)
){
int doit;

doit = 0;
if(show_bndf_mesh_interface==1){
if( (i1==0&&meshi->nabors[MLEFT]==NULL)||
(i2==ibartemp&&meshi->nabors[MRIGHT]==NULL)
){
doit=1;
}
}
else{
if(i1==0||i2==ibartemp){
doit=1;
}
}
if(doit==1){
mesh_boundary = YES;
if(is_extface[0]==1&&i1 == 0){
if(is_extface[0]==MESH_EXT&&i1 == 0){
ext_wall = 1;
meshi->boundarytype[n] = LEFTwall;
}
if(is_extface[1]==1&&i2 == ibartemp){
if(is_extface[1]==MESH_EXT&&i2 == ibartemp){
ext_wall = 1;
meshi->boundarytype[n] = RIGHTwall;
}
Expand Down Expand Up @@ -1742,7 +1755,13 @@ FILE_SIZE ReadBoundaryBndf(int ifile, int flag, int *errorcode){
*xyzpatch_ignitecopy++ = xplttemp[i1]+dxx;
*xyzpatch_ignitecopy++ = yplttemp[j]+dy_factor;
*xyzpatch_ignitecopy++ = zplttemp[k]+dz_factor;
*patchblankcopy++ = NodeInInternalVent(meshi,i1,j,k,1,mesh_boundary,wallcenter);
*patchblankcopy = NodeInInternalVent(meshi,i1,j,k,1,mesh_boundary,wallcenter);
//xx if(*patchblankcopy==1){
// if(i1==0||i2==ibartemp){
// *patchblankcopy=0;
// }
// }
patchblankcopy++;
}
}
}
Expand Down Expand Up @@ -1796,15 +1815,28 @@ FILE_SIZE ReadBoundaryBndf(int ifile, int flag, int *errorcode){
ext_wall=0;
mesh_boundary = NO;
if(i1==0&&i2==ibartemp&&k1==0&&k2==kbartemp){
if((j1==0 &&meshi->nabors[MFRONT]==NULL)||
(j2==jbartemp&&meshi->nabors[MBACK]==NULL)
){
int doit;

doit = 0;
if(show_bndf_mesh_interface==1){
if((j1==0&&meshi->nabors[MFRONT]==NULL)||
(j2==jbartemp&&meshi->nabors[MBACK]==NULL)
){
doit = 1;
}
}
else{
if(j1==0||j2==jbartemp){
doit = 1;
}
}
if(doit==1){
mesh_boundary = YES;
if(is_extface[2]==1&&j1 == 0){
if(is_extface[2]==MESH_EXT&&j1 == 0){
ext_wall = 1;
meshi->boundarytype[n] = FRONTwall;
}
if(is_extface[3]==1&&j2 == jbartemp){
if(is_extface[3]==MESH_EXT&&j2 == jbartemp){
ext_wall = 1;
meshi->boundarytype[n] = BACKwall;
}
Expand Down Expand Up @@ -1895,15 +1927,28 @@ FILE_SIZE ReadBoundaryBndf(int ifile, int flag, int *errorcode){
ext_wall=0;
mesh_boundary = NO;
if(i1==0&&i2==ibartemp&&j1==0&&j2==jbartemp){
if((k1==0 &&meshi->nabors[MDOWN]==NULL)||
(k2==kbartemp&&meshi->nabors[MUP]==NULL)
){
int doit;

doit = 0;
if(show_bndf_mesh_interface==1){
if((k1==0&&meshi->nabors[MDOWN]==NULL)||
(k2==kbartemp&&meshi->nabors[MUP]==NULL)
){
doit = 1;
}
}
else{
if(k1==0||k2==kbartemp){
doit = 1;
}
}
if(doit==1){
mesh_boundary = YES;
if(is_extface[4]==1&&k1 == 0){
if(is_extface[4]==MESH_EXT&&k1 == 0){
ext_wall = 1;
meshi->boundarytype[n] = DOWNwall;
}
if(is_extface[5]==1&&k2 == kbartemp){
if(is_extface[5]==MESH_EXT&&k2 == kbartemp){
ext_wall = 1;
meshi->boundarytype[n] = UPwall;
}
Expand Down
14 changes: 7 additions & 7 deletions Source/smokeview/IOvolsmoke.c
View file
Expand Up @@ -392,6 +392,8 @@ void InitVolsmokeSuperTexture(supermeshdata *smesh){
int MeshConnect(meshdata *mesh_from, int val, meshdata *mesh_to){
float *eps;

// returns 1 if mesh_from is 'val' of mesh_to (where val is MLEFT, MRIGHT, MFRONT, MBACK, MDOWN, MBACK )

eps = mesh_from->boxeps;
switch(val){
case MLEFT:
Expand Down Expand Up @@ -580,38 +582,36 @@ void InitNabors(void){
int j;

meshi = meshinfo+i;
for(j = i+1;j<nmeshes;j++){
for(j = 0;j<nmeshes;j++){
meshdata *meshj;

if(i==j)continue;

meshj = meshinfo+j;

if(MeshConnect(meshi, MLEFT, meshj)==1){
meshi->nabors[MRIGHT] = meshj;
meshj->nabors[MLEFT] = meshi;
continue;
}
if(MeshConnect(meshi, MRIGHT, meshj)==1){
meshi->nabors[MLEFT] = meshj;
meshj->nabors[MRIGHT] = meshi;
continue;
}
if(MeshConnect(meshi, MFRONT, meshj)==1){
meshi->nabors[MBACK] = meshj;
meshj->nabors[MFRONT] = meshi;
continue;
}
if(MeshConnect(meshi, MBACK, meshj)==1){
meshi->nabors[MFRONT] = meshj;
meshj->nabors[MBACK] = meshi;
continue;
}
if(MeshConnect(meshi, MDOWN, meshj)==1){
meshi->nabors[MUP] = meshj;
meshj->nabors[MDOWN] = meshi;
continue;
}
if(MeshConnect(meshi, MUP, meshj)==1){
meshi->nabors[MDOWN] = meshj;
meshj->nabors[MUP] = meshi;
continue;
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions Source/smokeview/glui_display.cpp
View file
Expand Up @@ -110,6 +110,7 @@ GLUI_Checkbox *CHECKBOX_visColorbarHorizontal = NULL;
GLUI_Checkbox *CHECKBOX_labels_timebar=NULL;
GLUI_Checkbox *CHECKBOX_labels_ticks=NULL;
GLUI_Checkbox *CHECKBOX_labels_title=NULL;
GLUI_Checkbox *CHECKBOX_labels_showonly_buildinfo = NULL;
GLUI_Checkbox *CHECKBOX_labels_chid=NULL;
GLUI_Checkbox *CHECKBOX_labels_axis=NULL;
GLUI_Checkbox *CHECKBOX_labels_hms=NULL;
Expand Down Expand Up @@ -643,6 +644,7 @@ extern "C" void GluiLabelsSetup(int main_window){
CHECKBOX_labels_timelabel = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Time label"), &visTimelabel, LABELS_label, LabelsCB);
CHECKBOX_labels_timebar = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Time bar"), &visTimebar, LABELS_label, LabelsCB);
CHECKBOX_labels_title = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Title"), &visTitle, LABELS_label, LabelsCB);
CHECKBOX_labels_showonly_buildinfo = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Show only build info"), &showonly_buildinfo, LABELS_label, LabelsCB);
CHECKBOX_labels_chid = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("CHID"), &visCHID, LABELS_label, LabelsCB);
glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Toggle dialogs"), &toggle_dialogs);
CHECKBOX_labels_version = glui_labels->add_checkbox_to_panel(PANEL_gen1, _("Version info"), &gversion, LABELS_version, LabelsCB);
Expand Down Expand Up @@ -1313,6 +1315,7 @@ extern "C" void LabelsCB(int var){
if(CHECKBOX_labels_hrrlabel!=NULL)CHECKBOX_labels_hrrlabel->set_int_val(visHRRlabel);
if(CHECKBOX_labels_firecutoff!=NULL)CHECKBOX_labels_firecutoff->set_int_val(show_firecutoff);
if(CHECKBOX_labels_title!=NULL)CHECKBOX_labels_title->set_int_val(visTitle);
if(CHECKBOX_labels_showonly_buildinfo!=NULL)CHECKBOX_labels_showonly_buildinfo->set_int_val(showonly_buildinfo);
if(CHECKBOX_labels_chid!=NULL)CHECKBOX_labels_chid->set_int_val(visCHID);
if(CHECKBOX_visColorbarVertical!=NULL)CHECKBOX_visColorbarVertical->set_int_val(visColorbarVertical);
if(CHECKBOX_labels_timebar!=NULL)CHECKBOX_labels_timebar->set_int_val(visTimebar);
Expand Down
2 changes: 1 addition & 1 deletion Source/smokeview/infoheader.c
View file
Expand Up @@ -82,7 +82,7 @@ int renderInfoHeader(titledata *titleinfo_ptr) {
int pen_pos = textbox_top - titleinfo_ptr->text_height;

// first display hardcoded lines
if(visTitle==1){
if(visTitle==1&&showonly_buildinfo==0){
OutputText(left, pen_pos, titleinfo_ptr->titleline);
pen_pos -= titleinfo_ptr->text_height;
pen_pos -= titleinfo_ptr->line_space;
Expand Down
12 changes: 11 additions & 1 deletion Source/smokeview/menus.c
View file
Expand Up @@ -57,7 +57,9 @@ float slice_load_time;

#define MENU_OPTION_TRAINERMENU 2

#define MENU_UPDATEBOUNDS -6
#define MENU_UPDATEBOUNDS -6
#define MENU_BNDF_SHOW_MESH_INTERFACE -8


#define MENU_DUMMY3 -2

Expand Down Expand Up @@ -5233,6 +5235,10 @@ void LoadBoundaryMenu(int value){
}
else{
switch(value){
case MENU_BNDF_SHOW_MESH_INTERFACE:
show_bndf_mesh_interface = 1-show_bndf_mesh_interface;
updatemenu = 1;
break;
case MENU_UPDATEBOUNDS:
UpdateAllBoundaryBounds();
break;
Expand Down Expand Up @@ -10772,6 +10778,10 @@ updatemenu=0;
}

glutAddMenuEntry("-",MENU_DUMMY3);
if(nmeshes>1){
if(show_bndf_mesh_interface==1)glutAddMenuEntry("*show on mesh interface", MENU_BNDF_SHOW_MESH_INTERFACE);
if(show_bndf_mesh_interface==0)glutAddMenuEntry("show on mesh interface", MENU_BNDF_SHOW_MESH_INTERFACE);
}
glutAddMenuEntry(_("Update bounds"),MENU_UPDATEBOUNDS);
if(nboundaryslicedups>0){
GLUTADDSUBMENU(_("Duplicate boundary slices"),duplicateboundaryslicemenu);
Expand Down

0 comments on commit 49fe555

Please sign in to comment.