Skip to content

Commit

Permalink
t3
Browse files Browse the repository at this point in the history
  • Loading branch information
mjreno authored and mjreno committed Jan 17, 2025
1 parent 7f03e6c commit 9c69d59
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/common/test_modflow6_extended.bat
Original file line number Diff line number Diff line change
@@ -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
10 changes: 6 additions & 4 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 9c69d59

Please sign in to comment.