[Dart-dev] DART/branches Revision: 12871

[dart at ucar.edu]

bdobbins at ucar.edu
2018-10-01 17:00:58 -0600 (Mon, 01 Oct 2018)
305
Current check in of OMP version - has a race condition still trying to figure out, and because of this, it's currently set up for gfortran, not ifort.
Has LOTS of little hacks and debug statements to try to track this down.  Not production ready.
(Hopefully this will be updated and fixed for good soon.)



Modified: DART/branches/graph_coloring/GPTL.ch_openmpi/Makefile
===================================================================
--- DART/branches/graph_coloring/GPTL.ch_openmpi/Makefile	2018-10-01 22:21:46 UTC (rev 12870)
+++ DART/branches/graph_coloring/GPTL.ch_openmpi/Makefile	2018-10-01 23:00:58 UTC (rev 12871)
@@ -41,9 +41,9 @@
   MPICC   := $(SCC)
   INCLDIR += -I$(EXEROOT)/mct/mpi-serial
 else
-  CC := $(MPICC)
-  FC := $(MPIFC)
-  CPPDEFS += -DHAVE_MPI -DFORTRANUNDERSCORE 
+  CC := $(MPICC) -qopenmp
+  FC := $(MPIFC) -qopenmp
+  CPPDEFS += -DHAVE_MPI -DFORTRANUNDERSCORE  -DHAVE_NANOTIME -DBIT64
 endif
 ifdef CPRE
   FPPDEFS := $(patsubst -D%,$(CPRE)%,$(CPPDEFS)) 

Modified: DART/branches/graph_coloring/GPTL.ch_openmpi/perf_mod.F90
===================================================================
--- DART/branches/graph_coloring/GPTL.ch_openmpi/perf_mod.F90	2018-10-01 22:21:46 UTC (rev 12870)
+++ DART/branches/graph_coloring/GPTL.ch_openmpi/perf_mod.F90	2018-10-01 23:00:58 UTC (rev 12871)
@@ -108,7 +108,7 @@
    integer, private   :: cur_timing_detail = init_timing_detail
                          ! current timing detail level
 
-   logical, parameter :: def_perf_single_file = .true.         ! default
+   logical, parameter :: def_perf_single_file = .false.         ! default
    logical, private   :: perf_single_file = def_perf_single_file
                          ! flag indicating whether the performance timer
                          ! output should be written to a single file 
@@ -115,7 +115,7 @@
                          ! (per component communicator) or to a 
                          ! separate file for each process
 
-   integer, parameter :: def_perf_outpe_num = -1                ! default
+   integer, parameter :: def_perf_outpe_num = 0                ! default
    integer, private   :: perf_outpe_num = def_perf_outpe_num
                          ! maximum number of processes writing out 
                          ! timing data (for this component communicator)

Modified: DART/branches/graph_coloring/assimilation_code/location/threed_sphere/location_mod.f90
===================================================================
--- DART/branches/graph_coloring/assimilation_code/location/threed_sphere/location_mod.f90	2018-10-01 22:21:46 UTC (rev 12870)
+++ DART/branches/graph_coloring/assimilation_code/location/threed_sphere/location_mod.f90	2018-10-01 23:00:58 UTC (rev 12871)
@@ -74,6 +74,7 @@
 
 type location_type
    !private
+   ! made public by bpd6 for debugging
    real(r8) :: lon, lat        ! lon, lat are stored in radians
    real(r8) :: vloc            ! units vary based on value of which_vert
    integer  :: which_vert      ! determines if vert is level, height, pressure, ...
@@ -253,6 +254,7 @@
 
 integer :: iunit, io, i, k, typecount, type_index
 
+write(*,*) "INITIALIZE_MODULE()..."
 
 if (module_initialized) return
 
@@ -1172,6 +1174,8 @@
 integer :: typecount, distcount
 real(r8), allocatable :: distlist(:)
 
+write(*,*) "GET_CLOSE_INIT() ..."
+
 if ( .not. module_initialized ) call initialize_module()
 
 ! Support per-loc-type localization more efficiently.
@@ -1583,6 +1587,12 @@
             ! SHOULD ADD IN OPTIONAL ARGUMENT FOR DOING THIS!!!
             ! Could avoid adding any that have nums lower than base_ob???
             t_ind = gc%gtt(bt)%loc_box(st - 1 + k)
+
+            ! debug by bpd6
+            if (t_ind > 10000000) then
+              write(*,*) "t_ind error: ", bt, st, k
+            endif
+
             !write(*,*) "n_in_box = ", n_in_box, i, j, t_ind
 
             if(.not. present(dist)) then

Modified: DART/branches/graph_coloring/assimilation_code/modules/assimilation/assim_graph_tools_mod.f90
===================================================================
--- DART/branches/graph_coloring/assimilation_code/modules/assimilation/assim_graph_tools_mod.f90	2018-10-01 22:21:46 UTC (rev 12870)
+++ DART/branches/graph_coloring/assimilation_code/modules/assimilation/assim_graph_tools_mod.f90	2018-10-01 23:00:58 UTC (rev 12871)
@@ -5,7 +5,7 @@
 ! $Id: assim_tools_mod.f90 11799 2017-07-07 21:08:09Z nancy at ucar.edu $
 
 !>  A variety of operations required by assimilation.
-module assim_tools_mod
+module assim_graph_tools_mod
 
 !> \defgroup assim_tools assim_tools_mod
 !> 
@@ -131,7 +131,7 @@
 !   integer, dimension(:), allocatable :: owner       ! Rank that owns this observation (computed from data)
 end type colors_type