From b81072a49db6625a40a88a58ace96b41ddf8b92f Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 28 Jun 2024 03:40:22 -0600 Subject: [PATCH 1/2] renamed Fogg_rofi to Fgrg_rofi --- dglc/dglc_datamode_noevolve_mod.F90 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dglc/dglc_datamode_noevolve_mod.F90 b/dglc/dglc_datamode_noevolve_mod.F90 index e4392105..806373e5 100644 --- a/dglc/dglc_datamode_noevolve_mod.F90 +++ b/dglc/dglc_datamode_noevolve_mod.F90 @@ -40,7 +40,7 @@ module dglc_datamode_noevolve_mod type(icesheet_ptr_t), allocatable :: Sg_ice_covered(:) type(icesheet_ptr_t), allocatable :: Sg_icemask(:) type(icesheet_ptr_t), allocatable :: Sg_icemask_coupled_fluxes(:) - type(icesheet_ptr_t), allocatable :: Fogg_rofi(:) + type(icesheet_ptr_t), allocatable :: Fgrg_rofi(:) ! Import fields integer, parameter :: nlev_import = 30 @@ -55,7 +55,7 @@ module dglc_datamode_noevolve_mod character(len=*), parameter :: field_out_ice_covered = 'Sg_ice_covered' character(len=*), parameter :: field_out_icemask = 'Sg_icemask' character(len=*), parameter :: field_out_icemask_coupled_fluxes = 'Sg_icemask_coupled_fluxes' - character(len=*), parameter :: field_out_rofi = 'Fogg_rofi' + character(len=*), parameter :: field_out_rofi = 'Fgrg_rofi' ! Import Field names character(len=*), parameter :: field_in_tsrf = 'Sl_tsrf' @@ -162,7 +162,7 @@ subroutine dglc_datamode_noevolve_init_pointers(NStateExp, NstateImp, rc) allocate(Sg_ice_covered(num_icesheets)) allocate(Sg_icemask(num_icesheets)) allocate(Sg_icemask_coupled_fluxes(num_icesheets)) - allocate(Fogg_rofi(num_icesheets)) + allocate(Fgrg_rofi(num_icesheets)) do ns = 1,num_icesheets call dshr_state_getfldptr(NStateExp(ns), field_out_area, fldptr1=Sg_area(ns)%ptr, rc=rc) @@ -175,7 +175,7 @@ subroutine dglc_datamode_noevolve_init_pointers(NStateExp, NstateImp, rc) if (chkerr(rc,__LINE__,u_FILE_u)) return call dshr_state_getfldptr(NStateExp(ns), field_out_icemask_coupled_fluxes, fldptr1=Sg_icemask_coupled_fluxes(ns)%ptr, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return - call dshr_state_getfldptr(NStateExp(ns), field_out_rofi, fldptr1=Fogg_rofi(ns)%ptr, rc=rc) + call dshr_state_getfldptr(NStateExp(ns), field_out_rofi, fldptr1=Fgrg_rofi(ns)%ptr, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return end do @@ -365,10 +365,10 @@ subroutine dglc_datamode_noevolve_advance(pio_subsystem, io_type, io_format, & end if if (initialized_noevolve) then - ! Compute Fogg_rofi + ! Compute Fgrg_rofi do ns = 1,num_icesheets - do ng = 1,size(Fogg_rofi(ns)%ptr) - Fogg_rofi(ns)%ptr(ng) = Flgl_qice(ns)%ptr(ng) + do ng = 1,size(Fgrg_rofi(ns)%ptr) + Fgrg_rofi(ns)%ptr(ng) = Flgl_qice(ns)%ptr(ng) end do end do end if From 305114787e97215832c2e7497b5b6076227c2198 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 28 Jun 2024 03:44:21 -0600 Subject: [PATCH 2/2] merge to main --- dglc/dglc_datamode_noevolve_mod.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dglc/dglc_datamode_noevolve_mod.F90 b/dglc/dglc_datamode_noevolve_mod.F90 index 0bddb480..975f8971 100644 --- a/dglc/dglc_datamode_noevolve_mod.F90 +++ b/dglc/dglc_datamode_noevolve_mod.F90 @@ -178,7 +178,7 @@ subroutine dglc_datamode_noevolve_init_pointers(NStateExp, NstateImp, rc) call dshr_state_getfldptr(NStateExp(ns), field_out_rofi, fldptr1=Fgrg_rofi(ns)%ptr, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return - Fogg_rofi(ns)%ptr(:) = 0._r8 + Fgrg_rofi(ns)%ptr(:) = 0._r8 end do ! initialize pointers to import fields if appropriate