[Dart-dev] DART/branches Revision: 11961

[dart at ucar.edu]

thoar at ucar.edu
2017-09-29 15:55:09 -0600 (Fri, 29 Sep 2017)
498
Just preserving a version that seems to work on eddy with 
pgf90 12.4-0 64-bit target on x86-64 Linux -tp sandybridge
H5_PACKAGE_VERSION "1.8.15-patch1"

This same version CRASHES with gfortran on my Mac, and on cheyenne with

Currently Loaded Modules:
  1) ncarenv/1.1           4) mpt/2.15f        7) matlab/R2016b  10) python/2.7.13
  2) intel/16.0.3          5) netcdf/4.4.1.1   8) nco/4.6.9      11) xxdiff/4.0.1
  3) ncarcompilers/0.4.1   6) git/2.10.2       9) ncview/2.1.7   12) ncl/6.4.0




Modified: DART/branches/coamps/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-09-29 16:58:57 UTC (rev 11960)
+++ DART/branches/coamps/assimilation_code/modules/assimilation/assim_tools_mod.f90	2017-09-29 21:55:09 UTC (rev 11961)
@@ -139,7 +139,7 @@
 logical  :: sort_obs_inc                    = .false.
 logical  :: spread_restoration              = .false.
 logical  :: sampling_error_correction       = .false.
-integer  :: adaptive_localization_threshold = -1
+integer(i8) :: adaptive_localization_threshold = -1
 real(r8) :: adaptive_cutoff_floor           = 0.0_r8
 integer  :: print_every_nth_obs             = 0
 

Modified: DART/branches/coamps/build_templates/mkmf.template.pgi.linux
===================================================================
--- DART/branches/coamps/build_templates/mkmf.template.pgi.linux	2017-09-29 16:58:57 UTC (rev 11960)
+++ DART/branches/coamps/build_templates/mkmf.template.pgi.linux	2017-09-29 21:55:09 UTC (rev 11961)
@@ -71,13 +71,21 @@
 #
 # NETCDF = /opt/local
 
-INCS = -I$(NETCDF)/include
-LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
+# same thing is true for your HDF5 environment variable.
+# Pick one that works with the netCDF installation you have.
+
+HDF5 = /auto/soft/hdf5/CentOS_6_pgi
+
+INCS = -I$(NETCDF)/include -I$(HDF5)/include
+LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf -lhdf5hl_fortran -lhdf5_fortran
+
 FFLAGS  = -O $(INCS)
 LDFLAGS = $(FFLAGS) $(LIBS)
 
 # for development or debugging, use this for flags:
-#FFLAGS = -g -C -Ktrap=fp -pc 64 $(INCS)
+FFLAGS = -g -gopt -Mbounds -Mchkfpstk -Mchkptr -Mchkstk -Mpgicoff  \
+        -Mdclchk -Meh_frame -traceback -Minform=inform \
+        -Mflushz -Ktrap=fp -pc 64 $(INCS)
 
 # <next few lines under version control, do not edit>
 # $URL$

Modified: DART/branches/coamps/models/coamps_nest/work/mkmf_advance_time
===================================================================
--- DART/branches/coamps/models/coamps_nest/work/mkmf_advance_time	2017-09-29 16:58:57 UTC (rev 11960)
+++ DART/branches/coamps/models/coamps_nest/work/mkmf_advance_time	2017-09-29 21:55:09 UTC (rev 11961)
@@ -7,7 +7,7 @@
 # DART $Id$
 
 ../../../build_templates/mkmf -p advance_time -t ../../../build_templates/mkmf.template \
- -a "../../.." path_names_advance_time
+ -c"-DHDF5" -a "../../.." path_names_advance_time
 
 exit $status
 

Modified: DART/branches/coamps/models/coamps_nest/work/mkmf_coamps_to_dart
===================================================================
--- DART/branches/coamps/models/coamps_nest/work/mkmf_coamps_to_dart	2017-09-29 16:58:57 UTC (rev 11960)
+++ DART/branches/coamps/models/coamps_nest/work/mkmf_coamps_to_dart	2017-09-29 21:55:09 UTC (rev 11961)
@@ -4,10 +4,10 @@
 # by UCAR, "as is", without charge, subject to all terms of use at
 # http://www.image.ucar.edu/DAReS/DART/DART_download
 #
-# $Id$
+# DART $Id$
 
 ../../../build_templates/mkmf -p trans_coamps_to_dart -t ../../../build_templates/mkmf.template \
- -a "../../.." path_names_coamps_to_dart
+ -c"-DHDF5" -a "../../.." path_names_coamps_to_dart
 
 exit $status
 

Modified: DART/branches/coamps/models/coamps_nest/work/mkmf_create_fixed_network_seq
===================================================================
--- DART/branches/coamps/models/coamps_nest/work/mkmf_create_fixed_network_seq	2017-09-29 16:58:57 UTC (rev 11960)
+++ DART/branches/coamps/models/coamps_nest/work/mkmf_create_fixed_network_seq	2017-09-29 21:55:09 UTC (rev 11961)
@@ -7,7 +7,7 @@
 # DART $Id$
 
 ../../../build_templates/mkmf -p create_fixed_network_seq -t ../../../build_templates/mkmf.template \
- -a "../../.." path_names_create_fixed_network_seq
+ -c"-DHDF5" -a "../../.." path_names_create_fixed_network_seq
 
 exit $status
 

Modified: DART/branches/coamps/models/coamps_nest/work/mkmf_create_increment
===================================================================
--- DART/branches/coamps/models/coamps_nest/work/mkmf_create_increment	2017-09-29 16:58:57 UTC (rev 11960)
+++ DART/branches/coamps/models/coamps_nest/work/mkmf_create_increment	2017-09-29 21:55:09 UTC (rev 11961)
@@ -53,7 +53,7 @@
 rm -f ${path_name}.back
 
 ../../../build_templates/mkmf -p create_increment -t ../../../build_templates/mkmf.template \
-        -a "../../.." ${wrapper_arg} ${path_name}
+       -c"-DHDF5"  -a "../../.." ${wrapper_arg} ${path_name}