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.

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

reintegrate_ufs #589

Closed
wants to merge 33 commits into from
Closed
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
98c5702
Added boundary checks to the SMC grid input files for ww3_grid,
UKMO-lsampson Jun 8, 2020
71b9ba9
Fb 360 calendar (#8)
ukmo-juan-castillo Jul 16, 2020
6c42d17
RTD support for ww3_boun[dc] (#10)
ukmo-ccbunney Jul 28, 2020
5c361aa
Fb coupling time (#9)
ukmo-juan-castillo Jul 30, 2020
cc34122
Merge remote-tracking branch 'upstream/staging' into develop
Aug 7, 2020
33a7af3
bug fix for ukmet development
Aug 7, 2020
68c3c96
Merge remote-tracking branch 'upstream/develop' into develop
Oct 19, 2020
663d983
Merge remote-tracking branch 'upstream/develop' into develop
Oct 26, 2020
d4887f5
Merge remote-tracking branch 'upstream/develop' into develop
Jan 11, 2021
dc0cea9
Merge remote-tracking branch 'upstream/develop' into develop
Mar 4, 2021
23e5537
Merge remote-tracking branch 'upstream/develop' into develop
Mar 19, 2021
8bf217e
Merge remote-tracking branch 'upstream/develop' into develop
Mar 23, 2021
76cc41f
Merge remote-tracking branch 'upstream/develop' into develop
Mar 26, 2021
ff106db
Merge remote-tracking branch 'upstream/develop' into develop
Apr 27, 2021
1da66cd
Merge remote-tracking branch 'upstream/develop' into develop
May 27, 2021
cecf4b7
aaRevert "Make ww3_grid into a callable subroutine (#362)"
May 27, 2021
17a526a
Merge remote-tracking branch 'upstream/develop' into develop
Jun 15, 2021
1a5413f
solve conflict
Jun 15, 2021
76354f4
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Jun 16, 2021
7ebe4d3
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Aug 5, 2021
c919878
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Sep 2, 2021
f1ef2a2
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Sep 20, 2021
4094277
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Sep 23, 2021
067b7cd
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Sep 27, 2021
b50da54
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Oct 13, 2021
7b79033
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Oct 19, 2021
87c7f30
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Oct 21, 2021
41fe562
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Nov 5, 2021
692aea6
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Nov 22, 2021
7f8ff78
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Nov 23, 2021
d263ab9
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Dec 21, 2021
b414be8
Merge branch 'NOAA-EMC:develop' into develop
aliabdolali Jan 23, 2022
d3ac0d7
add ufs updates
Jan 23, 2022
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
30 changes: 29 additions & 1 deletion model/src/wmesmfmd.F90
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ module WMESMFMD
!/
!/ Public module methods
!/
public SetServices
public SetServices, SetVM
!/
!/ Private module parameters
!/
Expand Down Expand Up @@ -774,6 +774,34 @@ subroutine InitializeP1 ( gcomp, impState, expState, extClock, rc )
if (ESMF_LogFoundError(rc, PASSTHRU)) return
end if
end if

call NUOPC_CompAttributeGet(gcomp, name="mask_value_water", &
value=cvalue, isPresent=isPresent, isSet=isSet, rc=rc)
if (ESMF_LogFoundError(rc, PASSTHRU)) return
if (isPresent .and. isSet) then
maskvaluewater = ESMF_UtilString2Int(cvalue, rc=rc)
if (ESMF_LogFoundError(rc, PASSTHRU)) return
if (verbosity.gt.0) then
write(logmsg,*) maskvaluewater
call ESMF_LogWrite(trim(cname)//': mask_value_water = '// &
trim(logmsg), ESMF_LOGMSG_INFO, rc=rc)
if (ESMF_LogFoundError(rc, PASSTHRU)) return
end if
end if

call NUOPC_CompAttributeGet(gcomp, name="mask_value_land", &
value=cvalue, isPresent=isPresent, isSet=isSet, rc=rc)
if (ESMF_LogFoundError(rc, PASSTHRU)) return
if (isPresent .and. isSet) then
maskvalueland = ESMF_UtilString2Int(cvalue, rc=rc)
if (ESMF_LogFoundError(rc, PASSTHRU)) return
if (verbosity.gt.0) then
write(logmsg,*) maskvalueland
call ESMF_LogWrite(trim(cname)//': mask_value_land = '// &
trim(logmsg), ESMF_LOGMSG_INFO, rc=rc)
if (ESMF_LogFoundError(rc, PASSTHRU)) return
end if
end if
end if
!
! -------------------------------------------------------------------- /
Expand Down