Merge remote-tracking branch 'origin/develop'

.github/workflows/ci.yml

@@ -68,26 +68,37 @@ jobs:
 
     # Standard python fails on windows without GDAL installation
     # Using custom bash shell ("shell: bash -l {0}") with Miniconda
-    - name: Setup Miniconda
-      uses: conda-incubator/setup-miniconda@v2
+    # - name: Setup Miniconda
+    #   uses: conda-incubator/setup-miniconda@v2
+    #   with:
+    #     # python-version: ${{ matrix.python-version }}
+    #     # #mamba-version: "0.20.0"
+    #     # channels: conda-forge
+    #     # auto-update-conda: true
+    #     # activate-environment: pyemu
+    #     # use-only-tar-bz2: true
+    #     miniforge-version: latest
+    #     # miniconda-version: "latest"
+    #     python-version: ${{ matrix.python-version }}
+    #     # mamba-version: "*"
+    #     # channels: conda-forge
+    #     miniforge-variant: Mambaforge
+    #     # auto-update-conda: true
+    #     activate-environment: pyemu
+    #     use-mamba: true
+    #     # environment-file: etc/environment.yml
+    #     # use-only-tar-bz2: true
+
+    - name: setup micromamba
+      uses: mamba-org/setup-micromamba@v1
       with:
-        # python-version: ${{ matrix.python-version }}
-        # #mamba-version: "0.20.0"
-        # channels: conda-forge
-        # auto-update-conda: true
-        # activate-environment: pyemu
-        # use-only-tar-bz2: true
-        miniforge-version: latest
-        # miniconda-version: "latest"
-        python-version: ${{ matrix.python-version }}
-        # mamba-version: "*"
-        # channels: conda-forge
-        miniforge-variant: Mambaforge
-        # auto-update-conda: true
-        activate-environment: pyemu
-        use-mamba: true
-        # environment-file: etc/environment.yml
-        # use-only-tar-bz2: true
+        micromamba-version: '1.3.1-0'
+        environment-file: etc/environment.yml
+        init-shell: >-
+          bash
+          powershell
+        cache-environment: true
+        post-cleanup: 'all'
 
     # - name: Add packages to pyemu environment using mamba or conda
     #   shell: bash -l {0}
@@ -98,32 +109,32 @@ jobs:
     #       conda env update --name pyemu --file etc/environment.yml
     #     fi
 
-    - name: Add packages to pyemu environment using conda
-      if: ${{ matrix.python-version < 3.8 }}
-      # if: ${{ runner.os == 'Windows' || matrix.python-version < 3.8 }}
-      shell: bash -l {0}
-      run: |
-          conda env update --name pyemu --file etc/environment.yml
+    # - name: Add packages to pyemu environment using conda
+    #   if: ${{ matrix.python-version < 3.8 }}
+    #   # if: ${{ runner.os == 'Windows' || matrix.python-version < 3.8 }}
+    #   shell: bash -l {0}
+    #   run: |
+    #       conda env update --name pyemu --file etc/environment.yml
 
-    - name: Add packages to pyemu environment using mamba
-      # if: ${{ runner.os != 'Windows' && matrix.python-version >= 3.8 }}
-      if: ${{ matrix.python-version >= 3.8 }}
-      shell: bash -l {0}
-      run: |
-          mamba env update --name pyemu --file etc/environment.yml
+    # - name: Add packages to pyemu environment using mamba
+    #   # if: ${{ runner.os != 'Windows' && matrix.python-version >= 3.8 }}
+    #   if: ${{ matrix.python-version >= 3.8 }}
+    #   shell: bash -l {0}
+    #   run: |
+    #       mamba env update --name pyemu --file etc/environment.yml
 
-    - name: Install Flopy & pyemu?
-      shell: bash -l {0}
-      run: |
-        # git clone -b develop --depth 1 https://github.com/modflowpy/flopy.git
-        # cd flopy
-        # python setup.py install
-        # cd ..
-        # pip install https://github.com/modflowpy/pymake/zipball/master
-        git clone -b develop --depth 1 https://github.com/pypest/pyemu.git
-        cd pyemu
-        python setup.py install
-        cd ..
+    # - name: Install Flopy & pyemu?
+    #   shell: bash -l {0}
+    #   run: |
+    #     # git clone -b develop --depth 1 https://github.com/modflowpy/flopy.git
+    #     # cd flopy
+    #     # python setup.py install
+    #     # cd ..
+    #     # pip install https://github.com/modflowpy/pymake/zipball/master
+    #     git clone -b develop --depth 1 https://github.com/pypest/pyemu.git
+    #     cd pyemu
+    #     python setup.py install
+    #     cd ..
 
     # - name: Get specific version CMake, v3.19
     #   if: ${{ runner.os == 'Windows' }} 
@@ -168,7 +179,7 @@ jobs:
         
         ls -l
         cd ${{ env.test_dir }}
-        nosetests -v ${{ env.test_script }}
+        nosetests --nocapture -v ${{ env.test_script }}
         cd
     
 

CMakeLists.txt

@@ -9,7 +9,7 @@ if("${PESTPP_VERSION}" STREQUAL "")
   message(SEND_ERROR
     "Could not find PESTPP_VERSION in src/libs/common/config_os.h")
 endif()
-
+ 
 message(STATUS
   "Configuring CMake ${CMAKE_VERSION} to build PESTPP ${PESTPP_VERSION}")
 
@@ -85,6 +85,8 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+add_compile_definitions(_HAS_STD_BYTE=0)
+
 # Use global "-fvisibility=hidden" see https://gcc.gnu.org/wiki/Visibility
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
@@ -110,8 +112,10 @@ include(GNUInstallDirs)
 add_subdirectory(src)
 
 # Define an custom OS tag for CPACK_SYSTEM_NAME and (for now) local bin sub-directory
+message(STATUS
+  "CMAKE compiler ID ${CMAKE_CXX_COMPILER_ID}")
 if(WIN32)
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "IntelLLVM")
     set(_ostag "iwin")
   else()
     set(_ostag "win")

benchmarks/basic_tests.py

@@ -1441,6 +1441,7 @@ def run():
     #run()
     #mf6_v5_ies_test()
     #prep_ends()
+    mf6_v5_sen_test()
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-glm.exe"),os.path.join("..","bin","win","pestpp-glm.exe"))
     #shutil.copy2(os.path.join("..", "exe", "windows", "x64", "Debug", "pestpp-ies.exe"),
     #             os.path.join("..", "bin", "win", "pestpp-ies.exe"))
@@ -1478,7 +1479,7 @@ def run():
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-ies.exe"),os.path.join("..","bin","win","pestpp-ies.exe"))
     #tplins1_test()
 
-    fr_timeout_test()
+    #fr_timeout_test()
     #mf6_v5_ies_test()
     #mf6_v5_sen_test()