Merge pull request #169 from slayoo/mpi_cleanup

draft of stop handling in C/C++

Author: slayoo

.gitmodules

@@ -4,7 +4,7 @@
 	shallow = true
 [submodule "partmc"]
 	path = gitmodules/partmc
-	url = https://github.com/compdyn/partmc
+	url = https://github.com/slayoo/partmc
 	shallow = true
 [submodule "pybind11_json"]
 	path = gitmodules/pybind11_json

.pre-commit-config.yaml

@@ -12,10 +12,11 @@ repos:
     rev: 5.10.1
     hooks:
       - id: isort
+        args: ["--profile", "black"]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
-      - id: debug-statements
+      - id: debug-statements

CMakeLists.txt

@@ -36,7 +36,7 @@ add_definitions("-DSUNDIALS_INT64_T=1")
 ### sources ########################################################################################
 
 set(PyPartMC_sources 
-  pypartmc.cpp gimmicks.cpp fake_netcdf.cpp fake_mpi.cpp fake_spec_file.cpp
+  pypartmc.cpp gimmicks.cpp fake_netcdf.cpp fake_spec_file.cpp sys.cpp
   run_part.F90 run_part_opt.F90 util.F90 aero_data.F90 aero_state.F90 env_state.F90 gas_data.F90 
   gas_state.F90 scenario.F90 condense.F90 aero_particle.F90 bin_grid.F90
   camp_core.F90 photolysis.F90
@@ -136,7 +136,7 @@ set(partmclib_SOURCES condense_solver.c aero_state.F90 integer_varray.F90 intege
   photolysis.F90
 )
 add_prefix(gitmodules/partmc/src/ partmclib_SOURCES)
-list(APPEND partmclib_SOURCES src/fake_mpi.F90 src/fake_netcdf.F90 src/fake_spec_file.F90)
+list(APPEND partmclib_SOURCES src/fake_netcdf.F90 src/fake_spec_file.F90 src/sys.F90)
 
 set(klu_SOURCES
   KLU/Source/klu_analyze.c
@@ -271,7 +271,6 @@ target_include_directories(camplib PRIVATE
 
 add_library(partmclib STATIC ${partmclib_SOURCES})
 target_compile_definitions(partmclib PRIVATE PMC_USE_SUNDIALS="1")
-target_compile_definitions(partmclib PRIVATE PMC_USE_MPI="1")
 target_compile_definitions(partmclib PRIVATE PMC_USE_CAMP="1")
 add_dependencies(partmclib ${SUNDIALS_items})
 target_include_directories(partmclib PRIVATE 

PyPartMC/__init__.py

@@ -43,4 +43,4 @@ def __build_extension_env():
 with __build_extension_env():
     import _PyPartMC
     from _PyPartMC import *
-    from _PyPartMC import __all__, __version__
+    from _PyPartMC import __all__, __version__  # pylint: disable=no-name-in-module

gitmodules/partmc

@@ -1,5 +1,6 @@
 module pmc_spec_file
     use pmc_spec_line
+    use iso_c_binding
     implicit none
 
     integer, parameter :: SPEC_FILE_MAX_LIST_LINES = 1000

src/fake_mpi.F90

@@ -0,0 +1,22 @@
+!###################################################################################################
+! This file is a part of PyPartMC licensed under the GNU General Public License v3 (LICENSE file)  #
+! Copyright (C) 2022 University of Illinois Urbana-Champaign                                       #
+! Authors: https://github.com/open-atmos/PyPartMC/graphs/contributors                              #
+!###################################################################################################
+
+module pmc_sys
+  use iso_c_binding
+
+  interface
+    subroutine c_stop(code) bind(C)
+      integer, intent(in) :: code
+    end subroutine
+  end interface
+
+  contains
+
+  subroutine pmc_stop(code)
+    integer, intent(in) :: code
+    call c_stop(code)
+  end subroutine
+end module

src/fake_spec_file.F90

@@ -7,14 +7,12 @@
 #include <stdexcept>
 #include <sstream>
 
-void _mpi_abort(const int errorcode) {
-  std::ostringstream oss;
-  oss << errorcode << std::endl;
-  auto err = std::runtime_error(oss.str());
-  throw err;
+void cpp_stop(int code) {
+  std::ostringstream str;
+  str << code;
+  throw std::runtime_error(str.str());
 }
 
-extern "C" void mpi_abort(const int *comm, const int *errorcode, const int *ierror) {
-  _mpi_abort(*errorcode);
+extern "C" void c_stop(int code) {
+  cpp_stop(code);
 }
-