diff --git a/developer_tests/namelist/test_parse_variables.f90 b/developer_tests/namelist/test_parse_variables.f90 index 16e75ceb42..88a0b76ee6 100644 --- a/developer_tests/namelist/test_parse_variables.f90 +++ b/developer_tests/namelist/test_parse_variables.f90 @@ -72,10 +72,10 @@ program test_parse_variables call ok(allocated(state_vars_clamp%clamp_values) .eqv. .true.) call ok(state_vars_clamp%clamp_values(1,1) == 0.0_r8) call ok(state_vars_clamp%clamp_values(1,2) == 0.0_r8) -call ok(state_vars_clamp%clamp_values(2,1) == 0.0_r8) -call ok(state_vars_clamp%clamp_values(2,2) == 0.0_r8) -call ok(state_vars_clamp%clamp_values(3,1) == 0.0_r8) -call ok(state_vars_clamp%clamp_values(3,2) == 0.0_r8) +call ok(state_vars_clamp%clamp_values(2,1) == 1.0_r8, "1.0") +call ok(state_vars_clamp%clamp_values(2,2) == 2.0_r8, "integer '2'") +call ok(state_vars_clamp%clamp_values(3,1) == -4.0_r8, "integer '-4'") +call ok(state_vars_clamp%clamp_values(3,2) == 3.0_r8, "integer '3'") call ok(state_vars_clamp%updates(1) .eqv. .true.) call ok(state_vars_clamp%updates(2) .eqv. .false.) call ok(state_vars_clamp%updates(3) .eqv. .true.) diff --git a/developer_tests/namelist/work/input.nml b/developer_tests/namelist/work/input.nml index 5cb8222ada..0af93591d6 100644 --- a/developer_tests/namelist/work/input.nml +++ b/developer_tests/namelist/work/input.nml @@ -1,7 +1,7 @@ &model_nml_clamp state_variables_clamp = 'SALT_CUR ', 'QTY_SALINITY', '0.0', '0.0', 'UPDATE', - 'TEMP_CUR ', 'QTY_POTENTIAL_TEMPERATURE', '0.0', '0.0', 'NO_COPY_BACK', - 'UVEL_CUR ', 'QTY_U_CURRENT_COMPONENT ', '0', '0.0', 'UPDATE', + 'TEMP_CUR ', 'QTY_POTENTIAL_TEMPERATURE', '1.0', '2', 'NO_COPY_BACK', + 'UVEL_CUR ', 'QTY_U_CURRENT_COMPONENT ', '-4', '3', 'UPDATE', / &model_nml diff --git a/models/mpas_atm/model_mod.f90 b/models/mpas_atm/model_mod.f90 index 02e7361c70..f960b5a907 100644 --- a/models/mpas_atm/model_mod.f90 +++ b/models/mpas_atm/model_mod.f90 @@ -4162,14 +4162,14 @@ subroutine get_variable_bounds(bounds_table, ivar) bound = trim(bounds_table(2,n)) if ( bound /= 'NULL' .and. bound /= '' ) then - read(bound,'(d16.8)') lower_bound + read(bound, *) lower_bound else lower_bound = missing_r8 endif bound = trim(bounds_table(3,n)) if ( bound /= 'NULL' .and. bound /= '' ) then - read(bound,'(d16.8)') upper_bound + read(bound, *) upper_bound else upper_bound = missing_r8 endif diff --git a/models/tiegcm/model_mod.f90 b/models/tiegcm/model_mod.f90 index 1a585b6e3f..3b0f26a216 100644 --- a/models/tiegcm/model_mod.f90 +++ b/models/tiegcm/model_mod.f90 @@ -1036,10 +1036,10 @@ subroutine load_up_state_structure_from_file(filename, nvar, domain_name, domain var_names(j) = variable_table(i, VT_VARNAMEINDX) kind_list(j) = get_index_for_quantity(variable_table(i, VT_KINDINDX)) if (variable_table(i, VT_MINVALINDX) /= 'NA') then - read(variable_table(i, VT_MINVALINDX), '(d16.8)') clamp_vals(j,1) + read(variable_table(i, VT_MINVALINDX), *) clamp_vals(j,1) endif if (variable_table(i, VT_MAXVALINDX) /= 'NA') then - read(variable_table(i, VT_MAXVALINDX), '(d16.8)') clamp_vals(j,2) + read(variable_table(i, VT_MAXVALINDX), *) clamp_vals(j,2) endif if (variable_table(i, VT_STATEINDX) == 'NO_COPY_BACK') then update_list(j) = .false. diff --git a/models/utilities/default_model_mod.f90 b/models/utilities/default_model_mod.f90 index 49f9a0458c..2b64dc5965 100644 --- a/models/utilities/default_model_mod.f90 +++ b/models/utilities/default_model_mod.f90 @@ -355,13 +355,13 @@ function parse_variables_clamp(vars_table) result(state_vars) endif if (vars_table(5*i-2) /= 'NA') then - read(vars_table(5*i-2), '(d16.8)') state_vars%clamp_values(i,1) + read(vars_table(5*i-2), *) state_vars%clamp_values(i,1) else state_vars%clamp_values(i,1) = MISSING_R8 endif if (vars_table(5*i-1) /= 'NA') then - read(vars_table(5*i-1), '(d16.8)') state_vars%clamp_values(i,2) + read(vars_table(5*i-1), *) state_vars%clamp_values(i,2) else state_vars%clamp_values(i,2) = MISSING_R8 endif diff --git a/models/wrf/model_mod.f90 b/models/wrf/model_mod.f90 index 6de4693e2e..229d78bb21 100644 --- a/models/wrf/model_mod.f90 +++ b/models/wrf/model_mod.f90 @@ -7821,14 +7821,14 @@ subroutine get_variable_bounds(bounds_table,wrf_var_name,lb,ub,instructions) bound_trim = trim(bounds_table(2,ivar)) if ( bound_trim /= 'NULL' ) then - read(bound_trim,'(d16.8)') lb + read(bound_trim, *) lb else lb = missing_r8 endif bound_trim = trim(bounds_table(3,ivar)) if ( bound_trim /= 'NULL' ) then - read(bound_trim,'(d16.8)') ub + read(bound_trim, *) ub else ub = missing_r8 endif