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

fix the x case #397

Merged
merged 6 commits into from
Aug 2, 2023
Merged

fix the x case #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0dbe67e
fix the x case
jedwards4b Jul 28, 2023
9b2942a
alternate solution for X case
jedwards4b Jul 31, 2023
3d8e233
update esmf and pio externals used in srt github workflow
jedwards4b Aug 1, 2023
896b6a1
debug workflow
jedwards4b Aug 1, 2023
5945f78
try adding SRCROOT env variable
jedwards4b Aug 1, 2023
8282ebc
remove rof_name
jedwards4b Aug 1, 2023
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
11 changes: 6 additions & 5 deletions .github/workflows/srt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:
CPPFLAGS: "-I/usr/include -I/usr/local/include "
LDFLAGS: "-L/usr/lib/x86_64-linux-gnu -lnetcdf -lnetcdff -lpnetcdf"
# Versions of all dependencies can be updated here
ESMF_VERSION: v8.4.0
PARALLELIO_VERSION: pio2_5_10
ESMF_VERSION: v8.5.0
PARALLELIO_VERSION: pio2_6_0
CIME_MODEL: cesm
CIME_DRIVER: nuopc
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -153,6 +153,7 @@ jobs:
mkdir -p $HOME/cesm/scratch
mkdir -p $HOME/cesm/inputdata
pushd $GITHUB_WORKSPACE/cesm/cime/CIME/tests
export SRCROOT=$GITHUB_WORKSPACE/cesm/
export CIME_TEST_PLATFORM=ubuntu-latest
export PIO_INCDIR=$HOME/pio/include
export PIO_LIBDIR=$HOME/pio/lib
Expand All @@ -175,6 +176,6 @@ jobs:
popd
# the following can be used by developers to login to the github server in case of errors
# see https://github.com/marketplace/actions/debugging-with-tmate for further details
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
4 changes: 2 additions & 2 deletions mediator/esmFldsExchange_cesm_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2158,7 +2158,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
! liquid from river and possibly flood from river to ocean
if (fldchk(is_local%wrap%FBImp(comprof, comprof), 'Forr_rofl' , rc=rc)) then
if (trim(rof2ocn_liq_rmap) == 'unset') then
call addmap_from(comprof, 'Forr_rofl', compocn, mapconsd, 'none', 'unset')
call addmap_from(comprof, 'Forr_rofl', compocn, mapconsd, 'one', 'unset')
else
call addmap_from(comprof, 'Forr_rofl', compocn, map_rof2ocn_liq, 'none', rof2ocn_liq_rmap)
end if
Expand All @@ -2182,7 +2182,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
! ice from river to ocean
if (fldchk(is_local%wrap%FBImp(comprof, comprof), 'Forr_rofi' , rc=rc)) then
if (trim(rof2ocn_ice_rmap) == 'unset') then
call addmap_from(comprof, 'Forr_rofi', compocn, mapconsd, 'none', 'unset')
call addmap_from(comprof, 'Forr_rofi', compocn, mapconsd, 'one', 'unset')
else
call addmap_from(comprof, 'Forr_rofi', compocn, map_rof2ocn_ice, 'none', rof2ocn_ice_rmap)
end if
Expand Down
1 change: 0 additions & 1 deletion mediator/med_internalstate_mod.F90
View file
Open in desktop
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
19 changes: 10 additions & 9 deletions mediator/med_map_mod.F90
View file
Open in desktop
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 @@ -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 @@ -818,6 +818,7 @@ subroutine med_map_packed_field_create(destcomp, flds_scalar_name, &
//' '//trim(fieldnamelist(nf))
call ESMF_LogWrite(trim(tmpstr), ESMF_LOGMSG_INFO)
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 +954,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 +1166,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 +1279,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 +1382,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