Skip to content
Merged
24 changes: 15 additions & 9 deletions diag_manager/diag_manager.F90
Original file line number Diff line number Diff line change
Expand Up @@ -383,9 +383,11 @@ INTEGER FUNCTION register_diag_field_scalar(module_name, field_name, init_time,
IF ( PRESENT(err_msg) ) err_msg = ''

! Fatal error if range is present and its extent is not 2.
IF ( PRESENT(range) .AND. (SIZE(range) .NE. 2) ) THEN
! <ERROR STATUS="FATAL">extent of range should be 2</ERROR>
CALL error_mesg ('diag_manager_mod::register_diag_field', 'extent of range should be 2', FATAL)
IF ( PRESENT(range) ) THEN
IF ( SIZE(range) .NE. 2 ) THEN
! <ERROR STATUS="FATAL">extent of range should be 2</ERROR>
CALL error_mesg ('diag_manager_mod::register_diag_field', 'extent of range should be 2', FATAL)
END IF
END IF

IF ( PRESENT(init_time) ) THEN
Expand Down Expand Up @@ -449,9 +451,11 @@ INTEGER FUNCTION register_diag_field_array(module_name, field_name, axes, init_t
IF ( PRESENT(err_msg) ) err_msg = ''

! Fatal error if range is present and its extent is not 2.
IF ( PRESENT(range) .AND. (SIZE(range) .NE. 2) ) THEN
! <ERROR STATUS="FATAL">extent of range should be 2</ERROR>
CALL error_mesg ('diag_manager_mod::register_diag_field', 'extent of range should be 2', FATAL)
IF ( PRESENT(range) ) THEN
IF ( SIZE(range) .NE. 2 ) THEN
! <ERROR STATUS="FATAL">extent of range should be 2</ERROR>
CALL error_mesg ('diag_manager_mod::register_diag_field', 'extent of range should be 2', FATAL)
END IF
END IF

! Call register static, then set static back to false
Expand Down Expand Up @@ -671,9 +675,11 @@ INTEGER FUNCTION register_static_field(module_name, field_name, axes, long_name,
END IF

! Fatal error if range is present and its extent is not 2.
IF ( PRESENT(range) .AND. (SIZE(range) .NE. 2) ) THEN
! <ERROR STATUS="FATAL">extent of range should be 2</ERROR>
CALL error_mesg ('diag_manager_mod::register_static_field', 'extent of range should be 2', FATAL)
IF ( PRESENT(range) ) THEN
IF ( SIZE(range) .NE. 2 ) THEN
! <ERROR STATUS="FATAL">extent of range should be 2</ERROR>
CALL error_mesg ('diag_manager_mod::register_static_field', 'extent of range should be 2', FATAL)
END IF
END IF

! Namelist do_diag_field_log is by default false. Thus to log the
Expand Down