From a8c7e6e6162e7f91a49dd86bcb2b7fb03813bc2e Mon Sep 17 00:00:00 2001 From: Julia Putko Date: Thu, 15 Jul 2021 16:48:24 -0700 Subject: [PATCH 1/5] bypassing error message related to kb, dimension value in field_manager --- src/field_manager.F90 | 5 ++++- src/formats/netcdf_output.F90 | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/field_manager.F90 b/src/field_manager.F90 index 89ecd62..282a6cd 100644 --- a/src/field_manager.F90 +++ b/src/field_manager.F90 @@ -29,7 +29,8 @@ 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 = 21 ! 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 :: status_not_registered = 0 integer, parameter, public :: status_registered_no_data = 1 @@ -255,6 +256,8 @@ 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 end select ! Basic consistency checks diff --git a/src/formats/netcdf_output.F90 b/src/formats/netcdf_output.F90 index a5503b2..e86ea63 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 (0.eq.1) 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 From e4d09145ed71638b343015b38277ad11cb5a42ba Mon Sep 17 00:00:00 2001 From: Julia Putko Date: Mon, 19 Jul 2021 17:11:41 -0700 Subject: [PATCH 2/5] info for dimensions, no longer bypassing error --- src/field_manager.F90 | 6 ++++-- src/formats/netcdf_output.F90 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/field_manager.F90 b/src/field_manager.F90 index 282a6cd..261d5b4 100644 --- a/src/field_manager.F90 +++ b/src/field_manager.F90 @@ -29,9 +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 = 21 ! First free id for user-specified dimensions !jpnote changed to 21 from 20 + integer, parameter, public :: id_dim_unused = 23 ! 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 + integer, parameter, public :: status_not_registered = 0 integer, parameter, public :: status_registered_no_data = 1 integer, parameter, public :: status_registered_with_data = 2 diff --git a/src/formats/netcdf_output.F90 b/src/formats/netcdf_output.F90 index e86ea63..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 (0.eq.1) 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) + 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 From 274133ea7c52a8e4a67fbe4f0791b6ad98cc4a79 Mon Sep 17 00:00:00 2001 From: Julia Putko Date: Thu, 22 Jul 2021 14:53:32 -0700 Subject: [PATCH 3/5] z1 not needed --- src/field_manager.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/field_manager.F90 b/src/field_manager.F90 index 261d5b4..5b7f15e 100644 --- a/src/field_manager.F90 +++ b/src/field_manager.F90 @@ -29,10 +29,10 @@ 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 = 23 ! First free id for user-specified dimensions !jpnote changed to 21 from 20 + 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 + ! 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 @@ -260,6 +260,8 @@ subroutine register_dimension(self,name,length,global_length,offset,id,newid) 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 From f129ad2181576624ae929331388d0a69bc574f7f Mon Sep 17 00:00:00 2001 From: Patrick Farnole Date: Wed, 11 Aug 2021 11:32:12 -0700 Subject: [PATCH 4/5] synchronizing subsubmodule. --- extern/fortran-yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 4c141f253dbc1e37657fbcf00be0c2da611f9ec0 Mon Sep 17 00:00:00 2001 From: Julia Putko Date: Tue, 21 Dec 2021 14:09:01 -0800 Subject: [PATCH 5/5] fortran-yaml --- extern/fortran-yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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