Merge develop to main

.gitignore

@@ -1,3 +1,193 @@
-*.pyc
+# Ignore usual suspect binary files
+
 *.nc
+*.nc4
+*.bin
+*.hdf
+*.h5
+
+# Below is the github gitignore for Python
+# https://github.com/github/gitignore/blob/main/Python.gitignore
+# as of 2025-Apr-14
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# UV
+#   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#uv.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+/env/
+/@env/
+/env@/
+/cmake/
+/@cmake/
+/cmake@/
+/.mepo/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# Ruff stuff:
+.ruff_cache/
 
+# PyPI configuration file
+.pypirc

CHANGELOG.md

@@ -17,9 +17,39 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.0.0] - 2025-06-25
+
+### Added
+- output dust phase matrix at same angular resolution as mie particles
+
+### Changed
+- refactor to use cmake for installation
+
+## [1.2.2] - 2025-04-22
+
+### Fixed
+- fixed eval_gsfun script for legendre overflows and bad indexing of scattering phase functions when plotting
+
+### Changed
+- Changed output variables of runoptics.py from s11, s12, etc. to p11, p12, etc. 
+  and applied an a posteriori normalization to them. These are now directly the
+  the phase function elements at the indicated angles as f(bin,wavelength,rh,ang)
+- Changed rungsf.py and utils/eval_gsfun.py to accommodate change in phase function
+  element naming as above.
+- Changed naming convention so that output of runoptics.py files are labeled ".nomom." to 
+  explicitly indicate that expansion moments are not included; post-processing by rungsf.py
+  now results in a filename that strips out ".nomom" and so looks like classic files.
+- Modify processing script (proc.v2.0.0.csh) to accommodate the above change.
+- Updated `.gitignore` to ignore more binary file types as well as the recommended Python patterns
+
+### Added
+- Added some documentation in the scripts directory of specific optical 
+  property assumptions.
+
 ## [1.2.1] - 2025-04-10
 
 ### Added
+
 - Added components.yaml and CMakeLists.txt and directory structure to bring
   GMAOpyobs into GEOSmie
 

CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Top cmake rules for GMAOpyobs
+# Top cmake rules for GEOSmie
 #
 
 # Boiler plate preamble
@@ -46,7 +46,6 @@ if (NOT CMAKE_BUILD_TYPE)
 
     include (esma)
 
-    set (PYOBS_STANDALONE TRUE)
   endif ()
    ecbuild_declare_project()
 
@@ -75,8 +74,3 @@ if (NOT CMAKE_BUILD_TYPE)
      DESTINATION  ${CMAKE_INSTALL_PREFIX}
    )
 
-# Adds ability to tar source
-# --------------------------
-  if (PYOBS_STANDALONE)
-    include(esma_cpack OPTIONAL)
-  endif ()