diff --git a/.github/common/test_modflow6_extended.bat b/.github/common/test_modflow6_extended.bat index 5db7b4b977b..f646239d38d 100644 --- a/.github/common/test_modflow6_extended.bat +++ b/.github/common/test_modflow6_extended.bat @@ -1,4 +1,4 @@ cd "%GITHUB_WORKSPACE%\modflow6\autotest" -pytest -v test_gwf_sto01.py -s -pytest -v test_netcdf_gwf_sto01.py --netcdf -s +pixi run autotest -k test_gwf_sto01.py -s +pixi run autotest -k test_netcdf_gwf_sto01.py --netcdf -s pixi run autotest -m "%MARKERS%" --netcdf --parallel diff --git a/meson.build b/meson.build index ecf10838dfe..b15f9a25493 100644 --- a/meson.build +++ b/meson.build @@ -190,13 +190,15 @@ with_netcdf = false if is_netcdf_build if build_machine.system() == 'windows' netcdff_libdir = netcdff_compiled_abs / 'fortran' - netcdfc_libdir = netcdfc_compiled_abs / 'lib' + #netcdfc_libdir = netcdfc_compiled_abs / 'lib' netcdff = fc.find_library('netcdff', dirs: netcdff_libdir, static: false, required : true) - netcdfc = fc.find_library('netcdf', dirs: netcdfc_libdir, static: false, required : true) - if netcdff.found() and netcdfc.found() + #netcdfc = fc.find_library('netcdf', dirs: netcdfc_libdir, static: false, required : true) + #if netcdff.found() and netcdfc.found() + if netcdff.found() with_netcdf = true extra_cmp_args += [ '-D__WITH_NETCDF__' ] - dependencies += [ netcdff, netcdfc ] + #dependencies += [ netcdff, netcdfc ] + dependencies += [ netcdff ] netcdf_incdir = include_directories([ netcdfc_compiled_rel / 'include', netcdff_compiled_rel / 'fortran'