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

Add switch ifdefs for wmesmf SCRIP #537

Merged
merged 4 commits into from
Nov 19, 2021
Merged

Add switch ifdefs for wmesmf SCRIP #537

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c2a28d
Use CPP instead of Switches (#476) (#515)
JessicaMeixner-NOAA Nov 3, 2021
3539496
solve conflicts
Nov 5, 2021
c0e7329
Merge branch 'NOAA-EMC:develop' into sync_ufs-wm
aliabdolali Nov 15, 2021
9362856
put in ifdefs for scrip in wmesmf
JessicaMeixner-NOAA Nov 17, 2021
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
6 changes: 6 additions & 0 deletions model/src/wmesmfmd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ module WMESMFMD
use W3SRC4MD, only: W3SPR4
#endif
use W3IOGOMD, only: W3OUTG
#ifdef W3_SCRIP
use WMSCRPMD, only: get_scrip_info_structured
#endif
!/
!/ Specify default data typing
!/
Expand Down Expand Up @@ -3126,6 +3128,7 @@ subroutine CreateImpGrid ( gcomp, rc )
!
! 2.h Set ESMF import grid corner coordinates
!
#ifdef W3_SCRIP
call ESMF_GridAddCoord( impGrid, &
staggerLoc=ESMF_STAGGERLOC_CORNER, rc=rc )
if (ESMF_LogFoundError(rc, PASSTHRU)) return
Expand Down Expand Up @@ -3197,6 +3200,7 @@ subroutine CreateImpGrid ( gcomp, rc )
rptry(grid_dims(1),grid_dims(2)+1)
end if
endif
#endif
!
! -------------------------------------------------------------------- /
! 3. Create import field mask and routeHandle halo update
Expand Down Expand Up @@ -3606,6 +3610,7 @@ subroutine CreateExpGrid ( gcomp, rc )
!
! 2.h Set ESMF export grid corner coordinates
!
#ifdef W3_SCRIP
call ESMF_GridAddCoord( expGrid, &
staggerLoc=ESMF_STAGGERLOC_CORNER, rc=rc )
if (ESMF_LogFoundError(rc, PASSTHRU)) return
Expand Down Expand Up @@ -3677,6 +3682,7 @@ subroutine CreateExpGrid ( gcomp, rc )
rptry(grid_dims(1),grid_dims(2)+1)
end if
end if
#endif
!
! -------------------------------------------------------------------- /
! 3. Create export field mask and routeHandle halo update
Expand Down