Skip to content

Commit

Permalink
Comment out procedures used by unit test.
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeGayno-NOAA committed Mar 3, 2023
1 parent 9ea1e2d commit 0de2503
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions sorc/fvcom_tools.fd/module_nwp.f90
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ module module_nwp
type(nwpbase), pointer :: head => NULL() !< Pointer to head of list.
type(nwpbase), pointer :: tail => NULL() !< Pointer to tail of list.
contains
procedure :: initial => initial_nwp !< Defines vars and names. @return
! procedure :: initial => initial_nwp !< Defines vars and names. @return
procedure :: list_initial => list_initial_nwp !< List the setup. @return
procedure :: read_n => read_nwp !< Initialize arrays, get data. @return
procedure :: get_time_ind => get_time_ind_nwp !< Get time ind. @return
procedure :: finish => finish_nwp !< Finish and deallocate. @return
! procedure :: read_n => read_nwp !< Initialize arrays, get data. @return
! procedure :: get_time_ind => get_time_ind_nwp !< Get time ind. @return
! procedure :: finish => finish_nwp !< Finish and deallocate. @return
end type fcst_nwp

type(ncio) :: ncdata !< Wrapper object for netCDF data file.
Expand Down
26 changes: 13 additions & 13 deletions sorc/fvcom_tools.fd/process_FVCOM.f90
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ program process_FVCOM
fv3times=1
t1=1

call fcst%initial('FV3LAM',wcstart)
call fcst%list_initial
call fcst%read_n(trim(thisfv3file),'FV3LAM',wcstart,fv3lon,fv3lat,fv3times,t1,&
fv3mask,fv3sst,fv3ice,fv3sfcT,fv3iceT,fv3sfcTl,fv3zorl,fv3hice, &
1,nlat)
call fcst%finish('FV3LAM',wcstart)
! call fcst%initial('FV3LAM',wcstart)
! call fcst%list_initial
! call fcst%read_n(trim(thisfv3file),'FV3LAM',wcstart,fv3lon,fv3lat,fv3times,t1,&
! fv3mask,fv3sst,fv3ice,fv3sfcT,fv3iceT,fv3sfcTl,fv3zorl,fv3hice, &
! 1,nlat)
! call fcst%finish('FV3LAM',wcstart)


write(6,*) 'fv3times: ', fv3times
Expand All @@ -261,17 +261,17 @@ program process_FVCOM
! fvcomfile='fvcom.nc'
! lbctimes: length of time dimension of FVCOM input data (command line input)
! Space infront of ' FVCOM' below is important!!
call fcst%initial(' FVCOM',wcstart)
call fcst%list_initial
call fcst%get_time_ind(trim(fvcomfile),inputFVCOMselStr,indexFVCOMsel)
! call fcst%initial(' FVCOM',wcstart)
! call fcst%list_initial
! call fcst%get_time_ind(trim(fvcomfile),inputFVCOMselStr,indexFVCOMsel)
! t2: index of time dimension to pull from FVCOM
t2=indexFVCOMsel
write(6,*) 'time asked for =', trim(inputFVCOMselStr)
write(6,*) 'time index selected = ', t2
call fcst%read_n(trim(fvcomfile),' FVCOM',wcstart,lbclon,lbclat,lbctimes,t2, &
lbcmask,lbcsst,lbcice,lbcsfcT,lbciceT,fv3sfcTl,lbczorl,lbchice, &
fv3_layout_begin(ix),fv3_layout_end(ix))
call fcst%finish(' FVCOM',wcstart)
! call fcst%read_n(trim(fvcomfile),' FVCOM',wcstart,lbclon,lbclat,lbctimes,t2, &
! lbcmask,lbcsst,lbcice,lbcsfcT,lbciceT,fv3sfcTl,lbczorl,lbchice, &
! fv3_layout_begin(ix),fv3_layout_end(ix))
! call fcst%finish(' FVCOM',wcstart)

! Check that the dimensions match

Expand Down
14 changes: 7 additions & 7 deletions tests/fvcom_tools/ftst_readfvcomnetcdf.F90
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ program readfvcomnetcdf
allocate(lbchice(nlon,nlat))

!Initialize and read in fv3 sfc data
call fcst%initial('FV3LAM',wcstart)
call fcst%read_n(trim(fv3file),'FV3LAM',wcstart,fv3lon,fv3lat,fv3times,t1,fv3mask,fv3sst,fv3ice,fv3sfcT,fv3iceT,fv3sfcTl,fv3zorl,fv3hice,1,nlat)
call fcst%finish('FV3LAM',wcstart)
!call fcst%initial('FV3LAM',wcstart)
!call fcst%read_n(trim(fv3file),'FV3LAM',wcstart,fv3lon,fv3lat,fv3times,t1,fv3mask,fv3sst,fv3ice,fv3sfcT,fv3iceT,fv3sfcTl,fv3zorl,fv3hice,1,nlat)
!call fcst%finish('FV3LAM',wcstart)
!If variables in fv3 sfc file do not match expected, stop
if (abs(fv3mask(1,1) - fv3mask_expected(1)) > EPSILON) stop 5
if (abs(fv3mask(5,5) - fv3mask_expected(2)) > EPSILON) stop 6
Expand All @@ -135,12 +135,12 @@ program readfvcomnetcdf
if (abs(fv3hice(5,5) - fv3hice_expected(2)) > EPSILON) stop 14

!Initialize and read in fvcom data
call fcst%initial(' FVCOM',wcstart)
call fcst%get_time_ind(trim(fvcomfile),inputFVCOMselStr,t2)
!call fcst%initial(' FVCOM',wcstart)
!call fcst%get_time_ind(trim(fvcomfile),inputFVCOMselStr,t2)
!If second time index is not returned, stop
if (abs(t2 - t2_expected) > EPSILON) stop 15
call fcst%read_n(trim(fvcomfile),' FVCOM',wcstart,lbclon,lbclat,lbctimes,t2,lbcmask,lbcsst,lbcice,lbcsfcT,lbciceT,fv3sfcTl,lbczorl,lbchice,1,nlat)
call fcst%finish(' FVCOM',wcstart)
!call fcst%read_n(trim(fvcomfile),' FVCOM',wcstart,lbclon,lbclat,lbctimes,t2,lbcmask,lbcsst,lbcice,lbcsfcT,lbciceT,fv3sfcTl,lbczorl,lbchice,1,nlat)
!call fcst%finish(' FVCOM',wcstart)
!If variables in fvcom file do not match expected, stop
if (abs(lbcmask(1,1) - lbcmask_expected(1)) > EPSILON) stop 16
if (abs(lbcmask(5,5) - lbcmask_expected(2)) > EPSILON) stop 17
Expand Down

0 comments on commit 0de2503

Please sign in to comment.