Merge branch 'development' into Terrain_Turbines

Tests/ERFGoldFiles/ABL_InflowFile/Header

@@ -19,9 +19,18 @@ pressure
 15.625 15.625 15.625 
 0
 0
-0 1 0.99999999999999989
+0 4 0.99999999999999989
 10
+0 250
+0 250
 0 500
+250 500
+0 250
 0 500
+0 250
+250 500
+0 500
+250 500
+250 500
 0 500
 Level_0/Cell

Tests/ERFGoldFiles/ABL_InflowFile/Level_0/Cell_H

@@ -2,15 +2,27 @@
 1
 8
 0
-(1 0
-((0,0,0) (31,31,31) (0,0,0))
+(4 0
+((0,0,0) (15,15,31) (0,0,0))
+((16,0,0) (31,15,31) (0,0,0))
+((0,16,0) (15,31,31) (0,0,0))
+((16,16,0) (31,31,31) (0,0,0))
 )
-1
+4
 FabOnDisk: Cell_D_00000 0
+FabOnDisk: Cell_D_00001 0
+FabOnDisk: Cell_D_00002 0
+FabOnDisk: Cell_D_00003 0
 
-1,8
-1.0000000003754534e+00,0.0000000000000000e+00,-1.7316584804110585e-01,-1.7316584804110585e-01,-1.0106435317010281e+01,2.8256769917799517e+02,2.9999999999999949e+02,8.1096929694532722e+04,
+4,8
+1.01798799191562162e+00,0.00000000000000000e+00,4.27390479969604220e-01,4.27390479969604220e-01,-1.01522939043194711e+01,2.84589961793701434e+02,2.99999999999999432e+02,8.31465299892798066e+04,
+1.00889303602830860e+00,0.00000000000000000e+00,-1.73803526690654575e-01,4.50861078919099267e-01,-6.70700511483892114e+00,2.83570184012103198e+02,2.99999999999999375e+02,8.21083993721470906e+04,
+1.00889303602830860e+00,0.00000000000000000e+00,4.50861078919099267e-01,-1.73803526690654575e-01,-6.70700511483892114e+00,2.83570184012103198e+02,2.99999999999999375e+02,8.21083993721470906e+04,
+1.00000000269682721e+00,0.00000000000000000e+00,-6.84933040776856263e-07,-6.84933040776856263e-07,-3.35653910525352028e+00,2.82567699440373190e+02,2.99999999999999488e+02,8.10969299580915249e+04,
 
-1,8
-1.0537717450774926e+00,0.0000000000000000e+00,1.1354205048654020e+01,1.1354205048654020e+01,-2.7324316378820716e-09,2.8855003753604581e+02,3.0000000000000051e+02,8.7266906583205549e+04,
+4,8
+1.04215536146586696e+00,0.00000000000000000e+00,1.02909397732864463e+01,1.02909397732864374e+01,-1.70052962581241723e-01,2.87273457996890386e+02,3.00000000000000568e+02,8.59230858695317729e+04,
+1.04867270937310719e+00,0.00000000000000000e+00,1.16744461248702027e+01,9.55168481496642485e+00,-8.48748413339539404e-02,2.87990725394264530e+02,3.00000000000000625e+02,8.66763000965030806e+04,
+1.04867270937310719e+00,0.00000000000000000e+00,9.55168481496640354e+00,1.16744461248701867e+01,-8.48748413339539404e-02,2.87990725394264530e+02,3.00000000000000625e+02,8.66763000965030806e+04,
+1.05478389837360353e+00,0.00000000000000000e+00,8.77865303938175856e+00,8.77865303938175856e+00,-2.01015601756943985e-08,2.88660867138143828e+02,3.00000000000000512e+02,8.73842775726404652e+04,
 

Tests/ERFGoldFiles/MSF_Sub_IsentropicVortexAdv/Level_0/Cell_H

@@ -15,14 +15,14 @@ FabOnDisk: Cell_D_00002 0
 FabOnDisk: Cell_D_00003 0
 
 4,8
-1.0687378170290818e+00,5.8684992058792886e+02,4.7273975797176536e+02,0.0000000000000000e+00,2.9018234510495824e+02,2.9999999999999977e+02,-5.2833702481836203e-03,8.9006978815733746e+04,
-9.6106706681582399e-01,5.8674769553455599e+02,4.9847304828922745e+02,0.0000000000000000e+00,2.7811473135932681e+02,2.9999999999999977e+02,-2.7863386454750852e-02,7.6711342913358589e+04,
-9.6535715161461311e-01,4.6577645246185125e+02,3.7165509150230423e+02,0.0000000000000000e+00,2.7861065586330261e+02,2.9999999999999983e+02,-3.0122642530997081e-02,7.7191172487105301e+04,
-6.2049477948149068e-01,3.7691788189042450e+02,3.9372910329576467e+02,0.0000000000000000e+00,2.3346284204221624e+02,2.9999999999999983e+02,-1.0765236668307131e-02,4.1575530236060724e+04,
+1.07658574107412908e+00,5.86850026255882540e+02,4.69215589626249084e+02,0.00000000000000000e+00,2.91032818131098907e+02,2.99999999999999716e+02,-5.04012861339698821e-03,8.99233514869690989e+04,
+9.47679395638796662e-01,5.86749314863994641e+02,4.96651204814916014e+02,0.00000000000000000e+00,2.76558550704602794e+02,2.99999999999999659e+02,-2.77570499676687496e-02,7.52194971346676175e+04,
+9.50370596086030250e-01,4.68566496083731522e+02,3.72861632300030010e+02,0.00000000000000000e+00,2.76872429590103820e+02,2.99999999999999659e+02,-3.01888883756608120e-02,7.55187163774589717e+04,
+6.00131709915497358e-01,3.78228255038707175e+02,3.98799180170805130e+02,0.00000000000000000e+00,2.30367466011140493e+02,2.99999999999999659e+02,-1.09179362618595181e-02,3.96779857091296290e+04,
 
 4,8
-1.1640109625928585e+00,7.2169751091751789e+02,5.8686223681337583e+02,0.0000000000000000e+00,3.0026543648779989e+02,3.0000000000000023e+02,2.5182590216664565e-03,1.0031001855098477e+05,
-1.1646524184856153e+00,7.9402771725271270e+02,7.0131692378042953e+02,0.0000000000000000e+00,3.0033161290948846e+02,3.0000000000000017e+02,8.2550695729043562e-03,1.0038741658562105e+05,
-1.1688682391610963e+00,7.0339372490431833e+02,5.8694871738517020e+02,0.0000000000000000e+00,3.0076599896006576e+02,3.0000000000000023e+02,8.6815030187501717e-03,1.0089652137434231e+05,
-1.1627700696120389e+00,7.4562969700260476e+02,7.7731317207311338e+02,0.0000000000000000e+00,3.0013735642175033e+02,3.0000000000000023e+02,4.3416409288783969e-01,1.0016034089325159e+05,
+1.16528085359614564e+00,7.16591894728667285e+02,5.86862120160448058e+02,0.00000000000000000e+00,3.00396424825435986e+02,3.00000000000000341e+02,2.39130714576801968e-03,1.00463260070952747e+05,
+1.16662252816916134e+00,7.93346054055838636e+02,7.04723061469502227e+02,0.00000000000000000e+00,3.00534724572211985e+02,3.00000000000000284e+02,8.23681688075770906e-03,1.00625236512537231e+05,
+1.16795929715122315e+00,7.01282542667013558e+02,5.86934115437486298e+02,0.00000000000000000e+00,3.00672423775172660e+02,3.00000000000000341e+02,8.61039185654702624e-03,1.00786694837873947e+05,
+1.16212343825581788e+00,7.56819021484184645e+02,7.81839166754114331e+02,0.00000000000000000e+00,3.00070581185843196e+02,3.00000000000000398e+02,4.40636252098705883e-01,1.00082368936281622e+05,
 

Tests/ERFGoldFiles/TaylorGreenAdvecting/Header

@@ -19,18 +19,12 @@ pressure
 0.39269908169872414 0.39269908169872414 0.39269908169872414 
 0
 0
-0 4 1.5999999999999999
+0 2 1.5999999999999999
 10
-0 3.1415926535897931
-0 3.1415926535897931
 0 6.2831853071795862
-3.1415926535897931 6.2831853071795862
 0 3.1415926535897931
 0 6.2831853071795862
-0 3.1415926535897931
-3.1415926535897931 6.2831853071795862
 0 6.2831853071795862
 3.1415926535897931 6.2831853071795862
-3.1415926535897931 6.2831853071795862
 0 6.2831853071795862
 Level_0/Cell

Tests/ERFGoldFiles/TaylorGreenAdvecting/Level_0/Cell_H

@@ -2,27 +2,19 @@
 1
 8
 0
-(4 0
-((0,0,0) (7,7,15) (0,0,0))
-((8,0,0) (15,7,15) (0,0,0))
-((0,8,0) (7,15,15) (0,0,0))
-((8,8,0) (15,15,15) (0,0,0))
+(2 0
+((0,0,0) (15,7,15) (0,0,0))
+((0,8,0) (15,15,15) (0,0,0))
 )
-4
+2
 FabOnDisk: Cell_D_00000 0
 FabOnDisk: Cell_D_00001 0
-FabOnDisk: Cell_D_00002 0
-FabOnDisk: Cell_D_00003 0
 
-4,8
-7.5433440882348146e-01,-9.2025245107849285e-01,-9.2025245107849307e-01,-2.9580246470242910e-01,1.4701727101597225e-03,4.7845602347274911e-02,9.9999999999999933e-01,5.0855995124282294e-01,
-7.5433440882344471e-01,-9.2025245107851184e-01,-9.2025245107849352e-01,-2.9580246470464955e-01,1.4701727101597048e-03,4.7845602347274814e-02,9.9999999999999956e-01,5.0855995124280629e-01,
-7.5433440882344360e-01,-9.2025245107851361e-01,-9.2025245107849440e-01,-2.9580246470345151e-01,1.4701727101597039e-03,4.7845602347274814e-02,9.9999999999999911e-01,5.0855995124280495e-01,
-7.5433440882344405e-01,-9.2025245107849452e-01,-9.2025245107851195e-01,-2.9580246470345428e-01,1.4701727101597039e-03,4.7845602347274828e-02,9.9999999999999911e-01,5.0855995124280440e-01,
+2,8
+7.54965646267797608e-01,-9.26267930708506881e-01,-9.26267930708505105e-01,-2.91797012757263774e-01,1.46617693961371108e-03,4.78152547962134855e-02,9.99999999999998779e-01,5.04858515065251368e-01,
+7.54965646267796164e-01,-9.26267930708476461e-01,-9.26267930708466691e-01,-2.91797012757263774e-01,1.46617693961369850e-03,4.78152547962134508e-02,9.99999999999999001e-01,5.04858515065236602e-01,
 
-4,8
-1.2085255459965365e+00,9.2025245107849274e-01,9.2025245107849341e-01,2.9580246470242899e-01,3.2379047223136180e-03,8.6063821508898644e-02,1.0000000000000009e+00,1.1200289023036372e+00,
-1.2085255460031530e+00,9.2025245107849418e-01,9.2025245107851317e-01,2.9580246470345434e-01,3.2379047223234565e-03,8.6063821508901253e-02,1.0000000000000009e+00,1.1200289023154475e+00,
-1.2085255460031414e+00,9.2025245107849341e-01,9.2025245107851172e-01,2.9580246470466975e-01,3.2379047223223042e-03,8.6063821508898394e-02,1.0000000000000007e+00,1.1200289023142906e+00,
-1.2085255460024551e+00,9.2025245107851150e-01,9.2025245107849329e-01,2.9580246470345151e-01,3.2379047223240801e-03,8.6063821508898533e-02,1.0000000000000007e+00,1.1200289023162506e+00,
+2,8
+1.20417494601597208e+00,9.26267930708507103e-01,9.26267930708468468e-01,2.91797012757263718e-01,3.23899039185244521e-03,8.60966082166117197e-02,1.00000000000000111e+00,1.11938928003323324e+00,
+1.20417494601597141e+00,9.26267930708508103e-01,9.26267930708505549e-01,2.91797012757263774e-01,3.23899039185244521e-03,8.60966082166117336e-02,1.00000000000000133e+00,1.11938928003323324e+00,
 

Tests/ERFGoldFiles/TaylorGreenAdvectingDiffusing/Header

@@ -19,18 +19,12 @@ pressure
 0.39269908169872414 0.39269908169872414 0.39269908169872414 
 0
 0
-0 4 1.5999999999999999
+0 2 1.5999999999999999
 10
-0 3.1415926535897931
-0 3.1415926535897931
 0 6.2831853071795862
-3.1415926535897931 6.2831853071795862
 0 3.1415926535897931
 0 6.2831853071795862
-0 3.1415926535897931
-3.1415926535897931 6.2831853071795862
 0 6.2831853071795862
 3.1415926535897931 6.2831853071795862
-3.1415926535897931 6.2831853071795862
 0 6.2831853071795862
 Level_0/Cell

Tests/ERFGoldFiles/TaylorGreenAdvectingDiffusing/Level_0/Cell_H

@@ -2,27 +2,19 @@
 1
 8
 0
-(4 0
-((0,0,0) (7,7,15) (0,0,0))
-((8,0,0) (15,7,15) (0,0,0))
-((0,8,0) (7,15,15) (0,0,0))
-((8,8,0) (15,15,15) (0,0,0))
+(2 0
+((0,0,0) (15,7,15) (0,0,0))
+((0,8,0) (15,15,15) (0,0,0))
 )
-4
+2
 FabOnDisk: Cell_D_00000 0
 FabOnDisk: Cell_D_00001 0
-FabOnDisk: Cell_D_00002 0
-FabOnDisk: Cell_D_00003 0
 
-4,8
-7.5495077150450440e-01,-9.1757346108594051e-01,-9.1757346108557425e-01,-2.9412209076469820e-01,1.4704378885217247e-03,4.7841943380269682e-02,9.9999999999999933e-01,5.0901730987358040e-01,
-7.5495077150383538e-01,-9.1757346108557392e-01,-9.1757346108557503e-01,-2.9412209076469814e-01,1.4704378885217245e-03,4.7841943380269668e-02,9.9999999999999911e-01,5.0901730987358051e-01,
-7.5495077150321210e-01,-9.1757346108307758e-01,-9.1757346108594118e-01,-2.9412209076469820e-01,1.4704378885217254e-03,4.7841943380269682e-02,9.9999999999999911e-01,5.0901730987358074e-01,
-7.5495077150320977e-01,-9.1757346108557192e-01,-9.1757346108308124e-01,-2.9412209076469820e-01,1.4704378885217247e-03,4.7841943380269675e-02,9.9999999999999911e-01,5.0901730987358074e-01,
+2,8
+7.55548894122176184e-01,-9.23478563196197588e-01,-9.23478563196197699e-01,-2.90177620512234280e-01,1.46645260116578082e-03,4.78119497307289490e-02,9.99999999999998890e-01,5.05313052051480360e-01,
+7.55548894122174741e-01,-9.23478563196197477e-01,-9.23478563196197810e-01,-2.90177620512234224e-01,1.46645260116578103e-03,4.78119497307289767e-02,9.99999999999998890e-01,5.05313052051481137e-01,
 
-4,8
-1.2093553897617892e+00,9.1757346108557547e-01,9.1757346108594173e-01,2.9412209076469809e-01,3.2366734239224725e-03,8.6074962601959931e-02,1.0000000000000007e+00,1.1170393036825446e+00,
-1.2093553897617890e+00,9.1757346108594140e-01,9.1757346108308147e-01,2.9412209076469831e-01,3.2366734239224716e-03,8.6074962601959432e-02,1.0000000000000011e+00,1.1170393036825419e+00,
-1.2093553897617895e+00,9.1757346108557325e-01,9.1757346108632643e-01,2.9412209076469814e-01,3.2366734239223120e-03,8.6074962601959931e-02,1.0000000000000009e+00,1.1170393036823556e+00,
-1.2093553897617888e+00,9.1757346108308324e-01,9.1757346108632698e-01,2.9412209076469814e-01,3.2366734239223016e-03,8.6074962601959584e-02,1.0000000000000007e+00,1.1170393036823454e+00,
+2,8
+1.20366646231161756e+00,9.23478563196197921e-01,9.23478563196197033e-01,2.90177620512234058e-01,3.23778469725445172e-03,8.61060539369808142e-02,1.00000000000000111e+00,1.11648540222384218e+00,
+1.20366646231161734e+00,9.23478563196204583e-01,9.23478563196197699e-01,2.90177620512234113e-01,3.23778469725445259e-03,8.61060539369808142e-02,1.00000000000000111e+00,1.11648540222384240e+00,