Release 2.7.0 (#189)

jcurtis2 · web-flow · commit 1c7cc45ad032 · 2023-08-11T15:18:03.000-05:00
* fix long lines

* Update info for 2.7.0 release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,9 +7,9 @@ project(PARTMC Fortran C)
 
 set(PACKAGE_BUGREPORT "mwest@illinois.edu")
 set(PACKAGE_NAME "PartMC")
-set(PACKAGE_STRING "PartMC 2.6.1")
+set(PACKAGE_STRING "PartMC 2.7.0")
 set(PACKAGE_TARNAME "partmc")
-set(PACKAGE_VERSION "2.6.1")
+set(PACKAGE_VERSION "2.7.0")
 
 ######################################################################
 # options
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,16 @@
+2.7.0 - 2023-08-11
+
+  * Add support for SUNDIALS 6+ (Alex Hirzel).
+
+  * Add wrapper around stop (Sylwester Arabas).
+
+  * Change timestepping structure in run_part (Jeff Curtis).
+
+  * Update kappa value of NaCl (Jeff Curtis).
+
+  * Remove optional communicator in photolysis.F90 (Jeff Curtis).
+
+  * Use relative tolerance for comparing water properties (Jeff Curtis).
 
 2.6.1 - 2022-02-18
 
diff --git a/README.md b/README.md
@@ -5,14 +5,14 @@ PartMC: Particle-resolved Monte Carlo code for atmospheric aerosol simulation
 
 [![Latest version](https://img.shields.io/github/tag/compdyn/partmc.svg?label=version)](https://github.com/compdyn/partmc/blob/master/ChangeLog.md) [![Docker build status](https://img.shields.io/docker/automated/compdyn/partmc.svg)](https://hub.docker.com/r/compdyn/partmc/builds/) [![Github Actions Status](https://github.com/compdyn/partmc/workflows/CI/badge.svg?branch=master)](https://github.com/compdyn/partmc/actions/workflows/main.yml) [![License](https://img.shields.io/github/license/compdyn/partmc.svg)](https://github.com/compdyn/partmc/blob/master/COPYING) [![DOI](https://zenodo.org/badge/24058992.svg)](https://zenodo.org/badge/latestdoi/24058992)
 
-Version 2.6.1  
-Released 2022-02-18
+Version 2.7.0  
+Released 2023-08-11
 
 **Source:** <https://github.com/compdyn/partmc>
 
 **Homepage:** <http://lagrange.mechse.illinois.edu/partmc/>
 
-**Cite as:** M. West, N. Riemer, J. Curtis, M. Michelotti, and J. Tian (2022) PartMC, [![version](https://img.shields.io/github/release/compdyn/partmc.svg?label=version)](https://github.com/compdyn/partmc), [![DOI](https://zenodo.org/badge/24058992.svg)](https://zenodo.org/badge/latestdoi/24058992)
+**Cite as:** M. West, N. Riemer, J. Curtis, M. Michelotti, and J. Tian (2023) PartMC, [![version](https://img.shields.io/github/release/compdyn/partmc.svg?label=version)](https://github.com/compdyn/partmc), [![DOI](https://zenodo.org/badge/24058992.svg)](https://zenodo.org/badge/latestdoi/24058992)
 
 Copyright (C) 2005-2022 Nicole Riemer and Matthew West  
 Portions copyright (C) Andreas Bott, Richard Easter, Jeffrey Curtis,
@@ -184,12 +184,12 @@ Installation
 
 2. Unpack PartMC:
 
-        tar xzvf partmc-2.6.1.tar.gz
+        tar xzvf partmc-2.7.0.tar.gz
 
 3. Change into the main PartMC directory (where this README file is
    located):
 
-        cd partmc-2.6.1
+        cd partmc-2.7.0
 
 4. Make a directory called `build` and change into it:
 
diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = PartMC
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2.6.1
+PROJECT_NUMBER         = 2.7.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/doc/Makefile b/doc/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 2.6.1
+VERSION = 2.7.0
 
 GRAPHVIZ_FILE = partmc_modules.gv
 GRAPHVIZ_PDF = $(patsubst %.gv,%.pdf,$(GRAPHVIZ_FILE))
diff --git a/src/condense_solver.c b/src/condense_solver.c
@@ -59,12 +59,14 @@ static int condense_check_flag(void *flagvalue, char *funcname, int opt);
 // solver block
 
 static int condense_solver_Solve(double t, N_Vector ycur, N_Vector fcur,
-				 N_Vector r, N_Vector b, double gamma, double delta, int lr, void *user_data);
+				 N_Vector r, N_Vector b, double gamma,
+                                 double delta, int lr, void *user_data);
 
 /*******************************************************/
 
 void condense_vf_f(int neq, realtype t, double *y_f, double *ydot_f);
-void condense_jac_solve_f(int neq, double t, double *ycur_f, double *fcur_f, double *b_f, double gamma);
+void condense_jac_solve_f(int neq, double t, double *ycur_f, double *fcur_f,
+                          double *b_f, double gamma);
 
 /** \brief Call the ODE solver.
  *
@@ -272,7 +274,8 @@ static int condense_check_flag(void *flagvalue, char *funcname, int opt)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 static int condense_solver_Solve(double t, N_Vector ycur, N_Vector fcur,
-				 N_Vector b, N_Vector z, double gamma, double delta, int lr, void *user_data)
+				 N_Vector b, N_Vector z, double gamma,
+                                 double delta, int lr, void *user_data)
 {
 	realtype *b_data, *ycur_data, *fcur_data, *z_data;
 	int i, neq;
diff --git a/src/output.F90 b/src/output.F90
@@ -82,7 +82,7 @@ module pmc_output
 #endif
 
   !> PartMC verson number.
-  character(len=100), parameter :: PARTMC_VERSION = "2.6.1"
+  character(len=100), parameter :: PARTMC_VERSION = "2.7.0"
 
   !> Type code for undefined or invalid output.
   integer, parameter :: OUTPUT_TYPE_INVALID = 0
diff --git a/src/run_part.F90 b/src/run_part.F90
@@ -700,9 +700,9 @@ subroutine run_part_timeblock(scenario, env_state, aero_data, aero_state, &
 #ifdef PMC_USE_CAMP
        camp_core, photolysis, &
 #endif
-       i_cur, i_next, t_start, last_output_time, last_progress_time, i_output, &
-       progress_n_samp, progress_n_coag, progress_n_emit, progress_n_dil_in, &
-       progress_n_dil_out, progress_n_nuc)
+       i_cur, i_next, t_start, last_output_time, last_progress_time, &
+       i_output, progress_n_samp, progress_n_coag, progress_n_emit, &
+       progress_n_dil_in, progress_n_dil_out, progress_n_nuc)
 
     !> Environment state.
     type(scenario_t), intent(in) :: scenario
diff --git a/tool/find_long_lines.py b/tool/find_long_lines.py
@@ -15,8 +15,16 @@
     '  ! This is needed because Fortran standard allows but doesn\'t *require* short-circuited',
     '                print \'(a,a,a)\', "Error: option \'", trim(arg), "\' requires an argument"',
     '    rgas = const%univ_gas_const * 1d3 / const%air_std_press ! J/mole/K to atmos/(mol/liter)/K',
+    '! Copyright (C) 2007-2012, 2016, 2017, 2018, 2021 Nicole Riemer and Matthew West',
     '!!     href="http://dx.doi.org/10.5194/acp-14-5327-2014">10.5194/acp-14-5327-2014</a>.',
     '!!     href="http://dx.doi.org/10.5194/acp-13-11423-2013">10.5194/acp-13-11423-2013</a>.',
+    '!!     href="http://dx.doi.org/10.1080/02786826.2020.1804523">10.1080/02786826.2020.1804523</a>.',
+    '!!     href="http://dx.doi.org/10.1080/02786826.2019.1661959">10.1080/02786826.2019.1661959</a>',
+    '!!     href="http://dx.doi.org/10.5194/gmd-10-4057-2017">10.5194/gmd-10-4057-2017</a>.',
+    '!!     href="http://dx.doi.org/10.1080/02786826.2017.1311988">10.1080/02786826.2017.1311988</a>.',
+    '!!     href="http://dx.doi.org/10.5194/acp-17-7445-2017">10.5194/acp-17-7445-2017</a>.',
+    '!!     href="http://dx.doi.org/10.1016/j.jcp.2016.06.029">10.1016/j.jcp.2016.06.029</a>.',
+    '!!     href="http://dx.doi.org/10.5194/acp-14-6289-2014">10.5194/acp-14-6289-2014</a>.',
     ]
 
 for filename in sys.argv[1:]:
