Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes shr_file to shr_log. #960

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Changes shr_file to shr_log. #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
217909a
replace shr_file with shr_log
jedwards4b Jun 28, 2024
53ad2b1
Merge pull request #32 from jedwards4b/update_shr_log
dabail10 Jun 28, 2024
2dd7ab7
Change names for stub routines
dabail10 Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module cice_wrapper_mod

#ifdef CESMCOUPLED
use perf_mod , only : t_startf, t_stopf, t_barrierf
use shr_file_mod , only : shr_file_getlogunit, shr_file_setlogunit
use shr_log_mod , only : shr_log_getlogunit, shr_log_setlogunit

use ice_kinds_mod , only : dbl_kind, int_kind, char_len, char_len_long

Expand Down Expand Up @@ -82,12 +82,12 @@ end subroutine ufs_logfhour

! Define stub routines that do nothing - they are just here to avoid
! having cppdefs in the main program
subroutine shr_file_setLogUnit(nunit)
subroutine shr_log_setLogUnit(nunit)
integer, intent(in) :: nunit
end subroutine shr_file_setLogUnit
subroutine shr_file_getLogUnit(nunit)
end subroutine shr_log_setLogUnit
subroutine shr_log_getLogUnit(nunit)
integer, intent(in) :: nunit
end subroutine shr_file_getLogUnit
end subroutine shr_log_getLogUnit
subroutine t_startf(string)
character(len=*) :: string
end subroutine t_startf
Expand Down
10 changes: 5 additions & 5 deletions cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module ice_comp_nuopc
use icepack_intfc , only : icepack_init_orbit, icepack_init_parameters, icepack_query_orbit
use icepack_intfc , only : icepack_query_tracer_flags, icepack_query_parameters
use cice_wrapper_mod , only : t_startf, t_stopf, t_barrierf
use cice_wrapper_mod , only : shr_file_getlogunit, shr_file_setlogunit
use cice_wrapper_mod , only : shr_log_getlogunit, shr_log_setlogunit
use cice_wrapper_mod , only : ufs_settimer, ufs_logtimer, ufs_file_setlogunit, wtime
#ifdef CESMCOUPLED
use shr_const_mod
Expand Down Expand Up @@ -497,7 +497,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
! Note that sets the nu_diag module variable in ice_fileunits
! Set the nu_diag_set flag so it's not reset later

call shr_file_setLogUnit (shrlogunit)
call shr_log_setLogUnit (shrlogunit)
call ufs_file_setLogUnit('./log.ice.timer',nu_timer,runtimelog)

call NUOPC_CompAttributeGet(gcomp, name="diro", value=cvalue, &
Expand Down Expand Up @@ -1067,8 +1067,8 @@ subroutine ModelAdvance(gcomp, rc)
! Reset shr logging to my log file
!--------------------------------

call shr_file_getLogUnit (shrlogunit)
call shr_file_setLogUnit (nu_diag)
call shr_log_getLogUnit (shrlogunit)
call shr_log_setLogUnit (nu_diag)

!--------------------------------
! Query the Component for its clock, importState and exportState
Expand Down Expand Up @@ -1207,7 +1207,7 @@ subroutine ModelAdvance(gcomp, rc)
end if

! reset shr logging to my original values
call shr_file_setLogUnit (shrlogunit)
call shr_log_setLogUnit (shrlogunit)

!--------------------------------
! stop timers and print timer info
Expand Down
4 changes: 2 additions & 2 deletions cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module ice_shr_methods
use ice_kinds_mod, only : r8 => dbl_kind, cl=>char_len_long, cs=>char_len
use ice_exit , only : abort_ice
#ifdef CESMCOUPLED
use shr_file_mod , only : shr_file_setlogunit, shr_file_getLogUnit
use shr_log_mod , only : shr_log_setlogunit
#endif

implicit none
Expand Down Expand Up @@ -165,7 +165,7 @@ subroutine set_component_logging(gcomp, mastertask, logunit, shrlogunit, rc)
endif

#ifdef CESMCOUPLED
call shr_file_setLogUnit (logunit)
call shr_log_setLogUnit (logunit)
#endif

end subroutine set_component_logging
Expand Down
Loading