Updating to master, misc style changes

This commit is contained in:
Joel Clemmer
2021-04-07 17:21:16 -06:00
parent d54384dd91
commit bd6dd658d6
17 changed files with 112 additions and 112 deletions

View File

@ -272,10 +272,10 @@ void NStencil::create_setup()
double stencil_range;
int n = ncollections;
if(nb) copy_bin_info_multi();
if (nb) copy_bin_info_multi();
// Deallocate arrays if previously allocated
if(n > maxcollections and stencil_multi){
if((n > maxcollections) && stencil_multi){
memory->destroy(nstencil_multi);
for (i = 0; i < maxcollections; i++) {
for (j = 0; j < maxcollections; j++)
@ -299,7 +299,7 @@ void NStencil::create_setup()
}
// Allocate arrays
if(!maxstencil_multi) {
if (!maxstencil_multi) {
memory->create(flag_half_multi, n, n,
"neighstencil:flag_half_multi");
memory->create(flag_skip_multi, n, n,