Merge pull request #198 from NREL/3.6.0

Run regression test suite with 3.6.0 official (+3 way comparison)

Analyzing_Regression_Tests.ipynb

@@ -165,7 +165,7 @@
     "# Force a new version (don't want to be prompted each time I parse df_files)\n",
     "new_version = compat_matrix.iloc[0].copy()\n",
     "new_version['OpenStudio'] = version\n",
-    "new_version['E+'] = \"22.1.0\"\n",
+    "new_version['E+'] = \"23.1.0\"\n",
     "new_version['SHA'] = sha\n",
     "new_version['Released'] = 'TBD'\n",
     "new_version['Has_Docker'] = False\n",
@@ -352,7 +352,7 @@
    "outputs": [],
    "source": [
     "# Limit to most recent versions so to no clutter display\n",
-    "df_files = df_files[['9.6.0', '22.1.0', '22.2.0']]\n",
+    "df_files = df_files[['22.1.0', '22.2.0', '23.1.0']]\n",
     "#df_files = df_files[['9.4.0', '9.5.0']]"
    ]
   },
@@ -381,10 +381,13 @@
    "source": [
     "# Limit to most recent versions so to no clutter display\n",
     "df_files = df_files[[\n",
-    "    '9.2.0', '9.3.0', \n",
-    "    '9.4.0',\n",
-    "    '9.5.0',\n",
-    "    '9.6.0'\n",
+    "    #'9.2.0', '9.3.0', \n",
+    "    #'9.4.0',\n",
+    "    #'9.5.0',\n",
+    "    #'9.6.0'\n",
+    "    '22.1.0',\n",
+    "    '22.2.0',\n",
+    "    '23.1.0',\n",
     "]]"
    ]
   },
@@ -418,7 +421,7 @@
     "        v = version.parse(os_version)\n",
     "        if v >= version.parse(SPACE_DEFAULTED_TO_ON):\n",
     "            if space_enabled:\n",
-    "                if space_tag == '' or space_tag == 'WithSpaces':\n",
+    "                if space_tag != 'WithoutSpaces':\n",
     "                    cols.append(col)\n",
     "            else:\n",
     "                if space_tag == 'WithoutSpaces':\n",
@@ -428,7 +431,7 @@
     "                if space_tag == 'WithSpaces':\n",
     "                    cols.append(col)\n",
     "            else:\n",
-    "                if space_tag == '' or space_tag == 'WithoutSpaces':\n",
+    "                if space_tag != 'WithSpaces':\n",
     "                    cols.append(col)\n",
     "    return df_files[cols]"
    ]
@@ -583,7 +586,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "scrolled": true
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -611,9 +614,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "(success[success[('22.2.0', '3.5.1', \n",
-    "                  #'0eb8ab883b'\n",
-    "                  'WithoutSpaces'\n",
+    "(success[success[('23.1.0', '3.6.0', \n",
+    "                  #'a15a590095'\n",
+    "                  #'WithoutSpaces'\n",
     "                 )] != 'Success'].style\n",
     "          .applymap(background_colors)\n",
     "          .set_table_styles(styles)\n",
@@ -658,8 +661,8 @@
    "source": [
     "# Output command to rerun the tests that used to run in the previous version\n",
     "# and now don't\n",
-    "torun = success[(success[('9.6.0', '3.3.0', '')] == 'Success') &\n",
-    "                (success[('22.1.0', '3.4.0-alpha', '0eb8ab883b')] != 'Success')]\n",
+    "torun = success[(success[('22.2.0', '3.5.1', '')] == 'Success') &\n",
+    "                (success[('23.1.0', '3.6.0-alpha', 'a15a590095')] != 'Success')]\n",
     "\n",
     "# s = \"CUSTOMTAG=SHA /home/julien/Software/Others/OS-build/Products/openstudio-2.7.0 model_tests.rb -n '/\"\n",
     "s = \"openstudio model_tests.rb -n '/\"\n",
@@ -985,8 +988,8 @@
    "outputs": [],
    "source": [
     "threshold = 0.1 / 100.0\n",
-    "NEW_EP = \"22.2.0\"\n",
-    "NEW_OS = \"3.5.1\"\n",
+    "NEW_EP = \"23.1.0\"\n",
+    "NEW_OS = \"3.6.0\"\n",
     "new_diffs = site_kbtu_change.loc[site_kbtu_change[(NEW_EP, NEW_OS)].abs() >= threshold, NEW_EP]\n",
     "# Sort by abs of 2.4.2\n",
     "new_diffs = new_diffs.loc[new_diffs[NEW_OS].abs().sort_values(ascending=False).index]\n",
@@ -1013,7 +1016,7 @@
    "outputs": [],
    "source": [
     "# Output command to run the ones were we have big diffs\n",
-    "torun = new_diffs[new_diffs['3.5.1'].abs()>= (0.1/100.0)]\n",
+    "torun = new_diffs[new_diffs[NEW_OS].abs()>= (0.1/100.0)]\n",
     "\n",
     "s = \"openstudio model_tests.rb -n '/\"\n",
     "tests = []\n",
@@ -1063,7 +1066,9 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "scrolled": false
+   },
    "outputs": [],
    "source": [
     "def style_zero(v, props=''):\n",
@@ -3199,7 +3204,7 @@
     "width": "450px"
    },
    "toc_section_display": true,
-   "toc_window_display": false
+   "toc_window_display": true
   }
  },
  "nbformat": 4,

SDD_tests.rb

@@ -313,6 +313,10 @@ def test_FT_coil_waterheating_desuperheater_2
     sdd_ft_test('coil_waterheating_desuperheater_2.osm')
   end
 
+  def test_FT_coil_userdefined
+    sdd_ft_test('coil_userdefined.osm')
+  end
+
   def test_FT_cooling_coils
     sdd_ft_test('cooling_coils.osm')
   end
@@ -441,6 +445,10 @@ def test_FT_ghx_horizontal_trench_kusuda
     sdd_ft_test('ghx_horizontal_trench_kusuda.osm')
   end
 
+  def test_FT_ghx_horizontal_trench_xing
+    sdd_ft_test('ghx_horizontal_trench_xing.osm')
+  end
+
   def test_FT_headered_pumps
     sdd_ft_test('headered_pumps.osm')
   end
@@ -453,6 +461,10 @@ def test_FT_heatexchanger_desiccant_balancedflow
     sdd_ft_test('heatexchanger_desiccant_balancedflow.osm')
   end
 
+  def test_FT_heatpump_airtowater_fuelfired
+    sdd_ft_test('heatpump_airtowater_fuelfired.osm')
+  end
+
   def test_FT_heatpump_hot_water
     sdd_ft_test('heatpump_hot_water.osm')
   end
@@ -557,6 +569,10 @@ def test_FT_outputcontrol_files
     sdd_ft_test('outputcontrol_files.osm')
   end
 
+  def test_FT_outputcontrol_timestamp
+    sdd_ft_test('outputcontrol_timestamp.osm')
+  end
+
   def test_FT_output_objects
     sdd_ft_test('output_objects.osm')
   end
@@ -681,6 +697,10 @@ def test_FT_solar_collector_flat_plate_photovoltaicthermal
     sdd_ft_test('solar_collector_flat_plate_photovoltaicthermal.osm')
   end
 
+  def test_FT_solar_collector_flat_plate_photovoltaicthermal_bipvt
+    sdd_ft_test('solar_collector_flat_plate_photovoltaicthermal_bipvt.osm')
+  end
+
   def test_FT_solar_collector_flat_plate_water
     sdd_ft_test('solar_collector_flat_plate_water.osm')
   end
@@ -777,6 +797,14 @@ def test_FT_vrf_airloophvac
     sdd_ft_test('vrf_airloophvac.osm')
   end
 
+  def test_FT_vrf_fluid_temperature_control
+    sdd_ft_test('vrf_fluid_temperature_control.osm')
+  end
+
+  def test_FT_vrf_fluid_temperature_control_hr
+    sdd_ft_test('vrf_fluid_temperature_control_hr.osm')
+  end
+
   def test_FT_vrf_watercooled
     sdd_ft_test('vrf_watercooled.osm')
   end