Merge pull request #2976 from jedwards4b/nuopc-cmeps

Nuopc cmeps

Bringing the latest nuopc development to master

Test suite: scripts_regression_tests.py
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes

User interface changes?:

Update gh-pages html (Y/N)?:

Code review:

share/timing/GPTLprint_memusage.c

@@ -84,7 +84,7 @@ int GPTLprint_memusage (const char *str)
   }
 
   if (bytesperblock > 0)
-    printf ("%s size=%.1f MB rss=%.1f MB share=%.1f MB text=%.1f MB datastack=%.1f MB\n",
+    printf ("%s size=%.1f MB rss=%.4f MB share=%.1f MB text=%.1f MB datastack=%.1f MB\n",
 	    str, size*blockstomb, rss*blockstomb, share*blockstomb,
 	    text*blockstomb, datastack*blockstomb);
   else

share/timing/perf_mod.F90

@@ -734,10 +734,10 @@ subroutine t_startf(event, handle)
    if ((perf_add_detail) .AND. (cur_timing_detail < 100)) then
       write(cdetail,'(i2.2)') cur_timing_detail
       str_length = min(SHR_KIND_CM-3,len_trim(event))
-      ierr = GPTLstart(event(1:str_length)//'_'//cdetail)
+      TIMERSTART(event(1:str_length)//'_'//cdetail)
    else
       str_length = min(SHR_KIND_CM,len_trim(event))
-      ierr = GPTLstart(event(1:str_length))
+      TIMERSTART(event(1:str_length))
    endif
 !$OMP MASTER
    if (perf_ovhd_measurement) then
@@ -797,16 +797,16 @@ subroutine t_stopf(event, handle)
 !$OMP END MASTER
 #ifdef NUOPC_INTERFACE
    cur_timing_depth = cur_timing_depth - 1
-   if(cur_timing_depth > timer_depth_limit) return
+   if(cur_timing_depth >= timer_depth_limit) return
 #endif
 
    if ((perf_add_detail) .AND. (cur_timing_detail < 100)) then
       write(cdetail,'(i2.2)') cur_timing_detail
       str_length = min(SHR_KIND_CM-3,len_trim(event))
-      ierr = GPTLstop(event(1:str_length)//'_'//cdetail)
+      TIMERSTOP(event(1:str_length)//'_'//cdetail)
    else
       str_length = min(SHR_KIND_CM,len_trim(event))
-      ierr = GPTLstop(event(1:str_length))
+      TIMERSTOP(event(1:str_length))
    endif
 
 !$OMP MASTER