Merge pull request #27 from marshallward/cpu_clock_sync_bugfix

Bugfix: cpu clock sync error
NOAA-GFDL · Dec 13, 2021 · 7ae28b8 · 7ae28b8
2 parents 86b91dc + e452a29
commit 7ae28b8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/config_src/infra/FMS1/MOM_cpu_clock_infra.F90 b/config_src/infra/FMS1/MOM_cpu_clock_infra.F90
@@ -85,8 +85,13 @@ integer function cpu_clock_id(name, sync, grain)
   integer :: clock_flags
 
   clock_flags = clock_flag_default
-  if (present(sync)) &
-    clock_flags = ibset(clock_flags, 0)
+  if (present(sync)) then
+    if (sync) then
+      clock_flags = ibset(clock_flags, 0)
+    else
+      clock_flags = ibclr(clock_flags, 0)
+    endif
+  endif
 
   cpu_clock_id = mpp_clock_id(name, flags=clock_flags, grain=grain)
 end function cpu_clock_id

diff --git a/config_src/infra/FMS2/MOM_cpu_clock_infra.F90 b/config_src/infra/FMS2/MOM_cpu_clock_infra.F90
@@ -85,8 +85,13 @@ integer function cpu_clock_id(name, sync, grain)
   integer :: clock_flags
 
   clock_flags = clock_flag_default
-  if (present(sync)) &
-    clock_flags = ibset(clock_flags, 0)
+  if (present(sync)) then
+    if (sync) then
+      clock_flags = ibset(clock_flags, 0)
+    else
+      clock_flags = ibclr(clock_flags, 0)
+    endif
+  endif
 
   cpu_clock_id = mpp_clock_id(name, flags=clock_flags, grain=grain)
 end function cpu_clock_id