Merge branch 'release/MAPL-v3' into develop

GEOS-ESM · Mar 23, 2022 · f0ac925 · f0ac925
2 parents ba7135a + 9aed2fa
commit f0ac925
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 18 deletions.
diff --git 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

diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
@@ -6317,6 +6317,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
@@ -7223,10 +7225,11 @@ 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
             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
@@ -4888,6 +4888,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
 
     real, dimension(:,:,:), allocatable :: U, V, H, QV, QLLS, QLCN, ZLO, QL 
 
@@ -4995,8 +4996,8 @@ 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)
 
 ! Get item's weighting (default is unweighted tendencies)
@@ -5362,6 +5363,7 @@ subroutine UPDATE(IM,JM,LM,LATS,RC)
       real                                :: SHVC_ALPHA, SHVC_EFFECT, scaling
       logical                             :: DO_SHVC
       integer                             :: KS
+      type(ESMF_Info) :: infoh
 
       ! For idealized SCM surface layer
       integer :: SCM_SL
@@ -5652,8 +5654,8 @@ 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)
 
 ! 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
@@ -1277,6 +1277,8 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
 
       real, dimension(4) :: VC 
 
+      type(ESMF_Info) :: infoh
+
       INTEGER :: NT, NLEVEL,I,J,VERTADV, useana, advscheme
       real :: zrel,zrelp,qfloor       
 
@@ -1500,9 +1502,10 @@ 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.
          end if

diff --git a/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 b/GEOSogcm_GridComp/GEOS_OgcmGridComp.F90
@@ -1563,6 +1563,7 @@ subroutine RUN ( GC, IMPORT, EXPORT, CLOCK, RC )
     integer :: PHASE
     integer :: PHASE_
     integer, allocatable :: CHLD(:)
+    type(ESMF_Info) :: infoh
 
 !=============================================================================
 
@@ -1684,63 +1685,73 @@ 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)
     _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_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_InfoGetFromHost(FIELD,infoh,RC=STATUS)
+    call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS)
     VERIFY_(STATUS)
     _ASSERT(FRIENDLY,'needs informative message')
 
     if(DO_CICE_THERMO/=0) then
        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)
        _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_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_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_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_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_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_InfoGetFromHost(FIELD,infoh,RC=STATUS)
+       call ESMF_InfoGet(infoh,'FriendlyToSEAICE',FRIENDLY,RC=STATUS)
        VERIFY_(STATUS)
        _ASSERT(FRIENDLY,'needs informative message')
     end if