openstudio-analysis 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc59c73e27b32b06db2f67f981af1a23c0f415da10ee476dabe0b9a90de0bfd6
-  data.tar.gz: 875f5b5a4047f6e97246030b570c14902c940a61b909627cd605565ab0531c05
+  metadata.gz: 910d9bf7e03884f0d18b769fbcf5bb348438fffa4de56590540679f5b193c848
+  data.tar.gz: 702c4692f6ce7c4297965d6b60854657341e92f3efcf5b8ebbe312ae8cb73646
 SHA512:
-  metadata.gz: 90646bf5489ba4ea2b9a1b748efee310da650ea367fac91426287d1b7898aaf9b08989e2ea0c8dd81efe6642e80c562ddc797bb7a5c37a895f2548830755dcf8
-  data.tar.gz: c5106d321b8e4860017f801e1df137a333bfd6874656e29cb589d7e7ad24e6ad7e602ee7286591023c3a6f7b44b60a14ea8b1064cbc48f675019098ec0a1e8c7
+  metadata.gz: ac4e0cd24adb96e06a35fc463b5588ac2f40c28e6b39e652c74351b63def71549e5f4a7859060d2f403c31c54a2d3275046f1353cc0f3d256d44aa9d5ec5f62e
+  data.tar.gz: 7bdeefad3522338a73d725d10bc853b7e7a114657a3bd237a061e77eecb299b1b59d09fbbbe92eff76f507fd07bbde4bd7e6701f070ee6dd8ea2115d5ccb3d5a

data/CHANGELOG.md

@@ -1,17 +1,40 @@
-OpenStudio Analysis Gem Change Log
+OpenStudio(R) Analysis Gem Change Log
 ==================================
 
+Version 1.3.4
+-------------
+* Update licenses
+* Add download_zip, download_osm, download_osw, download_reports attributes to OSA
+* Add cli_verbose, cli_debug, initialize_worker_timeout, run_workflow_timeout, upload_results_timeout attributes to OSA
+
+Version 1.3.3
+-------------
+* Add arguments to .save_osa_zip() to add all files in weather and/or seed directories to zip file. defaults to false.
+
 Version 1.3.2
 -------------
-* Add more paths to the measures dir list 
+* Add array of search paths to .convert_osw() to find measures in various directories.
+* warn if :weather_file and :seed_model are not defined.
+* use :file_paths in the OSW to search for :seed_model and :weather_file.
+* add .stat and .ddy files to analysis.zip if in same directory as .epw defined in :weather_file.
+* use :measure_paths in OSW to search for measures. 
 
 Version 1.3.1
 -------------
-* Add method to delete a Variable 
+* Add method to delete a Variable:  **analysis.remove_variable()**
+* fix bug related to multiple calls to analysis.to_hash deleting variables
+* Add PSO and Optim to allowed algorithms 
 
 Version 1.3.0
 -------------
-* Create an OSA from an OSW
+* Create an OSA from an OSW:  **analysis.convert_osw()**
+* Add output variables and objective functions:  **analysis.add_output()**
+* Add server initialization and finalization scripts: **analysis.server_scripts.add()**
+* Set algorithm attributes:  **analysis.algorithm.set_attribute()**
+* Set algorithm type:  **analysis.analysis_type()**
+* Add additional library/data files:  **analysis.libraries.add()**
+* create analysis.json:  **File.write('analysis.json',JSON.pretty_generate(analysis.to_hash))**
+* create analysis.zip:  **analysis.save_osa_zip('analysis.zip')**
 
 Version 1.2.0
 -------------

data/LICENSE.md

@@ -1,28 +1,13 @@
-OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided 
-that the following conditions are met:
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-(1) Redistributions of source code must retain the above copyright notice, this list of conditions and 
-the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
-(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and 
-the following disclaimer in the documentation and/or other materials provided with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or 
-promote products derived from this software without specific prior written permission from the respective 
-party.
+3. Redistribution of this software, without modification, must refer to the software by the same designation. Redistribution of a modified version of this software (i) may not refer to the modified version by the same designation, or by any confusingly similar designation, and (ii) must refer to the underlying software originally provided by Alliance as “OpenStudio®”. Except to comply with the foregoing, the term “OpenStudio®”, or any confusingly similar designation may not be used to refer to any modified version of this software or any modified version of the underlying software originally provided by Alliance without the prior written consent of Alliance.
 
-(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other 
-derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar 
-designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
+4. The name of the copyright holder(s), any contributors, the United States Government, the United States Department of Energy, or any of their employees may not be used to endorse or promote products derived from this software without specific prior written permission from the respective party.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED 
-STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY 
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,16 +1,15 @@
-# OpenStudio Analysis Gem
+# OpenStudio(R) Analysis Gem
 
 [![Build Status](https://github.com/NREL/OpenStudio-analysis-gem/actions/workflows/openstudio-analysis.yml/badge.svg?branch=develop)](https://github.com/NREL/OpenStudio-analysis-gem/actions/workflows/openstudio-analysis.yml)
 [![Coverage Status](https://coveralls.io/repos/NREL/OpenStudio-analysis-gem/badge.svg?branch=develop)](https://coveralls.io/r/NREL/OpenStudio-analysis-gem?branch=develop)
 [![Gem Version](https://badge.fury.io/rb/openstudio-analysis.svg)](https://badge.fury.io/rb/openstudio-analysis)
 
-The OpenStudio Analysis Gem is used to communicate files to the OpenStudio Distributed Analysis.
+The OpenStudio Analysis Gem is used to communicate files to the [OpenStudio Analysis Framework](https://www.tandfonline.com/doi/full/10.1080/19401493.2020.1778788).
 
-The purpose of this gem is to generate the analysis.json file, analysis.zip, and communicate with the server to upload
+The purpose of this gem is to generate the analysis.json file, analysis.zip, convert an OSW to an OSA, and communicate with the server to upload
 the simulations.
 
-This gem does not create the cluster. Currently the only supported Cloud platform is
-Amazon AWS using either [OpenStudio's PAT](https://openstudio.nrel.gov) the [openstudio-aws gem](https://rubygems.org/gems/openstudio-aws) or using [vagrant](http://www.vagrantup.com/).
+This gem does not create the cluster. To manage cloud resources use the [OpenStudio Analysis Framework Helm Charts](https://github.com/NREL/openstudio-server-helm).
 
 ## Instructions
 

data/Rakefile

@@ -1,36 +1,6 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
-# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://openstudio.net/license
 # *******************************************************************************
 
 require 'bundler'

data/lib/openstudio/analysis/algorithm_attributes.rb

@@ -1,36 +1,6 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
-# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://openstudio.net/license
 # *******************************************************************************
 
 # OpenStudio::Analysis::Algorithm define the algorithm parameters. The module and class names start to conflict

data/lib/openstudio/analysis/formulation.rb

@@ -1,36 +1,6 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
-# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://openstudio.net/license
 # *******************************************************************************
 
 # OpenStudio formulation class handles the generation of the OpenStudio Analysis format.
@@ -59,6 +29,15 @@ module OpenStudio
       attr_accessor :workflow
       attr_accessor :algorithm
       attr_accessor :osw_path
+      attr_accessor :download_zip
+      attr_accessor :download_reports
+      attr_accessor :download_osw
+      attr_accessor :download_osm
+      attr_accessor :cli_debug
+      attr_accessor :cli_verbose
+      attr_accessor :initialize_worker_timeout
+      attr_accessor :run_workflow_timeout
+      attr_accessor :upload_results_timeout
 
       # the attributes below are used for packaging data into the analysis zip file
       attr_reader :weather_files
@@ -81,6 +60,15 @@ module OpenStudio
         @weather_file = WeatherFile.new
         @seed_model = SeedModel.new
         @algorithm = OpenStudio::Analysis::AlgorithmAttributes.new
+        @download_zip = true
+        @download_reports = true
+        @download_osw = true
+        @download_osm = true
+        @cli_debug = "--debug"
+        @cli_verbose = "--verbose"
+        @initialize_worker_timeout = 28800
+        @run_workflow_timeout = 28800
+        @upload_results_timeout = 28800
 
         # Analysis Zip attributes
         @weather_files = SupportFiles.new
@@ -120,6 +108,97 @@ module OpenStudio
         @weather_file[:file] = file
       end
 
+      # Set the value for 'download_zip'
+      #
+      # @param value [Boolean] The value for 'download_zip'
+      def download_zip=(value)
+        if [true, false].include?(value)
+          @download_zip = value
+        else
+          raise ArgumentError, "Invalid value for 'download_zip'. Only true or false allowed."
+        end
+      end
+      
+      # Set the value for 'download_reports'
+      #
+      # @param value [Boolean] The value for 'download_reports'
+      def download_reports=(value)
+        if [true, false].include?(value)
+          @download_reports = value
+        else
+          raise ArgumentError, "Invalid value for 'download_reports'. Only true or false allowed."
+        end
+      end
+      
+      # Set the value for 'download_osw'
+      #
+      # @param value [Boolean] The value for 'download_osw'
+      def download_osw=(value)
+        if [true, false].include?(value)
+          @download_osw = value
+        else
+          raise ArgumentError, "Invalid value for 'download_osw'. Only true or false allowed."
+        end
+      end
+      
+      # Set the value for 'download_osm'
+      #
+      # @param value [Boolean] The value for 'download_osm'
+      def download_osm=(value)
+        if [true, false].include?(value)
+          @download_osm = value
+        else
+          raise ArgumentError, "Invalid value for 'download_osm'. Only true or false allowed."
+        end
+      end
+
+      # Set the value for 'cli_debug'
+      #
+      # @param value [Boolean] The value for 'cli_debug'
+      def cli_debug=(value)
+        @cli_debug = value
+      end
+
+      # Set the value for 'cli_verbose'
+      #
+      # @param value [Boolean] The value for 'cli_verbose'
+      def cli_verbose=(value)
+        @cli_verbose = value
+      end
+
+      # Set the value for 'run_workflow_timeout'
+      #
+      # @param value [Integer] The value for 'run_workflow_timeout'
+      def run_workflow_timeout=(value)
+        if value.is_a?(Integer)
+          @run_workflow_timeout = value
+        else
+          raise ArgumentError, "Invalid value for 'run_workflow_timeout'. Only integer values allowed."
+        end
+      end
+
+      # Set the value for 'initialize_worker_timeout'
+      #
+      # @param value [Integer] The value for 'initialize_worker_timeout'
+      def initialize_worker_timeout=(value)
+        if value.is_a?(Integer)
+          @initialize_worker_timeout = value
+        else
+          raise ArgumentError, "Invalid value for 'initialize_worker_timeout'. Only integer values allowed."
+        end
+      end
+
+      # Set the value for 'upload_results_timeout'
+      #
+      # @param value [Integer] The value for 'upload_results_timeout'
+      def upload_results_timeout=(value)
+        if value.is_a?(Integer)
+          @upload_results_timeout = value
+        else
+          raise ArgumentError, "Invalid value for 'upload_results_timeout'. Only integer values allowed."
+        end
+      end
+
       # Add an output of interest to the problem formulation
       #
       # @param output_hash [Hash] Hash of the output variable in the legacy format
@@ -233,11 +312,16 @@ module OpenStudio
           end
 
           h[:analysis][:file_format_version] = version
-          h[:analysis][:cli_debug] = "--debug"
-          h[:analysis][:cli_verbose] = "--verbose"
-          h[:analysis][:run_workflow_timeout] = 28800
-          h[:analysis][:upload_results_timeout] = 28800
-          h[:analysis][:initialize_worker_timeout] = 28800
+          h[:analysis][:cli_debug] = @cli_debug
+          h[:analysis][:cli_verbose] = @cli_verbose
+          h[:analysis][:run_workflow_timeout] = @run_workflow_timeout
+          h[:analysis][:upload_results_timeout] = @upload_results_timeout
+          h[:analysis][:initialize_worker_timeout] = @initialize_worker_timeout
+          h[:analysis][:download_zip] = @download_zip
+          h[:analysis][:download_reports] = @download_reports
+          h[:analysis][:download_osw] = @download_osw
+          h[:analysis][:download_osm] = @download_osm
+
           #-BLB I dont think this does anything. server_scripts are run if they are in 
           #the /scripts/analysis or /scripts/data_point directories
           #but nothing is ever checked in the OSA.
@@ -351,12 +435,12 @@ module OpenStudio
       end
       
       
-      def save_osa_zip(filename)
+      def save_osa_zip(filename, all_weather_files = false, all_seed_files = false)
         filename += '.zip' if File.extname(filename) == ''
 
         FileUtils.mkdir_p File.dirname(filename) unless Dir.exist? File.dirname(filename)
 
-        save_analysis_zip_osa(filename)
+        save_analysis_zip_osa(filename, all_weather_files, all_seed_files)
       end
       
       # convert an OSW to an OSA
@@ -487,12 +571,11 @@ module OpenStudio
       # New format for OSAs. Package up the seed, weather files, and measures
       # filename is the name of the file to be saved. ex: analysis.zip
       # it will parse the OSA and zip up all the files defined in the workflow
-      def save_analysis_zip_osa(filename)
+      def save_analysis_zip_osa(filename, all_weather_files = false, all_seed_files = false)
         def add_directory_to_zip_osa(zipfile, local_directory, relative_zip_directory)
           puts "Add Directory #{local_directory}"
           Dir[File.join(local_directory.to_s, '**', '**')].each do |file|
             puts "Adding File #{file}"
-            
             zipfile.add(file.sub(local_directory, relative_zip_directory), file)
           end
           zipfile
@@ -503,27 +586,30 @@ module OpenStudio
         puts "osw_path: #{@osw_path}"
         osw_full_path = File.dirname(File.expand_path(@osw_path))
         puts "osw_full_path: #{osw_full_path}"
-        
+
         Zip::File.open(filename, create: true) do |zf|
-          ## Weather files
+         ## Weather files
           puts 'Adding Support Files: Weather'
-          #check if weather file exists.  use abs path.  remove leading ./ from @weather_file path if there.
-          #check if path is already absolute
+          # check if weather file exists.  use abs path.  remove leading ./ from @weather_file path if there.
+          # check if path is already absolute
           if @weather_file[:file]
             if File.exists?(@weather_file[:file])
               puts "  Adding #{@weather_file[:file]}"
               #zf.add("weather/#{File.basename(@weather_file[:file])}", @weather_file[:file])
               base_name = File.basename(@weather_file[:file], ".*")
               puts "base_name: #{base_name}"
-              #convert backslash on windows to forward slash so Dir.glob will work (in case user uses \)
+              # convert backslash on windows to forward slash so Dir.glob will work (in case user uses \)
               weather_dirname = File.dirname(@weather_file[:file]).gsub("\\", "/")
               puts "weather_dirname: #{weather_dirname}"
-              Dir.glob(File.join(weather_dirname, "#{base_name}.*")) do |file_path|
-                puts "file_path: #{file_path}"
-                puts "zip path: weather/#{File.basename(file_path)}"
-                zf.add("weather/#{File.basename(file_path)}", file_path)
-              end
-            #make absolute path and check for file  
+              # If all_weather_files is true, add all files in the directory to the zip.
+              # Otherwise, add only files that match the base name.
+              file_pattern = all_weather_files ? "*" : "#{base_name}.*"
+              Dir.glob(File.join(weather_dirname, file_pattern)) do |file_path|
+               puts "file_path: #{file_path}"
+               puts "zip path: weather/#{File.basename(file_path)}"
+               zf.add("weather/#{File.basename(file_path)}", file_path)
+            end
+            # make absolute path and check for file  
             elsif File.exists?(File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, '')))
               puts "  Adding: #{File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, ''))}"
               #zf.add("weather/#{File.basename(@weather_file[:file])}", File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, '')))
@@ -531,7 +617,8 @@ module OpenStudio
               puts "base_name2: #{base_name}"
               weather_dirname = File.dirname(File.join(osw_full_path,@weather_file[:file].sub(/^\.\//, ''))).gsub("\\", "/")
               puts "weather_dirname: #{weather_dirname}"
-              Dir.glob(File.join(weather_dirname, "#{base_name}.*")) do |file_path|
+              file_pattern = all_weather_files ? "*" : "#{base_name}.*"
+              Dir.glob(File.join(weather_dirname, file_pattern)) do |file_path|
                 puts "file_path2: #{file_path}"
                 puts "zip path2: weather/#{File.basename(file_path)}"
                 zf.add("weather/#{File.basename(file_path)}", file_path)
@@ -541,7 +628,7 @@ module OpenStudio
             end
           else
             warn "weather_file[:file] is not defined"
-          end              
+          end
 
           ## Seed files
           puts 'Adding Support Files: Seed Models'
@@ -551,16 +638,37 @@ module OpenStudio
             if File.exists?(@seed_model[:file])
               puts "  Adding #{@seed_model[:file]}"
               zf.add("seeds/#{File.basename(@seed_model[:file])}", @seed_model[:file])
+              if all_seed_files
+                seed_dirname = File.dirname(@seed_model[:file]).gsub("\\", "/")
+                puts "seed_dirname: #{seed_dirname}"
+                Dir.glob(File.join(seed_dirname, '*')) do |file_path|
+                  next if file_path == @seed_model[:file] # Skip if the file is the same as @seed_model[:file] so not added twice
+                  puts "file_path: #{file_path}"
+                  puts "zip path: seeds/#{File.basename(file_path)}"
+                  zf.add("seeds/#{File.basename(file_path)}", file_path)
+                end              
+              end
             #make absolute path and check for file  
             elsif File.exists?(File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, '')))
               puts "  Adding #{File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, ''))}"
               zf.add("seeds/#{File.basename(@seed_model[:file])}", File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, '')))
+              if all_seed_files
+                seed_dirname = File.dirname(File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, ''))).gsub("\\", "/")
+                puts "seed_dirname: #{seed_dirname}"
+                Dir.glob(File.join(seed_dirname, '*')) do |file_path|
+                  next if file_path == File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, '')) # Skip if the file is the same as @seed_model[:file] so not added twice
+                  puts "file_path: #{file_path}"
+                  puts "zip path: seeds/#{File.basename(file_path)}"
+                  zf.add("seeds/#{File.basename(file_path)}", file_path)
+                end              
+              end
             else
               raise "seed_file[:file] does not exist at: #{File.join(osw_full_path,@seed_model[:file].sub(/^\.\//, ''))}"
             end        
           else
             warn "seed_file[:file] is not defined"
-          end 
+          end
+          
           puts 'Adding Support Files: Libraries'
           @libraries.each do |lib|
             raise "Libraries must specify their 'library_name' as metadata which becomes the directory upon zip" unless lib[:metadata][:library_name]

data/lib/openstudio/analysis/server_api.rb

@@ -1,36 +1,6 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
-# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://openstudio.net/license
 # *******************************************************************************
 
 # Class manages the communication with the server.

data/lib/openstudio/analysis/server_scripts.rb

@@ -1,36 +1,6 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
-# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://openstudio.net/license
 # *******************************************************************************
 
 # OpenStudio::Analysis::ServerScripts is a container to hold the analysis and data_point server scripts.

data/lib/openstudio/analysis/support_files.rb

@@ -1,36 +1,6 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.
-# All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# (1) Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# (2) Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# (3) Neither the name of the copyright holder nor the names of any contributors
-# may be used to endorse or promote products derived from this software without
-# specific prior written permission from the respective party.
-#
-# (4) Other than as required in clauses (1) and (2), distributions in any form
-# of modifications or other derivative works may not use the "OpenStudio"
-# trademark, "OS", "os", or any other confusingly similar designation without
-# specific prior written permission from Alliance for Sustainable Energy, LLC.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES
-# GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# OpenStudio(R), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://openstudio.net/license
 # *******************************************************************************
 
 # OpenStudio::Analysis::SupportFiles is a container to hold other analysis files that may need to be packaged.