diff --git a/examples/basic/gdecomp_mod.F90 b/examples/basic/gdecomp_mod.F90 index e4f1921452e..b5b41407ad3 100644 --- a/examples/basic/gdecomp_mod.F90 +++ b/examples/basic/gdecomp_mod.F90 @@ -300,9 +300,7 @@ end subroutine gdecomp_print !================================================================== subroutine gdecomp_DOF(gdecomp,my_task,DOF,start,count,write_decomp,test) -#ifdef _NETCDF use netcdf ! _EXTERNAL -#endif implicit none @@ -712,7 +710,6 @@ subroutine gdecomp_DOF(gdecomp,my_task,DOF,start,count,write_decomp,test) ! --- write out arrays --- -#ifdef _NETCDF if (wdecomp) then write(6,*) ' ' write(6,*) trim(subname),' writing decomp info to file ',trim(ncname) @@ -738,7 +735,6 @@ subroutine gdecomp_DOF(gdecomp,my_task,DOF,start,count,write_decomp,test) rcode = nf90_put_var(ncid,varid(2),tskid) rcode = nf90_close(ncid) endif -#endif endif ! testonly diff --git a/examples/basic/testpio.F90 b/examples/basic/testpio.F90 index 2a6e62e427a..d93d4e27521 100644 --- a/examples/basic/testpio.F90 +++ b/examples/basic/testpio.F90 @@ -770,11 +770,7 @@ program testpio ! print *, __FILE__,__LINE__,'>',fname_r8,'<' ! print *, __FILE__,__LINE__,'>',fname_i4,'<' ! print *, __FILE__,__LINE__,'>',fname_r4,'<' -#if defined(_NETCDF) || defined(_PNETCDF) mode = pio_64bit_offset -#else - mode = 0 -#endif if(writePhase) then if(TestCombo) then diff --git a/tests/general/util/pio_tutil.F90 b/tests/general/util/pio_tutil.F90 index c5e3383f64f..971f10fe055 100644 --- a/tests/general/util/pio_tutil.F90 +++ b/tests/general/util/pio_tutil.F90 @@ -351,14 +351,6 @@ SUBROUTINE PIO_TF_Get_undef_nc_iotypes(iotypes, iotype_descs, num_iotypes) num_iotypes = 0 ! First find the number of io types -#ifndef _NETCDF - ! netcdf - num_iotypes = num_iotypes + 1 -#ifndef _NETCDF4 - ! netcdf4p, netcdf4c - num_iotypes = num_iotypes + 2 -#endif -#endif #ifndef _PNETCDF ! pnetcdf num_iotypes = num_iotypes + 1 @@ -374,21 +366,6 @@ SUBROUTINE PIO_TF_Get_undef_nc_iotypes(iotypes, iotype_descs, num_iotypes) iotypes(i) = PIO_iotype_pnetcdf iotype_descs(i) = "PNETCDF" i = i + 1 -#endif -#ifndef _NETCDF - ! netcdf - iotypes(i) = PIO_iotype_netcdf - iotype_descs(i) = "NETCDF" - i = i + 1 -#ifndef _NETCDF4 - ! netcdf4p, netcdf4c - iotypes(i) = PIO_iotype_netcdf4c - iotype_descs(i) = "NETCDF4C" - i = i + 1 - iotypes(i) = PIO_iotype_netcdf4p - iotype_descs(i) = "NETCDF4P" - i = i + 1 -#endif #endif END SUBROUTINE @@ -468,14 +445,6 @@ SUBROUTINE PIO_TF_Get_undef_iotypes(iotypes, iotype_descs, num_iotypes) ! First find the number of io types num_iotypes = 0 -#ifndef _NETCDF - ! netcdf - num_iotypes = num_iotypes + 1 -#ifndef _NETCDF4 - ! netcdf4p, netcdf4c - num_iotypes = num_iotypes + 2 -#endif -#endif #ifndef _PNETCDF ! pnetcdf num_iotypes = num_iotypes + 1 @@ -486,27 +455,6 @@ SUBROUTINE PIO_TF_Get_undef_iotypes(iotypes, iotype_descs, num_iotypes) ALLOCATE(iotype_descs(num_iotypes)) i = 1 -#ifndef _NETCDF - ! netcdf - iotypes(i) = PIO_iotype_netcdf - iotype_descs(i) = "NETCDF" - i = i + 1 -#ifndef _PNETCDF - ! pnetcdf - iotypes(i) = PIO_iotype_pnetcdf - iotype_descs(i) = "PNETCDF" - i = i + 1 -#endif -#ifndef _NETCDF4 - ! netcdf4p, netcdf4c - iotypes(i) = PIO_iotype_netcdf4c - iotype_descs(i) = "NETCDF4C" - i = i + 1 - iotypes(i) = PIO_iotype_netcdf4p - iotype_descs(i) = "NETCDF4P" - i = i + 1 -#endif -#endif END SUBROUTINE ! Returns a list of PIO base types diff --git a/tests/unit/driver.F90 b/tests/unit/driver.F90 index d3f3a83fd7c..6764b875595 100644 --- a/tests/unit/driver.F90 +++ b/tests/unit/driver.F90 @@ -64,13 +64,6 @@ Program pio_unit_test_driver ! Ignore namelist values if PIO not built with correct options ! (i.e. don't test pnetcdf if not built with pnetcdf) -#ifndef _NETCDF - if (ltest_netcdf) then - write(*,"(A,1x,A)") "WARNING: can not test netcdf files because PIO", & - "was not compiled with -D_NETCDF" - ltest_netcdf = .false. - end if -#endif #ifndef _NETCDF4 if (ltest_netcdf4p) then write(*,"(A,1x,A)") "WARNING: can not test netcdf4p files because PIO", &