Merge branch 'develop'

Author: ERDC-mbrown

UNLICENSE.md

@@ -1,5 +1,5 @@
 ## NOTICE:
-CMS Version 5.3.  The CMS code is supplied by the U.S. Army Corps of Engineers, Engineer Research and Development Center (USACE-ERDC). Some portions of this software were written by employees of ERDC-CHL, a laboratory of the U.S. Army Corps of Engineers, and are not under copyright. Other portions are copyright their creators and licensed under licenses listed in the included documentation. USACE-ERDC makes no guarantees about the results, or appropriateness of outputs, obtained from CMS.  
+CMS Version 5.4.  The CMS code is supplied by the U.S. Army Corps of Engineers, Engineer Research and Development Center (USACE-ERDC). Some portions of this software were written by employees of ERDC-CHL, a laboratory of the U.S. Army Corps of Engineers, and are not under copyright. Other portions are copyright their creators and licensed under licenses listed in the included documentation. USACE-ERDC makes no guarantees about the results, or appropriateness of outputs, obtained from CMS.  
 
 ## LIST OF CONDITIONS:
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -16,7 +16,7 @@ This version of CMS uses the following libraries and source code:
 ### XMDF Binary Library [Aquaveo]
 This library allows for input/output using platform-independent binary files to save disk space and for better communication with the Surface-water Modeling System GUI.
 
-Copyright 2023, Aquaveo, LLC
+Copyright 2024, Aquaveo, 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 OR 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.
 

docs/conf.py

@@ -67,7 +67,7 @@ def setup(app):
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = u'CMS'
-copyright = u'2023, Coastal Inlets Research Program'
+copyright = u'2024, Coastal Inlets Research Program'
 author = 'Coastal Inlets Research Program'
 
 # The short X.Y version.

pyproject.toml

@@ -8,7 +8,7 @@ exclude = [
 
 [project]
 name = "cms2d"
-version = "5.3"
+version = "5.4"
 authors = [
   { name = "Mitchell Brown", email = "mitchell.e.brown@usace.army.mil" },
 ]

testing/builder/build-config.json

@@ -1,8 +1,8 @@
 {
-"solution_path" :"Intel_vs2019/CMS2D_v5.3.sln",
+"solution_path" :"Intel_vs2019/CMS2D_v5.4.sln",
 "build_config_names" : ["Release"],
-"project_name" : "CMS2D_v5.3",
-"exe_file_names" : ["CMS2D_v5.3.exe"],
+"project_name" : "CMS2D_v5.4",
+"exe_file_names" : ["CMS2D_v5.4.exe"],
 "dev_env" : "\"C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/devenv.com\"",
 "dll_path" : "c:/Program Files (x86)/Intel/oneAPI/compiler/2021.4.0/windows/redist/intel64_win/compiler"
 }

testing/builder/builder.py

@@ -11,7 +11,7 @@
 
 # 4. Local modules
 
-__copyright__ = "(C) Copyright Aquaveo 2020"
+__copyright__ = "(C) Copyright Aquaveo 2024"
 __license__ = "All rights reserved"
 
 
@@ -52,10 +52,10 @@ def build(solution_path=None,
     r"""Builds the project.
 
     Args:
-        solution_path:       Example: '..\Intel_vs2022\CMS2D_V5.3.sln'
+        solution_path:       Example: '..\Intel_vs2022\CMS2D_V5.4.sln'
         build_config_names:  Example: ('Release')
-        project_name:        Example: 'CMS2D_V5.3'
-        exe_file_names:      Example: ('CMS2D_v5.3.exe')
+        project_name:        Example: 'CMS2D_V5.4'
+        exe_file_names:      Example: ('CMS2D_v5.4.exe')
         dev_env:             Example: "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.com"
         do_build:            Example: 0 or 1 (0 to skip build)
         do_test:             Example: 0 or 1 (0 to skip test)

testing/builder/h5_file_to_text.py

@@ -13,7 +13,7 @@
 
 # 4. Local modules
 
-__copyright__ = "(C) Copyright Aquaveo 2020"
+__copyright__ = "(C) Copyright Aquaveo 2024"
 __license__ = "All rights reserved"
 
 

testing/builder/process_runner.py

@@ -12,7 +12,7 @@
 
 # 4. Local modules
 
-__copyright__ = "(C) Copyright Aquaveo 2020"
+__copyright__ = "(C) Copyright Aquaveo 2024"
 __license__ = "All rights reserved"
 
 # index for tuple in self.running_processes

testing/builder/test_cms.py

@@ -80,11 +80,11 @@ def main(vs_solution_path, dll_path):
     # dll_files = [str(f.absolute()) for f in Path(search_path).rglob('libiomp5md.dll')]
     # print(dll_files)
 
-    path_to_cms = os.path.join(repo_path, vs_solution_path, 'x64/Release/CMS2d_v5.3.exe')
+    path_to_cms = os.path.join(repo_path, vs_solution_path, 'x64/Release/CMS2d_v5.4.exe')
     if not os.path.isfile(path_to_cms):
-        print(f'ERROR: CMS2d_v5.3.exe not found at {path_to_cms}')
+        print(f'ERROR: CMS2d_v5.4.exe not found at {path_to_cms}')
         return 1
-    # shutil.copyfile(path_to_cms, os.path.join(test_path, './CMS2D_v5.3.exe'))
+    # shutil.copyfile(path_to_cms, os.path.join(test_path, './CMS2D_v5.4.exe'))
     process_runner.ProcessRunner.cms_exe = path_to_cms
     # Copy 'libiomp5md.dll' and executable to tests directory
     # shutil.copyfile(os.path.join(dll_path, 'libiomp5md.dll'),
@@ -94,8 +94,8 @@ def main(vs_solution_path, dll_path):
     runner.run_concurrent_processes(files)
     # test CMS outputs
     return_code = _check_outputs(files)
-    # if os.path.isfile(os.path.join(test_path, 'CMS2d_v5.3.exe')):
-    #     os.remove(os.path.join(test_path, 'CMS2d_v5.3.exe'))
+    # if os.path.isfile(os.path.join(test_path, 'CMS2d_v5.4.exe')):
+    #     os.remove(os.path.join(test_path, 'CMS2d_v5.4.exe'))
     #     os.remove(os.path.join(test_path, 'libiomp5md.dll'))
 
     return return_code