diff --git a/extern/fortran-yaml b/extern/fortran-yaml index 2d20331..3af2c0a 160000 --- a/extern/fortran-yaml +++ b/extern/fortran-yaml @@ -1 +1 @@ -Subproject commit 2d203312f4ee057673e6d5db94542ae770813048 +Subproject commit 3af2c0a0b126ef80af1ba6b2d427b2208d68b2d0 diff --git a/src/field_manager.F90 b/src/field_manager.F90 index 89ecd62..5b7f15e 100644 --- a/src/field_manager.F90 +++ b/src/field_manager.F90 @@ -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 @@ -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 diff --git a/src/formats/netcdf_output.F90 b/src/formats/netcdf_output.F90 index a5503b2..b5fa1bf 100644 --- a/src/formats/netcdf_output.F90 +++ b/src/formats/netcdf_output.F90 @@ -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