From 3f400ec89242b049213c84d9ca37f5402d79b46b Mon Sep 17 00:00:00 2001 From: Michael Waxmonsky Date: Tue, 25 Jul 2023 13:46:49 -0600 Subject: [PATCH] Updating write init files from python file update. --- .../write_init_files/physics_inputs_4D.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_bvd.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_ddt.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_ddt2.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_ddt_array.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_host_var.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_mf.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_no_horiz.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_noreq.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_param.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_protect.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_scalar.F90 | 10 ++++++++-- .../write_init_files/physics_inputs_simple.F90 | 10 ++++++++-- 13 files changed, 104 insertions(+), 26 deletions(-) diff --git a/test/unit/sample_files/write_init_files/physics_inputs_4D.F90 b/test/unit/sample_files/write_init_files/physics_inputs_4D.F90 index e74d2a90..ace5eabf 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_4D.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_4D.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90 b/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90 index 90c3e9b9..04316ed7 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_bvd.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90 b/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90 index c2520655..25e77e2b 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_ddt.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90 b/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90 index 5f4ce25a..ef5db742 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_ddt2.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90 b/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90 index e2548410..881184d4 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_ddt_array.F90 @@ -75,7 +75,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -154,14 +154,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90 b/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90 index 84822f38..0c0e0827 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_host_var.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_mf.F90 b/test/unit/sample_files/write_init_files/physics_inputs_mf.F90 index 1883f425..f90095d1 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_mf.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_mf.F90 @@ -75,7 +75,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -154,14 +154,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90 b/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90 index af4292cb..9e40162a 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_no_horiz.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90 b/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90 index a2e47099..3d5bc4de 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_noreq.F90 @@ -73,7 +73,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -152,14 +152,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_param.F90 b/test/unit/sample_files/write_init_files/physics_inputs_param.F90 index 1e0082b5..d1d15748 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_param.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_param.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_protect.F90 b/test/unit/sample_files/write_init_files/physics_inputs_protect.F90 index 532ad9da..7a376923 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_protect.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_protect.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90 b/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90 index a2be48d6..58bff3f1 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_scalar.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys diff --git a/test/unit/sample_files/write_init_files/physics_inputs_simple.F90 b/test/unit/sample_files/write_init_files/physics_inputs_simple.F90 index c29356c0..d62b832b 100644 --- a/test/unit/sample_files/write_init_files/physics_inputs_simple.F90 +++ b/test/unit/sample_files/write_init_files/physics_inputs_simple.F90 @@ -74,7 +74,7 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia type(ccpp_constituent_prop_ptr_t), pointer :: const_props(:) real(kind=kind_phys) :: constituent_default_value integer :: constituent_errflg - character(len=SHR_KIND_CX) :: constituent_errmsg + character(len=512) :: constituent_errmsg logical :: constituent_has_default ! Logical to default optional argument to False: @@ -153,14 +153,20 @@ subroutine physics_read_data(file, suite_names, timestep, read_initialized_varia constituent_has_default = .false. call const_props(constituent_idx)%has_default(constituent_has_default, & constituent_errflg, constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if if (constituent_has_default) then call & const_props(constituent_idx)%default_value(constituent_default_value, constituent_errflg,& constituent_errmsg) + if (constituent_errflg .ne. 0) then + call endrun(constituent_errmsg) + end if field_data_ptr(:,:,constituent_idx) = constituent_default_value if (masterproc) then write(iulog,*) 'Consitituent ', ccpp_required_data(req_idx), & - ' initialized from file: ', constituent_default_value + ' initialized to default value: ', constituent_default_value end if else field_data_ptr(:,:,constituent_idx) = 0._kind_phys