Skip to content

Commit

Permalink
fix the x case
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedwards4b
jedwards4b committed Jul 28, 2023
1 parent 98dcf46 commit 0dbe67e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
1 change: 0 additions & 1 deletion mediator/med_internalstate_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ subroutine med_internalstate_init(gcomp, rc)
end do
end if
is_local%wrap%num_icesheets = num_icesheets

call NUOPC_CompAttributeGet(gcomp, name='mediator_present', value=cvalue, isPresent=isPresent, isSet=isSet, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
if (isPresent .and. isSet) then
Expand Down
22 changes: 11 additions & 11 deletions mediator/med_map_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ subroutine med_map_RouteHandles_initfrom_esmflds(gcomp, flds_scalar_name, llogun
type(ESMF_Mesh) :: mesh_dst
type(med_fldlist_type), pointer :: FldListFr
type(med_fldlist_entry_type), pointer :: fldptr
character(len=*), parameter :: subname=' (module_med_map: RouteHandles_init) '
character(len=*), parameter :: subname=' (med_map_mod: RouteHandles_init) '
!-----------------------------------------------------------

call t_startf('MED:'//subname)
Expand Down Expand Up @@ -304,7 +304,7 @@ subroutine med_map_routehandles_initfrom_fieldbundle(n1, n2, FBsrc, FBdst, mapin
! local variables
type(ESMF_Field) :: fldsrc
type(ESMF_Field) :: flddst
character(len=*), parameter :: subname=' (module_MED_map:med_map_routehandles_initfrom_fieldbundle) '
character(len=*), parameter :: subname=' (med_map_mod:med_map_routehandles_initfrom_fieldbundle) '
!---------------------------------------------

rc = ESMF_SUCCESS
Expand Down Expand Up @@ -653,7 +653,7 @@ logical function med_map_RH_is_created_RH3d(RHs,n1,n2,mapindex,rc)
integer , intent(out) :: rc

! local variables
character(len=*), parameter :: subname=' (module_MED_map:med_map_RH_is_created_RH3d) '
character(len=*), parameter :: subname=' (med_map_mod:med_map_RH_is_created_RH3d) '
!-----------------------------------------------------------

rc = ESMF_SUCCESS
Expand All @@ -678,7 +678,7 @@ logical function med_map_RH_is_created_RH1d(RHs,mapindex,rc)
! local variables
integer :: rc1, rc2
logical :: mapexists
character(len=*), parameter :: subname=' (module_MED_map:med_map_RH_is_created_RH1d) '
character(len=*), parameter :: subname=' (med_map_mod:med_map_RH_is_created_RH1d) '
!-----------------------------------------------------------

rc = ESMF_SUCCESS
Expand Down Expand Up @@ -718,7 +718,7 @@ subroutine med_map_packed_field_create(destcomp, flds_scalar_name, &
use ESMF
use esmFlds , only : med_fldList_entry_type, med_fldList_getNumFlds, med_fldList_type
use esmFlds , only : med_fld_getFldInfo
use med_internalstate_mod , only : compname, mapnames
use med_internalstate_mod , only : compname, mapnames, rof_name
use med_internalstate_mod , only : packed_data_type, nmappers

! input/output variables
Expand Down Expand Up @@ -750,7 +750,7 @@ subroutine med_map_packed_field_create(destcomp, flds_scalar_name, &
character(CL), allocatable :: fieldNameList(:)
character(CS) :: mapnorm_mapindex
character(len=CX) :: tmpstr
character(len=*), parameter :: subname=' (module_MED_map:med_packed_field_create) '
character(len=*), parameter :: subname=' (med_map_mod:med_packed_field_create) '
!-----------------------------------------------------------

rc = ESMF_SUCCESS
Expand Down Expand Up @@ -817,7 +817,7 @@ subroutine med_map_packed_field_create(destcomp, flds_scalar_name, &
//', mapnorm '//trim(mapnorm_mapindex) &
//' '//trim(fieldnamelist(nf))
call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO)
else
else if(rof_name .ne. 'xrof' .and. compname(destcomp) .ne. 'ocn') then
if (mapnorm_mapindex /= packed_data(mapindex)%mapnorm) then
write(tmpstr,*)'Map type '//trim(mapnames(mapindex)) &
//', destcomp '//trim(compname(destcomp)) &
Expand Down Expand Up @@ -953,7 +953,7 @@ subroutine med_map_field_packed(FBSrc, FBDst, FBFracSrc, field_normOne, packed_d
type(ESMF_Field), pointer :: fieldlist_dst(:)
real(r8), pointer :: data_norm(:)
real(r8), pointer :: data_dst(:,:)
character(len=*), parameter :: subname=' (module_MED_map:med_map_field_packed) '
character(len=*), parameter :: subname=' (med_map_mod:med_map_field_packed) '
!-----------------------------------------------------------

call t_startf('MED:'//subname)
Expand Down Expand Up @@ -1165,7 +1165,7 @@ subroutine med_map_field_normalized(field_src, field_dst, routehandles, maptype,
integer :: ungriddedUBound(1) ! currently the size must equal 1 for rank 2 fields
integer :: lsize_src
integer :: lsize_dst
character(len=*), parameter :: subname=' (module_MED_map:med_map_field_normalized) '
character(len=*), parameter :: subname=' (med_map_mod:med_map_field_normalized) '
!-----------------------------------------------------------

rc = ESMF_SUCCESS
Expand Down Expand Up @@ -1278,7 +1278,7 @@ subroutine med_map_field(field_src, field_dst, routehandles, maptype, fldname, r
logical :: checkflag = .false.
character(len=CS) :: lfldname
real(ESMF_KIND_R8), parameter :: fillValue = 9.99e20_ESMF_KIND_R8
character(len=*), parameter :: subname='(module_MED_map:med_map_field) '
character(len=*), parameter :: subname='(med_map_mod:med_map_field) '
!---------------------------------------------------

rc = ESMF_SUCCESS
Expand Down Expand Up @@ -1381,7 +1381,7 @@ subroutine med_map_uv_cart3d(FBsrc, FBdst, routehandles, mapindex, rc)
integer :: spatialDim
real(r8), parameter :: deg2rad = shr_const_pi/180.0_R8 ! deg to rads
logical :: first_time = .true.
character(len=*), parameter :: subname=' (module_MED_map:med_map_uv_cart3d) '
character(len=*), parameter :: subname=' (med_map_mod:med_map_uv_cart3d) '
!-------------------------------------------------------------------------------

rc = ESMF_SUCCESS
Expand Down

0 comments on commit 0dbe67e

Please sign in to comment.