Merge branch 'regrid_profile' into develop

Author: oehmke

src/Infrastructure/Field/src/ESMF_FieldRegrid.F90

@@ -347,11 +347,74 @@ subroutine ESMF_FieldRegridRelease(routehandle, keywordEnforcer, &
     end subroutine ESMF_FieldRegridRelease
 !------------------------------------------------------------------------------
 
+#undef  ESMF_METHOD
+#define ESMF_METHOD "fillProfileStr"    
+    subroutine fillProfileStr(srcField, dstField, regridmethod, profileStr, rc)
+      type(ESMF_Field),               intent(in)              :: srcField
+      type(ESMF_Field),               intent(inout)           :: dstField
+      type(ESMF_RegridMethod_Flag),   intent(in),optional     :: regridmethod
+      character (len=*),              intent(out)             :: profileStr
+      integer,                        intent(out),   optional :: rc
 
+      integer :: localrc
+      character (len=ESMF_MAXSTR) :: tmpStr 
 
+      
+      ! Set string
+      profileStr="ESMF_FieldRegridStore("
 
-#ifndef FRS_OLDWAY
+      ! Get srcField name
+      call ESMF_FieldGet(srcField, name=tmpStr, rc=localrc)
+      if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
+           ESMF_CONTEXT, rcToReturn=rc)) return                 
 
+      ! Add to profileStr
+      profileStr=trim(profileStr)//"src="//trim(tmpStr)
+
+      
+      ! Get dstField name
+      call ESMF_FieldGet(dstField, name=tmpStr, rc=localrc)
+      if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
+           ESMF_CONTEXT, rcToReturn=rc)) return                 
+
+      ! Add to profileStr
+      profileStr=trim(profileStr)//" dst="//trim(tmpStr)
+
+      ! Get method name
+      if (present(regridmethod)) then
+         if (regridMethod == ESMF_REGRIDMETHOD_BILINEAR) then
+            tmpStr="bilinear"
+         else if (regridMethod == ESMF_REGRIDMETHOD_CONSERVE) then
+            tmpStr="conserve"
+         else if (regridMethod == ESMF_REGRIDMETHOD_CONSERVE_2ND) then
+            tmpStr="conserve2nd"
+         else if (regridMethod == ESMF_REGRIDMETHOD_PATCH) then
+            tmpStr="patch"
+         else if (regridMethod == ESMF_REGRIDMETHOD_NEAREST_STOD) then
+            tmpStr="neareststod"
+         else if (regridMethod == ESMF_REGRIDMETHOD_NEAREST_DTOS) then
+            tmpStr="nearestdtos"
+         else
+            tmpStr="unknown"
+         endif
+      else
+         tmpStr="bilinear" ! Default to bilinear if not present
+      endif
+         
+      ! Add to profileStr
+      profileStr=trim(profileStr)//" method="//trim(tmpStr)         
+      
+      ! end it
+      profileStr=trim(profileStr)//")"
+ 
+      ! Return success !
+      if(present(rc)) rc = ESMF_SUCCESS      
+      
+    end subroutine fillProfileStr
+
+
+     
+#ifndef FRS_OLDWAY
 
 !------------------------------------------------------------------------------
 #undef  ESMF_METHOD
@@ -739,17 +802,31 @@ subroutine ESMF_FieldRegridStoreNX(srcField, dstField, keywordEnforcer, &
         real(ESMF_KIND_R8),          pointer :: tmp_weights(:)
         real(ESMF_KIND_R8) :: beg_time, end_time
         logical :: addOrigCoordsToPointList
-                  
+        character (len=ESMF_MAXSTR) :: profileStr="<Not Set>"
+        
         ! Debug Timing stuff
         ! call ESMF_VMWtime(beg_time)
         ! ESMF_METHOD_ENTER(localrc)
 
-
         ! Initialize return code; assume failure until success is certain
         localrc = ESMF_SUCCESS
         if (present(rc)) rc = ESMF_RC_NOT_IMPL
 
 
+        ! Profiling
+        if (ESMF_TraceGetProfileTypeInfo(ESMF_PROFILETYPE_REGRID) > 0) then
+           ! Fill profile string
+           call fillProfileStr(srcField, dstField, regridMethod, profileStr, localrc)
+           if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
+                ESMF_CONTEXT, rcToReturn=rc)) return 
+
+           ! Start profile region
+           call ESMF_TraceRegionEnter(profileStr, localrc)
+           if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
+                ESMF_CONTEXT, rcToReturn=rc)) return                 
+        endif
+
+        
 
         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         !!!! Warnings for deprecated arguments !!!!
@@ -1344,6 +1421,14 @@ subroutine ESMF_FieldRegridStoreNX(srcField, dstField, keywordEnforcer, &
                 ESMF_CONTEXT, rcToReturn=rc)) return
         endif
 
+
+        ! Profiling
+        if (ESMF_TraceGetProfileTypeInfo(ESMF_PROFILETYPE_REGRID) > 0) then
+           call ESMF_TraceRegionExit(profileStr, localrc)
+           if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU, &
+                ESMF_CONTEXT, rcToReturn=rc)) return                 
+        endif
+
 
         !!!!!!!!!!!!!!!!!!
         ! Return success !

src/Infrastructure/Mesh/src/ESMCI_Mesh_Regrid_Glue.C

@@ -26,6 +26,7 @@
 #include "ESMCI_Array.h"
 
 #include "ESMCI_TraceMacros.h"  // for profiling
+#include "ESMCI_TraceRegion.h"  // for profiling
 
 #include "Mesh/include/ESMCI_Mesh.h"
 #include "Mesh/include/Legacy/ESMCI_MeshRead.h"
@@ -82,8 +83,6 @@ void CpMeshDataToArray(Grid &grid, int staggerLoc, ESMCI::Mesh &mesh, ESMCI::Arr
 void CpMeshElemDataToArray(Grid &grid, int staggerloc, ESMCI::Mesh &mesh, ESMCI::Array &array, MEField<> *dataToArray);
 void PutElemAreaIntoArray(Grid &grid, int staggerLoc, ESMCI::Mesh &mesh, ESMCI::Array &array);
 
-
-
 void ESMCI_regrid_create(
                      Mesh **meshsrcpp, ESMCI::Array **arraysrcpp, ESMCI::PointList **plsrcpp,
                      Mesh **meshdstpp, ESMCI::Array **arraydstpp, ESMCI::PointList **pldstpp,
@@ -110,7 +109,11 @@ void ESMCI_regrid_create(
 #define ESMC_METHOD "ESMCI_regrid_create()"
   Trace __trace(" FTN_X(regrid_test)(ESMCI::Grid **gridsrcpp, ESMCI::Grid **griddstcpp, int*rc");
 
+  // Declare local return code
+  int localrc;
 
+  
+  // Dereference input variables
   ESMCI::Array &srcarray = **arraysrcpp;
   ESMCI::Array &dstarray = **arraydstpp;
 
@@ -123,6 +126,7 @@ void ESMCI_regrid_create(
   int has_statusArray=*_has_statusArray;
   ESMCI::Array *statusArray=*_statusArray;
 
+  
 #define PROGRESSLOG_off
 #define MEMLOG_off
 
@@ -136,9 +140,6 @@ void ESMCI_regrid_create(
 
   try {
 
-    // Declare local return code
-    int localrc;
-
     // Initialize the parallel environment for mesh
     ESMCI::Par::Init("MESHLOG", false, VM::getCurrent(&localrc)->getMpi_c());
     if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;  // bail out with exception
@@ -317,10 +318,11 @@ void ESMCI_regrid_create(
     }
 
 
-
-
-
-
+    // Enter profile around weight generation
+    if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 1) {
+      ESMCI::TraceEventRegionEnter("Weight generation", &localrc);
+      if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+    }
 
 #ifdef PROGRESSLOG_on
     ESMC_LogDefault.Write("c_esmc_regrid_create(): Entering weight generation.", ESMC_LOGMSG_INFO);
@@ -384,6 +386,12 @@ void ESMCI_regrid_create(
       }
     }
 
+    // Exit profile around weight generation
+    if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 1) {
+      ESMCI::TraceEventRegionExit("Weight generation", &localrc);
+      if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+    }
+    
     ESMCI_REGRID_TRACE_EXIT("NativeMesh Weight Generation");
 
 #ifdef PROGRESSLOG_on
@@ -625,7 +633,13 @@ void ESMCI_regrid_create(
 
     // Build the RouteHandle using ArraySMMStore() 
     if (*has_rh) {
-      
+
+      // Enter profile around routehandle creation
+      if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 1) {
+        ESMCI::TraceEventRegionEnter("RouteHandle creation", &localrc);
+        if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+      }
+
       // Set some flags
       enum ESMC_TypeKind_Flag tk = ESMC_TYPEKIND_R8;
       ESMC_Logical ignoreUnmatched = ESMF_FALSE;
@@ -641,6 +655,13 @@ void ESMCI_regrid_create(
             pipelineDepth, &localrc);
       if (ESMC_LogDefault.MsgFoundError(localrc, ESMCI_ERR_PASSTHRU,
         ESMC_CONTEXT, NULL)) throw localrc;  // bail out with exception
+
+
+      // Exit profile around routehandle creation
+      if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 1) {
+        ESMCI::TraceEventRegionExit("RouteHandle creation", &localrc);
+        if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+      }
     }
 
     ESMCI_REGRID_TRACE_EXIT("NativeMesh ArraySMMStore");
@@ -663,6 +684,12 @@ void ESMCI_regrid_create(
 
       ESMCI_REGRID_TRACE_ENTER("NativeMesh Transpose ArraySMMStore");
 
+      // Enter profile around routehandle creation
+      if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 1) {
+        ESMCI::TraceEventRegionEnter("Transpose RouteHandle creation", &localrc);
+        if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+      }
+
       // Allocate transpose matrix
       int *transpose_iientries = new int[iientries_entry_size*num_entries];
 
@@ -722,6 +749,12 @@ void ESMCI_regrid_create(
       // Get rid of transposed factor index list
       delete [] transpose_iientries;
 
+      // Exit profile around routehandle creation
+      if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 1) {
+        ESMCI::TraceEventRegionExit("Transpose RouteHandle creation", &localrc);
+        if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+      }
+
       ESMCI_REGRID_TRACE_EXIT("NativeMesh Transpose ArraySMMStore");
 
 #ifdef PROGRESSLOG_on
@@ -815,11 +848,11 @@ void ESMCI_regrid_create(
   ESMC_LogDefault.Write("c_esmc_regrid_create(): Final return.", ESMC_LOGMSG_INFO);
 #endif
 
+  
   // Set return code
   if (rc!=NULL) *rc = ESMF_SUCCESS;
 }
 
-
 void ESMCI_regrid_getiwts(Grid **gridpp,
                    Mesh **meshpp, ESMCI::Array **arraypp, int *staggerLoc,
                    int *rc) {

src/Infrastructure/Mesh/src/Regridding/ESMCI_Extrap.C

@@ -14,6 +14,8 @@
 #include <Mesh/include/Legacy/ESMCI_MeshRead.h>
 #include <Mesh/include/Regridding/ESMCI_Interp.h>
 #include <Mesh/include/Regridding/ESMCI_CreepFill.h>
+#include "ESMCI_TraceRegion.h"
+
 
 //-----------------------------------------------------------------------------
  // leave the following line as-is; it will insert the cvs ident string
@@ -1021,9 +1023,20 @@ template void _merge_dst_to_dst_wts_into_src_to_dst_wts(PointList &dst, WMat &dt
               int extrapNumLevels,
               int extrapNumInputLevels, 
               bool set_dst_status, WMat &dst_status) {
-
+#undef  ESMC_METHOD
+#define ESMC_METHOD "extrap()"
+    
    //   printf("BOB: in extrap() extrapMethod=%d\n",extrapMethod);
 
+    // Declare local return code
+    int localrc;
+    
+    // Enter profile for extrap
+    if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 2) {
+      ESMCI::TraceEventRegionEnter("Extrapolation", &localrc);
+      if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+    }
+    
     // Branch to each type of extrapolation
     if (extrapMethod == ESMC_EXTRAPMETHOD_NONE) {
 
@@ -1082,6 +1095,12 @@ template void _merge_dst_to_dst_wts_into_src_to_dst_wts(PointList &dst, WMat &dt
       Throw() << " Unrecognized extrapolation method.";
     }
 
+    // Exit profile for extrap
+    if (TraceGetProfileTypeInfo(ESMC_PROFILETYPE_REGRID) > 2) {
+      ESMCI::TraceEventRegionExit("Extrapolation", &localrc);
+      if (ESMC_LogDefault.MsgFoundError(localrc,ESMCI_ERR_PASSTHRU,ESMC_CONTEXT,NULL)) throw localrc;
+    }
+    
   }