From 47422846b4fe5d19cfcb4e12798201b98786b1d0 Mon Sep 17 00:00:00 2001 From: Gian Villamil-Otero Date: Thu, 21 Oct 2021 13:16:01 -0400 Subject: [PATCH 1/3] Changes ESMF_Attribute to ESMF_InfoGet for FRIENDLYS --- .../GEOSmoist_GridComp/GEOS_MoistGridComp.F90 | 9 +++- .../GEOS_TurbulenceGridComp.F90 | 14 +++++-- .../GEOS_DatmoDynGridComp.F90 | 9 +++- GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 | 41 ++++++++++++++----- 4 files changed, 55 insertions(+), 18 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 index e31dcf4fd..9eae00fa4 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 @@ -5981,6 +5981,8 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC) real :: sigmaqt, qcn, cfn, qsatn, dqlls, dqils, qt + type(ESMF_Info) :: infoh + ! MATMAT CUDA Variables #ifdef _CUDA type(dim3) :: Grid, Block @@ -6821,10 +6823,13 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC) ! Get items friendly status (default is not friendly) !----------------------------------------------------- - call ESMF_AttributeGet (FIELD, NAME="FriendlyToMOIST",isPresent=isPresent, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToMOIST",isPresent=isPresent, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + isPresent = ESMF_InfoIsPresent(infoh,'FriendlyToMOIST',RC=STATUS) VERIFY_(STATUS) if(isPresent) then - call ESMF_AttributeGet (FIELD, NAME="FriendlyToMOIST",VALUE=IS_FRIENDLY(K), RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToMOIST",VALUE=IS_FRIENDLY(K), RC=STATUS) + call ESMF_InfoGet(infoh,key='FriendlyToMOIST',value=IS_FRIENDLY(K),RC=STATUS) VERIFY_(STATUS) else IS_FRIENDLY(K) = .false. diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 index 5e58aa4dc..a579e29e2 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 @@ -3148,6 +3148,7 @@ subroutine DIFFUSE(IM,JM,LM,RC) real, dimension(:,:), pointer :: SG, SF, SDF, CX, SRG real, dimension(:,:,:), pointer :: DX real, dimension(:,:,:), pointer :: AK, BK, CK + type(ESMF_Info) :: infoh integer :: KM, K,L logical :: FRIENDLY @@ -3226,8 +3227,10 @@ subroutine DIFFUSE(IM,JM,LM,RC) ! Get item's friendly status (default is not friendly) !----------------------------------------------------- - call ESMF_AttributeGet(FIELD, NAME="FriendlyToTURBULENCE", & - VALUE=FRIENDLY, DEFAULTVALUE=dflt_false, RC=STATUS) +! call ESMF_AttributeGet(FIELD, NAME="FriendlyToTURBULENCE", & +! VALUE=FRIENDLY, DEFAULTVALUE=dflt_false, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,key='FriendlyToTURBULENCE',value=FRIENDLY,default=dflt_false,RC=STATUS) VERIFY_(STATUS) ! Get item's weighting (default is unweighted tendencies) @@ -3526,6 +3529,7 @@ subroutine UPDATE(IM,JM,LM,LATS,RC) real :: SHVC_ALPHA, SHVC_EFFECT, scaling logical :: DO_SHVC integer :: KS + type(ESMF_Info) :: infoh character(len=ESMF_MAXSTR) :: GRIDNAME character(len=4) :: imchar @@ -3796,8 +3800,10 @@ subroutine UPDATE(IM,JM,LM,LATS,RC) ! Get item's friendly status (default is not friendly) !----------------------------------------------------- - call ESMF_AttributeGet(FIELD, NAME="FriendlyToTURBULENCE", & - VALUE=Friendly, DEFAULTVALUE=dflt_false, RC=STATUS) +! call ESMF_AttributeGet(FIELD, NAME="FriendlyToTURBULENCE", & +! VALUE=Friendly, DEFAULTVALUE=dflt_false, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,key='FriendlyToTURBULENCE',value=Friendly,default=dflt_false,RC=STATUS) VERIFY_(STATUS) ! Get item's weighting (default is unweighted tendencies) diff --git a/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 b/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 index 26c76cf94..6794b6761 100644 --- a/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 @@ -1242,6 +1242,8 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) real, dimension(4) :: VC + type(ESMF_Info) :: infoh + INTEGER :: NT, NLEVEL,I,J,VERTADV, useana, advscheme LOGICAL :: USE_ASCII_DATA, AT_START, CFMIP, CFMIP2, isPresent @@ -1449,9 +1451,12 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) ! Get item's friendly status (default is not friendly) !----------------------------------------------------- - call ESMF_AttributeGet (FIELD, NAME="FriendlyToDYNAMICS",isPresent=isPresent, __RC__) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToDYNAMICS",isPresent=isPresent, __RC__) + call ESMF_InfoGetFromHost(FIELD,infoh,__RC__) + isPresent = ESMF_InfoIsPresent(infoh,'FriendlyToDYNAMICS',__RC__) if(isPresent) then - call ESMF_AttributeGet (FIELD, NAME="FriendlyToDYNAMICS",VALUE=FRIENDLY, __RC__) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToDYNAMICS",VALUE=FRIENDLY, __RC__) + call ESMF_InfoGet(infoh,'FriendlyToDYNAMICS',FRIENDLY,__RC__) else FRIENDLY = .false. end if diff --git a/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 b/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 index 1a8ae5d4a..bbda9af99 100644 --- a/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 +++ b/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 @@ -1542,6 +1542,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) integer :: PHASE integer :: PHASE_ integer, allocatable :: CHLD(:) + type(ESMF_Info) :: infoh !============================================================================= @@ -1663,19 +1664,25 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'TI', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'SI', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'HI', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') @@ -1683,43 +1690,57 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'FRACICE', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'VOLICE', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'VOLSNO', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'ERGICE', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'ERGSNO', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'TAUAGE', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') call ESMF_StateGet (IMPORT, 'MPOND', FIELD, RC=STATUS) VERIFY_(STATUS) - call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) +! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) + call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) + call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) _ASSERT(FRIENDLY,'needs informative message') end if From ccf84b1af5e708fd315467f8f24f9cf6821b810d Mon Sep 17 00:00:00 2001 From: Gian Villamil-Otero Date: Thu, 21 Oct 2021 13:22:10 -0400 Subject: [PATCH 2/3] Removes comments --- .../GEOSmoist_GridComp/GEOS_MoistGridComp.F90 | 2 -- .../GEOS_TurbulenceGridComp.F90 | 4 ---- .../GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 | 2 -- GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 | 10 ---------- 4 files changed, 18 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 index 9eae00fa4..28c5c9803 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 @@ -6823,12 +6823,10 @@ subroutine MOIST_DRIVER(IM,JM,LM, RC) ! Get items friendly status (default is not friendly) !----------------------------------------------------- -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToMOIST",isPresent=isPresent, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) isPresent = ESMF_InfoIsPresent(infoh,'FriendlyToMOIST',RC=STATUS) VERIFY_(STATUS) if(isPresent) then -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToMOIST",VALUE=IS_FRIENDLY(K), RC=STATUS) call ESMF_InfoGet(infoh,key='FriendlyToMOIST',value=IS_FRIENDLY(K),RC=STATUS) VERIFY_(STATUS) else diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 index a579e29e2..0a5fd480c 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSturbulence_GridComp/GEOS_TurbulenceGridComp.F90 @@ -3227,8 +3227,6 @@ subroutine DIFFUSE(IM,JM,LM,RC) ! Get item's friendly status (default is not friendly) !----------------------------------------------------- -! call ESMF_AttributeGet(FIELD, NAME="FriendlyToTURBULENCE", & -! VALUE=FRIENDLY, DEFAULTVALUE=dflt_false, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,key='FriendlyToTURBULENCE',value=FRIENDLY,default=dflt_false,RC=STATUS) VERIFY_(STATUS) @@ -3800,8 +3798,6 @@ subroutine UPDATE(IM,JM,LM,LATS,RC) ! Get item's friendly status (default is not friendly) !----------------------------------------------------- -! call ESMF_AttributeGet(FIELD, NAME="FriendlyToTURBULENCE", & -! VALUE=Friendly, DEFAULTVALUE=dflt_false, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,key='FriendlyToTURBULENCE',value=Friendly,default=dflt_false,RC=STATUS) VERIFY_(STATUS) diff --git a/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 b/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 index 6794b6761..64c20ede5 100644 --- a/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 +++ b/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/GEOSdatmodyn_GridComp/GEOS_DatmoDynGridComp.F90 @@ -1451,11 +1451,9 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) ! Get item's friendly status (default is not friendly) !----------------------------------------------------- -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToDYNAMICS",isPresent=isPresent, __RC__) call ESMF_InfoGetFromHost(FIELD,infoh,__RC__) isPresent = ESMF_InfoIsPresent(infoh,'FriendlyToDYNAMICS',__RC__) if(isPresent) then -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToDYNAMICS",VALUE=FRIENDLY, __RC__) call ESMF_InfoGet(infoh,'FriendlyToDYNAMICS',FRIENDLY,__RC__) else FRIENDLY = .false. diff --git a/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 b/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 index bbda9af99..64f8e793b 100644 --- a/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 +++ b/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 @@ -1664,7 +1664,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'TI', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1672,7 +1671,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'SI', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1680,7 +1678,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'HI', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1690,7 +1687,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'FRACICE', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1698,7 +1694,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'VOLICE', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1706,7 +1701,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'VOLSNO', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1714,7 +1708,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'ERGICE', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1722,7 +1715,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'ERGSNO', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1730,7 +1722,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'TAUAGE', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) @@ -1738,7 +1729,6 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC ) call ESMF_StateGet (IMPORT, 'MPOND', FIELD, RC=STATUS) VERIFY_(STATUS) -! call ESMF_AttributeGet (FIELD, NAME="FriendlyToSEAICE", VALUE=FRIENDLY, RC=STATUS) call ESMF_InfoGetFromHost(FIELD,infoh,RC=STATUS) call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS) VERIFY_(STATUS) From f874274e7a9e7bfef44d5fd8f985e8a87830d721 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 25 Feb 2022 12:23:59 -0500 Subject: [PATCH 3/3] Update circleci for mapl3 --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce182cb53..3a13fbe8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,6 +23,8 @@ jobs: working_directory: /root/project steps: - circleci-tools/checkout_fixture + - circleci-tools/checkout_branch_on_fixture + branch: release/MAPL-v3 - circleci-tools/mepoclone - circleci-tools/mepodevelop - circleci-tools/checkout_if_exists