Skip to content

Uvic ice dev #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PatrickFarnole wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Uvic ice dev #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a8c7e6e
bypassing error message related to kb, dimension value in field_manager
Jul 15, 2021
2f16aa6
Merge pull request #1 from juliaputko/uvic_ice_jp
PatrickFarnole Jul 16, 2021
e4d0914
info for dimensions, no longer bypassing error
Jul 20, 2021
7c0c9e7
Merge pull request #2 from juliaputko/uvic_ice_jp
PatrickFarnole Jul 20, 2021
274133e
z1 not needed
Jul 22, 2021
7cc58b6
Merge pull request #3 from juliaputko/uvic_ice_jp
PatrickFarnole Jul 23, 2021
5ad97fb
Merge branch 'master' of github.com:BoldingBruggeman/flexout into uvi…
PatrickFarnole Aug 9, 2021
3da32b1
Merge branch 'master' of github.com:BoldingBruggeman/flexout into uvi…
Aug 10, 2021
f129ad2
synchronizing subsubmodule.
PatrickFarnole Aug 11, 2021
4c141f2
fortran-yaml
Dec 21, 2021
9384a35
Merge pull request #4 from juliaputko/uvic_ice_jp
PatrickFarnole Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/fortran-yaml
Open in desktop
Submodule fortran-yaml updated 1 files
+0 −2 test_yaml.F90
11 changes: 9 additions & 2 deletions src/field_manager.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ module field_manager
integer, parameter, public :: id_dim_z = 3
integer, parameter, public :: id_dim_zi = 4
integer, parameter, public :: id_dim_time = 5
integer, parameter, public :: id_dim_unused = 20 ! First free id for user-specified dimensions

integer, parameter, public :: id_dim_unused = 22 ! First free id for user-specified dimensions !jpnote changed to 21 from 20
integer, parameter, public :: id_dim_zice = 20 ! jpnote: ice and snow
integer, parameter, public :: id_dim_dzice = 21 ! jpnote
! integer, parameter, public :: id_dim_z1 = 22 ! jpnote not needed ?

integer, parameter, public :: status_not_registered = 0
integer, parameter, public :: status_registered_no_data = 1
integer, parameter, public :: status_registered_with_data = 2
Expand Down Expand Up @@ -255,6 +258,10 @@ subroutine register_dimension(self,name,length,global_length,offset,id,newid)
dim%iterator = 'k'
case (id_dim_zi)
dim%iterator = 'k1'
case (id_dim_zice)
dim%iterator = 'l' !jpnote
case (id_dim_dzice)
dim%iterator = 'dl' !jpnote added
end select

! Basic consistency checks
Expand Down
2 changes: 1 addition & 1 deletion src/formats/netcdf_output.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ subroutine save(self,julianday,secondsofday,microseconds)
elseif (associated(output_field%data%p0d)) then
iret = nf90_put_var(self%ncid,settings%varid,output_field%data%p0d,settings%start)
end if
if (iret/=NF90_NOERR) call host%fatal_error('netcdf_output:save','error saving variable "'//trim(output_field%output_name)//'" to '//trim(self%path)//trim(self%postfix)//'.nc: '//nf90_strerror(iret))
if (iret/=NF90_NOERR) call host%fatal_error('netcdf_output:save','error saving variable "'//trim(output_field%output_name)//'" to '//trim(self%path)//trim(self%postfix)//'.nc: '//nf90_strerror(iret)) !jpnote iret/=NF90_NOERR)
end select
output_field => output_field%next
end do
Expand Down