From 531c5a635e5c4a7bc49e4533bb2e3a079d56a43d Mon Sep 17 00:00:00 2001 From: aliabdolali Date: Mon, 24 Jan 2022 15:10:42 +0000 Subject: [PATCH 1/2] reintegrate dev/ufs-weather-model --- model/src/wmesmfmd.F90 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/model/src/wmesmfmd.F90 b/model/src/wmesmfmd.F90 index ff00c59f1..fc626e53c 100644 --- a/model/src/wmesmfmd.F90 +++ b/model/src/wmesmfmd.F90 @@ -187,7 +187,7 @@ module WMESMFMD !/ !/ Public module methods !/ - public SetServices + public SetServices, SetVM !/ !/ Private module parameters !/ @@ -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 ! ! -------------------------------------------------------------------- / From ea11657dc598d4eebae89c5538ea4681f7a70875 Mon Sep 17 00:00:00 2001 From: aliabdolali Date: Mon, 24 Jan 2022 22:37:10 +0000 Subject: [PATCH 2/2] separate two commits --- model/src/wmesmfmd.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/src/wmesmfmd.F90 b/model/src/wmesmfmd.F90 index fc626e53c..4d5142e6e 100644 --- a/model/src/wmesmfmd.F90 +++ b/model/src/wmesmfmd.F90 @@ -187,7 +187,7 @@ module WMESMFMD !/ !/ Public module methods !/ - public SetServices, SetVM + public SetServices !/ !/ Private module parameters !/