From df41c29960dc9f641d434d71d45d6c2d39a64946 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Fri, 12 Jul 2024 12:08:18 -0600 Subject: [PATCH 1/2] Declare cnt variable needed with ESMF_AWARE_THREADING This was mistakenly removed in 4d9073d8 when cleaning up unused variables. Resolves ESCOMP/CMEPS#482 --- cesm/driver/esm.F90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cesm/driver/esm.F90 b/cesm/driver/esm.F90 index e2ed6489..d357e975 100644 --- a/cesm/driver/esm.F90 +++ b/cesm/driver/esm.F90 @@ -877,6 +877,9 @@ subroutine esm_init_pelayout(driver, maxthreads, rc) character(len=5) :: inst_suffix character(CL) :: cvalue logical :: found_comp +#ifdef ESMF_AWARE_THREADING + integer :: cnt +#endif integer :: rank, nprocs, ierr character(len=*), parameter :: subname = "(esm_pelayout.F90:esm_init_pelayout)" !--------------------------------------- From fdb9e0e119d14f0573b81096b1bba31566de4a77 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 25 Jul 2024 10:07:23 -0600 Subject: [PATCH 2/2] fix an error in the aoflux wind_gust fields --- mediator/med_phases_aofluxes_mod.F90 | 3 --- 1 file changed, 3 deletions(-) diff --git a/mediator/med_phases_aofluxes_mod.F90 b/mediator/med_phases_aofluxes_mod.F90 index 7697b574..a85d76bc 100644 --- a/mediator/med_phases_aofluxes_mod.F90 +++ b/mediator/med_phases_aofluxes_mod.F90 @@ -1721,8 +1721,6 @@ subroutine set_aoflux_out_pointers(fldbun, lsize, aoflux_out, xgrid, rc) call fldbun_getfldptr(fldbun, 'So_duu10n', aoflux_out%duu10n, xgrid=xgrid, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return - call fldbun_getfldptr(fldbun, 'So_ugustOut', aoflux_out%ugust_out, xgrid=xgrid, rc=rc) - if (chkerr(rc,__LINE__,u_FILE_u)) return call fldbun_getfldptr(fldbun, 'So_u10withGust', aoflux_out%u10_withGust, xgrid=xgrid, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return call fldbun_getfldptr(fldbun, 'So_u10res', aoflux_out%u10res, xgrid=xgrid, rc=rc) @@ -1752,7 +1750,6 @@ subroutine set_aoflux_out_pointers(fldbun, lsize, aoflux_out, xgrid, rc) allocate(aoflux_out%evap_18O(lsize)); aoflux_out%evap_18O(:) = 0._R8 allocate(aoflux_out%evap_HDO(lsize)); aoflux_out%evap_HDO(:) = 0._R8 end if - if (add_gusts) then call fldbun_getfldptr(fldbun, 'So_ugustOut', aoflux_out%ugust_out, xgrid=xgrid, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return