Permalink
Browse files

Merged the most recent master branch into the NinJo branch to prepare to

merge the NinJo branch into master.
Merge branch 'master' into ninjo

Conflicts:
	py/polar2grid/polar2grid/grids/grids.conf
	py/polar2grid_core/polar2grid/core/rescale.py
  • Loading branch information...
davidh-ssec committed Feb 5, 2013
1 parent 7082ce2 commit 17494a690f742b24f082c2302ec4f69f15a3034e
Showing with 5,718 additions and 2,376 deletions.
  1. +675 −0 COPYING
  2. +27 −0 README.rst
  3. +8 −60 ms2gt/Makefile
  4. +93 −0 ms2gt/Makefile.inc
  5. +1 −60 ms2gt/src/Makefile
  6. +3 −38 ms2gt/src/fornav/Makefile
  7. +3 −37 ms2gt/src/grid_convert/Makefile
  8. +3 −37 ms2gt/src/gridsize/Makefile
  9. +4 −36 ms2gt/src/ll2cr/Makefile
  10. +3 −37 ms2gt/src/ll2xy/Makefile
  11. +3 −37 ms2gt/src/lle2cre/Makefile
  12. +6 −38 ms2gt/src/mapx/trunk/Makefile.ms2gt
  13. +3 −37 ms2gt/src/projection/Makefile
  14. +6 −44 ms2gt/src/utils/Makefile
  15. +3 −37 ms2gt/src/xy2ll/Makefile
  16. +53 −1 py/Makefile
  17. +17 −0 py/polar2grid/README
  18. BIN py/polar2grid/doc/source/_static/SSEC_logo_small24.png
  19. BIN py/polar2grid/doc/source/_static/favicon.ico
  20. +11 −0 py/polar2grid/doc/source/_static/prettytables.css
  21. +21 −18 py/polar2grid/doc/source/advanced.rst
  22. +23 −38 py/polar2grid/doc/source/{backends.rst → backends/awips_netcdf.rst}
  23. +7 −0 py/polar2grid/doc/source/backends/binary.rst
  24. +41 −0 py/polar2grid/doc/source/backends/gtiff.rst
  25. +17 −0 py/polar2grid/doc/source/backends/index.rst
  26. +49 −29 py/polar2grid/doc/source/chain.rst
  27. +15 −4 py/polar2grid/doc/source/conf.py
  28. +267 −0 py/polar2grid/doc/source/constants.rst
  29. +0 −464 py/polar2grid/doc/source/dev_guide.rst
  30. +6 −0 py/polar2grid/doc/source/dev_guide/backends.rst
  31. +131 −0 py/polar2grid/doc/source/dev_guide/dev_env.rst
  32. +116 −0 py/polar2grid/doc/source/dev_guide/frontends.rst
  33. +31 −0 py/polar2grid/doc/source/dev_guide/glue_scripts.rst
  34. +11 −0 py/polar2grid/doc/source/dev_guide/grid_deter.rst
  35. +61 −0 py/polar2grid/doc/source/dev_guide/grids.rst
  36. +102 −0 py/polar2grid/doc/source/dev_guide/index.rst
  37. +43 −0 py/polar2grid/doc/source/dev_guide/remapping.rst
  38. +12 −0 py/polar2grid/doc/source/dev_guide/rescaling.rst
  39. +0 −26 py/polar2grid/doc/source/frontends.rst
  40. +23 −0 py/polar2grid/doc/source/frontends/index.rst
  41. +76 −0 py/polar2grid/doc/source/frontends/viirs.rst
  42. +72 −0 py/polar2grid/doc/source/glossary.rst
  43. +67 −0 py/polar2grid/doc/source/glue_scripts/common_opts.rst
  44. +63 −0 py/polar2grid/doc/source/glue_scripts/index.rst
  45. +99 −0 py/polar2grid/doc/source/glue_scripts/viirs2awips.rst
  46. +116 −0 py/polar2grid/doc/source/glue_scripts/viirs2binary.rst
  47. +116 −0 py/polar2grid/doc/source/glue_scripts/viirs2gtiff.rst
  48. +15 −11 py/polar2grid/doc/source/grids.rst
  49. +26 −16 py/polar2grid/doc/source/index.rst
  50. +15 −146 py/polar2grid/doc/source/installation.rst
  51. +2 −2 py/polar2grid/doc/source/polar2grid.rst
  52. +79 −42 py/polar2grid/doc/source/rescaling.rst
  53. +0 −104 py/polar2grid/doc/source/scripts.rst
  54. +52 −0 py/polar2grid/doc/source/tests/p2g_v2a_ak.rst
  55. +53 −0 py/polar2grid/doc/source/tests/p2g_v2g_basic.rst
  56. +26 −1 py/polar2grid/doc/source/utilscripts.rst
  57. +31 −2 py/polar2grid/polar2grid/__init__.py
  58. +31 −2 py/polar2grid/polar2grid/awips/__init__.py
  59. +31 −2 py/polar2grid/polar2grid/awips/awips_config.py
  60. +4 −0 py/polar2grid/polar2grid/awips/awips_grids.conf
  61. +35 −5 py/polar2grid/polar2grid/awips/awips_netcdf.py
  62. +31 −2 py/polar2grid/polar2grid/binary.py
  63. +31 −2 py/polar2grid/polar2grid/grids/__init__.py
  64. +6 −6 py/polar2grid/polar2grid/grids/grids.conf
  65. +31 −2 py/polar2grid/polar2grid/grids/grids.py
  66. +35 −6 py/polar2grid/polar2grid/gtiff_backend.py
  67. +61 −47 py/polar2grid/polar2grid/ll2cr.py
  68. +31 −2 py/polar2grid/polar2grid/ms2gt.py
  69. +31 −2 py/polar2grid/polar2grid/nc.py
  70. +31 −2 py/polar2grid/polar2grid/ninjo/__init__.py
  71. +31 −2 py/polar2grid/polar2grid/ninjo/ninjo_backend.py
  72. +31 −2 py/polar2grid/polar2grid/ninjo/ninjo_config.py
  73. +38 −5 py/polar2grid/polar2grid/plot_binary.py
  74. +133 −29 py/polar2grid/polar2grid/plot_ncdata.py
  75. +31 −2 py/polar2grid/polar2grid/remap.py
  76. +108 −34 py/polar2grid/polar2grid/viirs2awips.py
  77. +104 −30 py/polar2grid/polar2grid/viirs2binary.py
  78. +104 −30 py/polar2grid/polar2grid/viirs2gtiff.py
  79. +104 −36 py/polar2grid/polar2grid/viirs2ninjo.py
  80. +47 −3 py/polar2grid/setup.py
  81. +31 −2 py/polar2grid_core/polar2grid/__init__.py
  82. +31 −2 py/polar2grid_core/polar2grid/core/__init__.py
  83. +32 −2 py/polar2grid_core/polar2grid/core/constants.py
  84. +31 −2 py/polar2grid_core/polar2grid/core/dtype.py
  85. +31 −2 py/polar2grid_core/polar2grid/core/fbf.py
  86. +31 −2 py/polar2grid_core/polar2grid/core/glue_utils.py
  87. +401 −0 py/polar2grid_core/polar2grid/core/histogram.py
  88. +36 −376 py/polar2grid_core/polar2grid/core/rescale.py
  89. +1 −0 py/polar2grid_core/polar2grid/core/rescale_configs/rescale.16bit.conf
  90. +1 −0 py/polar2grid_core/polar2grid/core/rescale_configs/rescale.8bit.conf
  91. +1 −0 py/polar2grid_core/polar2grid/core/rescale_configs/rescale_inc.16bit.conf
  92. +1 −0 py/polar2grid_core/polar2grid/core/rescale_configs/rescale_inc.8bit.conf
  93. +43 −14 py/polar2grid_core/polar2grid/core/roles.py
  94. +31 −2 py/polar2grid_core/polar2grid/core/time_utils.py
  95. +38 −2 py/polar2grid_core/setup.py
  96. +31 −2 py/polar2grid_viirs/polar2grid/__init__.py
  97. +31 −2 py/polar2grid_viirs/polar2grid/viirs/__init__.py
  98. +252 −66 py/polar2grid_viirs/polar2grid/viirs/prescale.py
  99. +31 −2 py/polar2grid_viirs/polar2grid/viirs/pseudo.py
  100. +87 −31 py/polar2grid_viirs/polar2grid/viirs/viirs_guidebook.py
  101. +107 −25 py/polar2grid_viirs/polar2grid/viirs/viirs_imager_to_swath.py
  102. +43 −3 py/polar2grid_viirs/setup.py
  103. +34 −3 swbundle/README.txt
  104. +49 −0 swbundle/plot_binary.sh
  105. +29 −3 swbundle/plot_ncdata.sh
  106. +29 −1 swbundle/polar2grid_env.sh
  107. +28 −0 swbundle/viirs2awips.sh
  108. +41 −0 swbundle/viirs2binary.sh
  109. +29 −1 swbundle/viirs2gtiff.sh
  110. +34 −3 swbundle_tests/v2a_ak_run.sh
  111. +56 −8 swbundle_tests/v2a_ak_verify.sh
  112. +0 −46 swbundle_tests/v2g_ak_verify.sh
  113. +34 −2 swbundle_tests/{v2g_ak_run.sh → v2g_basic_run.sh}
  114. +107 −0 swbundle_tests/v2g_basic_verify.sh
  115. +0 −71 swbundle_tests/v2g_econus_run.sh
  116. +0 −46 swbundle_tests/v2g_econus_verify.sh
View
675 COPYING

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -10,6 +10,33 @@ The main code repository is hosted at https://github.com/davidh-ssec/polar2grid
The main documentation site is http://www.ssec.wisc.edu/software/polar2grid/
+License
+-------
+
+::
+
+ Copyright (C) 2013 Space Science and Engineering Center (SSEC),
+ University of Wisconsin-Madison.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Original scripts and automation included as part of this package are
+ distributed under the GNU GENERAL PUBLIC LICENSE agreement version 3.
+ Binary executable files included as part of this software package are
+ copyrighted and licensed by their respective organizations, and
+ distributed consistent with their licensing terms.
+
Directory Structure
-------------------
View
@@ -6,6 +6,8 @@
#========================================================================
RCSID = $Header: /disks/megadune/data/tharan/ms2gth/Makefile,v 1.40 2012/07/24 21:50:03 tharan Exp $
+include Makefile.inc
+
#------------------------------------------------------------------------
# configuration section
@@ -15,41 +17,11 @@ RCSID = $Header: /disks/megadune/data/tharan/ms2gth/Makefile,v 1.40 2012/07/24 2
VERSION = 0
RELEASE = 24a
-#
-# installation directories
-#
-TOPDIR = .
-BINDIR = $(TOPDIR)/bin
-DOCDIR = $(TOPDIR)/doc
-GRDDIR = $(TOPDIR)/grids
-INCDIR = $(TOPDIR)/include
-LIBDIR = $(TOPDIR)/lib
-SRCDIR = $(TOPDIR)/src
-TU1DIR = $(TOPDIR)/tutorial_1
-TU2DIR = $(TOPDIR)/tutorial_2
-TU3DIR = $(TOPDIR)/tutorial_3
-TU4DIR = $(TOPDIR)/tutorial_4
-
-NAVDIR = $(SRCDIR)/fornav
-GCNDIR = $(SRCDIR)/grid_convert
-GSZDIR = $(SRCDIR)/gridsize
-IDLDIR = $(SRCDIR)/idl
-LL2DIR = $(SRCDIR)/ll2cr
-LLXDIR = $(SRCDIR)/ll2xy
-LE2DIR = $(SRCDIR)/lle2cre
-MAPDIR = $(SRCDIR)/mapx/trunk
-PRJDIR = $(SRCDIR)/projection
-SCTDIR = $(SRCDIR)/scripts
-UTSDIR = $(SRCDIR)/utils
-XY2DIR = $(SRCDIR)/xy2ll
-
-L1BDIR = $(IDLDIR)/level1b_read
-UTLDIR = $(IDLDIR)/modis_utils
-
#
# installation target directories
#
-TARDIR = $(TOPDIR)/ms2gt$(VERSION).$(RELEASE)
+TARDIRNAME = ms2gt$(VERSION).$(RELEASE)
+TARDIR = $(TOPDIR)/$(TARDIRNAME)
TBINDIR = $(TARDIR)/bin
TDOCDIR = $(TARDIR)/doc
TGRDDIR = $(TARDIR)/grids
@@ -77,38 +49,11 @@ TXY2DIR = $(TSRCDIR)/xy2ll
TL1BDIR = $(TIDLDIR)/level1b_read
TUTLDIR = $(TIDLDIR)/modis_utils
-#
-# commands
-#
-SHELL ?= /bin/sh
-CC ?= cc
-AR ?= ar
-RANLIB ?= touch
-CO ?= co
-MAKEDEPEND ?= makedepend
-INSTALL ?= cp
-CP ?= cp
-CD ?= cd
-RM ?= rm -f
-RMDIR ?= rm -fr
-MKDIR ?= mkdir -p
-TAR ?= tar
-COMPRESS ?= gzip
-
#
# archive file name
#
TARFILE = $(TOPDIR)/ms2gt$(VERSION).$(RELEASE).tar
-#
-# debug or optimization settings
-#
-# on least significant byte first machines (Intel, Vax)
-# add -DLSB1ST option to enable byteswapping of cdb files
-#
-CONFIG_CFLAGS = -O
-#CONFIG_CFLAGS = -DDEBUG -g
-
#
# end configuration section
#------------------------------------------------------------------------
@@ -147,6 +92,7 @@ SCTSRCS = $(SCTDIR)/*.pl
UTSSRCS = $(UTSMAKE) $(UTSDIR)/*.c
XY2SRCS = $(XY2MAKE) $(XY2DIR)/*.c
+BINS = $(TOPDIR)/bin/*
TOPS = $(TOPDIR)/*.txt $(TOPDIR)/Makefile $(TOPDIR)/ms2gt_env.csh
DOCS = $(DOCDIR)/*.html $(DOCDIR)/*usage $(DOCDIR)/*.gif
HDRS = $(INCDIR)/*.h
@@ -179,6 +125,7 @@ tar:
$(MKDIR) $(TIDLDIR) $(TL1BDIR) $(TUTLDIR)
$(MKDIR) $(TTU1DIR) $(TTU2DIR) $(TTU3DIR) $(TTU4DIR)
$(CP) $(TOPS) $(TARDIR)
+ $(CP) $(BINS) $(TBINDIR)
$(CP) $(DOCS) $(TDOCDIR)
$(CP) $(HDRS) $(TINCDIR)
$(CP) $(GRDS) $(TGRDDIR)
@@ -200,7 +147,8 @@ tar:
$(CP) $(TU2S) $(TTU2DIR)
$(CP) $(TU3S) $(TTU3DIR)
$(CP) $(TU4S) $(TTU4DIR)
- $(TAR) cvf $(TARFILE) $(TARDIR)
+ $(CD) $(TOPDIR); \
+ $(TAR) cvf $(TARFILE) $(TARDIRNAME);
$(RM) $(TARFILE).gz
$(COMPRESS) $(TARFILE)
View
@@ -0,0 +1,93 @@
+# Global Makefile include file for all ms2gt Makefiles
+# This file was created by David Hoese (SSEC) for the polar2grid project
+# and is not part of the original ms2gt package
+
+UNAME := $(shell uname)
+TOPDIR = $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+
+#
+# installation directories
+#
+BINDIR = $(TOPDIR)/bin
+DOCDIR = $(TOPDIR)/doc
+GRDDIR = $(TOPDIR)/grids
+INCDIR = $(TOPDIR)/include
+LIBDIR = $(TOPDIR)/lib
+SRCDIR = $(TOPDIR)/src
+TU1DIR = $(TOPDIR)/tutorial_1
+TU2DIR = $(TOPDIR)/tutorial_2
+TU3DIR = $(TOPDIR)/tutorial_3
+TU4DIR = $(TOPDIR)/tutorial_4
+
+NAVDIR = $(SRCDIR)/fornav
+GCNDIR = $(SRCDIR)/grid_convert
+GSZDIR = $(SRCDIR)/gridsize
+IDLDIR = $(SRCDIR)/idl
+LL2DIR = $(SRCDIR)/ll2cr
+LLXDIR = $(SRCDIR)/ll2xy
+LE2DIR = $(SRCDIR)/lle2cre
+MAPDIR = $(SRCDIR)/mapx/trunk
+PRJDIR = $(SRCDIR)/projection
+SCTDIR = $(SRCDIR)/scripts
+UTSDIR = $(SRCDIR)/utils
+XY2DIR = $(SRCDIR)/xy2ll
+
+L1BDIR = $(IDLDIR)/level1b_read
+UTLDIR = $(IDLDIR)/modis_utils
+
+#
+# special cases
+#
+# The mapx Makefile for ms2gt has a special name
+MAPMAK = -f Makefile.ms2gt
+
+#
+# commands
+#
+SHELL ?= /bin/sh
+AR ?= ar
+CO ?= co
+MAKEDEPEND ?= makedepend
+INSTALL ?= cp
+CP ?= cp
+CD ?= cd
+RM ?= rm -f
+RMDIR ?= rm -fr
+MKDIR ?= mkdir -p
+TAR ?= tar
+COMPRESS ?= gzip
+ifeq ($(UNAME), Darwin)
+ CC = gcc
+ RANLIB ?= ranlib
+else
+ CC = cc
+ RANLIB ?= touch
+endif
+
+#
+# debug or optimization settings
+#
+# on least significant byte first machines (Intel, Vax)
+# add -DLSB1ST option to enable byteswapping of cdb files
+# for other architectures (Sun, SGI, HP, etc.) do _not_ use
+# the -DLSB1ST flag
+# The cdb files are only in the mapx library
+CONFIG_CFLAGS ?= -O -DLSB1ST
+#CONFIG_CFLAGS ?= -O
+#CONFIG_CFLAGS ?= -DDEBUG -g
+#CONFIG_CFLAGS ?= -DDEBUG -g -DLSB1ST
+#CONFIG_CFLAGS ?= -O -Wall -DLSB1ST
+
+#
+# system libraries
+#
+LOCAL_LIBS = -lmapx
+SYSLIBS = -lm
+
+#
+# Compile and link flags
+#
+LDFLAGS ?=
+CFLAGS = -I$(INCDIR) $(CONFIG_CFLAGS) $(LDFLAGS)
+LIBS = -L$(LIBDIR) $(LOCAL_LIBS) $(SYSLIBS)
+
View
@@ -6,66 +6,7 @@
#========================================================================
RCSID = $Header: /disks/megadune/data/tharan/ms2gth/src/Makefile,v 1.14 2011/03/30 20:47:15 tharan Exp $
-#------------------------------------------------------------------------
-# configuration section
-
-#
-# installation directories
-#
-TOPDIR = ..
-BINDIR = $(TOPDIR)/bin
-DOCDIR = $(TOPDIR)/doc
-GRDDIR = $(TOPDIR)/grids
-INCDIR = $(TOPDIR)/include
-LIBDIR = $(TOPDIR)/lib
-SRCDIR = $(TOPDIR)/src
-
-NAVDIR = $(SRCDIR)/fornav
-GCNDIR = $(SRCDIR)/grid_convert
-GSZDIR = $(SRCDIR)/gridsize
-IDLDIR = $(SRCDIR)/idl
-LL2DIR = $(SRCDIR)/ll2cr
-LLXDIR = $(SRCDIR)/ll2xy
-LE2DIR = $(SRCDIR)/lle2cre
-MAPDIR = $(SRCDIR)/mapx/trunk
-MAPMAK = -f Makefile.ms2gt
-PRJDIR = $(SRCDIR)/projection
-SCTDIR = $(SRCDIR)/scripts
-UTSDIR = $(SRCDIR)/utils
-XY2DIR = $(SRCDIR)/xy2ll
-L1BDIR = $(IDLDIR)/level1b_read
-UTLDIR = $(IDLDIR)/modis_utils
-
-#
-# commands
-#
-SHELL ?= /bin/sh
-CC ?= cc
-AR ?= ar
-RANLIB ?= touch
-CO ?= co
-MAKEDEPEND ?= makedepend
-INSTALL ?= cp
-CP ?= cp
-CD ?= cd
-RM ?= rm -f
-RMDIR ?= rm -fr
-MKDIR ?= mkdir -p
-TAR ?= tar
-COMPRESS ?= gzip
-
-#
-# debug or optimization settings
-#
-# on least significant byte first machines (Intel, Vax)
-# add -DLSB1ST option to enable byteswapping of cdb files
-#
-CONFIG_CFLAGS = -O
-#CONFIG_CFLAGS = -DDEBUG -g
-
-#
-# end configuration section
-#------------------------------------------------------------------------
+include ../Makefile.inc
all: srcs
View
@@ -6,56 +6,21 @@
#========================================================================
RCSID = $Header: /disks/megadune/data/tharan/ms2gth/src/fornav/Makefile,v 1.6 2007/05/07 18:09:57 tharan Exp $
+include ../../Makefile.inc
+
#------------------------------------------------------------------------
# configuration section
-#
-# installation directories
-#
-TOPDIR = ../..
-LIBDIR = $(TOPDIR)/lib
-INCDIR = $(TOPDIR)/include
-BINDIR = $(TOPDIR)/bin
-#
-# commands
-#
-SHELL ?= /bin/sh
-CC ?= cc
-AR ?= ar
-RANLIB ?= touch
-CO ?= co
-MAKEDEPEND ?= makedepend
-INSTALL ?= cp
-CP ?= cp
-RM ?= rm -f
-TAR ?= tar
-COMPRESS ?= gzip
#
# archive file name
#
TARFILE = fornav.tar
-#
-# debug or optimization settings
-#
-# on least significant byte first machines (Intel, Vax)
-# add -DLSB1ST option to enable byteswapping of cdb files
-#
-CONFIG_CFLAGS = -O
-#CONFIG_CFLAGS = -O -Wall
-#CONFIG_CFLAGS = -DDEBUG -g
-
-#
-# system libraries
-#
-SYSLIBS = -lm
-
#
# end configuration section
#------------------------------------------------------------------------
-CFLAGS = -I$(INCDIR) $(CONFIG_CFLAGS) $(getconf LFS_CFLAGS)
-LIBS = -L$(LIBDIR) -lmapx $(SYSLIBS)
+CFLAGS += $(getconf LFS_CFLAGS)
SRCS = fornav.c
OBJS = fornav.o
Oops, something went wrong.

0 comments on commit 17494a6

Please sign in to comment.