pull develop and merge conflicts

Author: dareumnam

.git-blame-ignore-revs

@@ -531,3 +531,11 @@ ab5c96312d0cddec395e9616f23a8bd5f433ac6e
 
 # Apply clang-format-19 and clang-tidy --checks=-*,readability-braces-around-statements [Julien Marrec, 2025-05-23]
 9985a5f1a0f9e6fbb59033996f2d17f2a8eaf6fb
+
+# [chore] Reformat IDFs [Julien Marrec, 2025-10-10]
+c52230939b1c05078af093479e7ad8fd68068931
+92edaf24429481630f8ba3c4aad8da464814e938
+0eeb10edfde3c9d9bf015722b962164686ddb339
+de3778bc1cfa756d84cc3e925e811fea4b232765
+8b1dd8074891e1baa85e72799d861c143d479798
+1ccaafed343cc3f6d58cea99275a9001ccfd29a4

.github/pull_request_template.md

@@ -23,6 +23,11 @@ Pull request overview
  - [ ] If IDD requires transition, transition source, rules, ExpandObjects, and IDFs must be updated, and add IDDChange label
  - [ ] If structural output changes, add to output rules file and add OutputChange label
  - [ ] If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies
+ - [ ] If adding/removing any output files (e.g., eplustbl.*)
+   - [ ] Update ..\scripts\Epl-run.bat
+   - [ ] Update ..\scripts\RunEPlus.bat
+   - [ ] Update ..\src\EPLaunch\ MainModule.bas, epl-ui.frm, and epl.vbp (VersionComments)
+   - [ ] Update ..\.github\workflows\energyplus.py
 
 ### Reviewer
 

bin/EP-Launch/EP-Launch.exe

@@ -151,18 +151,26 @@ def get_linked_libraries(p: Path):
         # along with the /usr/share/tcltk/tclX.Y and /usr/share/tcltk/tkX.Y folders.
         # while I think X.Y will be 8.6, I'll try my best to be flexible for version and architecture
         arch = platform.machine()  # x86_64, arm64, aarch64
-        base_lib_dir = Path('/usr/lib')
-        arch_lib_dir = base_lib_dir / f"{arch}-linux-gnu"
+        if platform.freedesktop_os_release()['ID'] in ['centos', 'almalinux']:
+            arch_lib_dir = Path('/usr/lib64')
+            tcl_tk_root_dir = Path('/usr/share')
+        else:
+            arch_lib_dir = Path('/usr/lib') / f"{arch}-linux-gnu"
+            tcl_tk_root_dir = Path('/usr/share/tcltk')
+
         lib_tk_search_path = arch_lib_dir / "libtk[0-9]*.[0-9]*.so"
         tk_candidates = glob.glob(str(lib_tk_search_path))
         if not tk_candidates:
             print(f"Could not find the libtk .so file, expected it inside {arch_lib_dir}")
             sys.exit(1)
         found_tk_so = Path(tk_candidates[0])
+        print(f"Found libtk at: {found_tk_so}")
         target_tk_so = lib_dynload_dir / found_tk_so.name
+        print(f"Copying libtk to: {target_tk_so}")
         shutil.copy(found_tk_so, target_tk_so)
         # we also need to find the _tkinter....so file in the python_lib/lib-dynload folder, and fixup the rpath
         matches = list(lib_dynload_dir.glob("_tkinter*.so"))
+        print("DEBUG Matches:", matches)
         if len(matches) == 1:
             file_path = matches[0]
             print("DEBUG Found:", file_path)
@@ -176,7 +184,6 @@ def get_linked_libraries(p: Path):
         else:
             subprocess.check_output(["patchelf", "--set-rpath", '$ORIGIN', file_path])
         # and then grab the tcl and tk config/data folders as well
-        tcl_tk_root_dir = Path('/usr/share/tcltk')
         if not tcl_tk_root_dir.exists():
             print(f"TclTk directory not found at expected location: {tcl_tk_root_dir}, make sure it is installed")
         tcl_search_path = tcl_tk_root_dir / "tcl[0-9]*.[0-9]*"

cmake/PythonFixUpTclTk.py

@@ -15,9 +15,6 @@
 !===============================================================================
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
-!  Version,
-!    9.0;                    !- Version Identifier
-
   Construction,
     Light Exterior Wall,     !- Name
     F08 Metal surface,       !- Outside Layer

datasets/ASHRAE_2005_HOF_Materials.idf

@@ -143,9 +143,6 @@
 ! Refrigerant = R407-C
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
-!  Version,
-!    9.0;                    !- Version Identifier
-
   Chiller:Electric:EIR,
     ElectricEIRChiller McQuay AGZ010BS 34.5kW/2.67COP,  !- Name
     34465,                   !- Reference Capacity {W}

datasets/AirCooledChiller.idf

@@ -18,9 +18,6 @@
 !
 ! The objects and syntax in this dataset comply with EnergyPlus, Version 8.4.0 and above, unless otherwise noted.
 
-!  Version,
-!    9.0;                    !- Version Identifier
-
   Curve:Biquadratic,
     CondensingBoilerEff,     !- Name
     1.124970374,             !- Coefficient1 Constant