Permalink
Browse files

Add WKML module

WKML is used for generating KML files that can be
read by Google Earth. This is the work of Gen-Tao
Chiang and Toby White.

As of this import there is one known bug (the
contoring fails accross 180 degrees) and a few
items of cleanup needed (we should avoid making
xf public in wxml and need to update .m4 files
in /wkml so that regenerating the .f90 does not
revert recent changes).
  • Loading branch information...
1 parent 140ec0b commit 0aded322e417aeab76def3956d71c78852422c62 gtniees committed with Jan 29, 2009
Showing with 12,440 additions and 1,156 deletions.
  1. +10 −9 FoX-config.in
  2. +17 −14 Makefile
  3. +6 −6 config/configure.ac
  4. +1,434 −1,124 configure
  5. +7 −2 examples/Makefile
  6. +34 −0 examples/wkml_example.f90
  7. +10 −0 examples/wkml_example_input.txt
  8. +62 −0 wkml/FoX_wkml.f90
  9. +2,138 −0 wkml/m_contours.f90
  10. +119 −0 wkml/m_wkml_chart.f90
  11. +222 −0 wkml/m_wkml_color.f90
  12. +827 −0 wkml/m_wkml_color_def.f90
  13. +294 −0 wkml/m_wkml_contours.f90
  14. +62 −0 wkml/m_wkml_core.f90
  15. +1,089 −0 wkml/m_wkml_coverage.f90
  16. +346 −0 wkml/m_wkml_coverage.m4
  17. +1,021 −0 wkml/m_wkml_coverage.tow.f90
  18. +1,180 −0 wkml/m_wkml_features.f90
  19. +1,560 −0 wkml/m_wkml_lowlevel.f90
  20. +696 −0 wkml/m_wkml_styling.f90
  21. +44 −0 wkml/makefile
  22. +753 −0 wkml/rgb.txt
  23. +73 −0 wkml/rgb2wkml.py
  24. +9 −0 wkml/test/Makefile
  25. +11 −0 wkml/test/passed.sh
  26. +18 −0 wkml/test/run_tests.sh
  27. 0 wkml/test/test.out
  28. +45 −0 wkml/test/test.sh
  29. +7 −0 wkml/test/test_kmlCreatePoints.sh
  30. +13 −0 wkml/test/test_kmlCreatePoints_1.f90
  31. +13 −0 wkml/test/test_kmlCreatePoints_1.xml
  32. +13 −0 wkml/test/test_kmlCreatePoints_10.f90
  33. +19 −0 wkml/test/test_kmlCreatePoints_10.xml
  34. +13 −0 wkml/test/test_kmlCreatePoints_11.f90
  35. +20 −0 wkml/test/test_kmlCreatePoints_11.xml
  36. +13 −0 wkml/test/test_kmlCreatePoints_12.f90
  37. +19 −0 wkml/test/test_kmlCreatePoints_12.xml
  38. +13 −0 wkml/test/test_kmlCreatePoints_2.f90
  39. +13 −0 wkml/test/test_kmlCreatePoints_2.xml
  40. +13 −0 wkml/test/test_kmlCreatePoints_3.f90
  41. +18 −0 wkml/test/test_kmlCreatePoints_3.xml
  42. +13 −0 wkml/test/test_kmlCreatePoints_4.f90
  43. +20 −0 wkml/test/test_kmlCreatePoints_4.xml
  44. +17 −0 wkml/test/test_kmlCreatePoints_5.f90
  45. +18 −0 wkml/test/test_kmlCreatePoints_5.xml
  46. +17 −0 wkml/test/test_kmlCreatePoints_6.f90
  47. +18 −0 wkml/test/test_kmlCreatePoints_6.xml
  48. +18 −0 wkml/test/test_kmlCreatePoints_7.f90
  49. +18 −0 wkml/test/test_kmlCreatePoints_7.xml
  50. +7 −0 wkml/test/test_kmlOpenCloseDocument.sh
  51. +12 −0 wkml/test/test_kmlOpenCloseDocument_1.f90
  52. +6 −0 wkml/test/test_kmlOpenCloseDocument_1.xml
  53. +2 −1 wxml/m_wxml_core.F90
View
@@ -65,9 +65,9 @@ while test $# -gt 0; do
--dom)
MODULES="$MODULES dom sax wxml common utils fsys"
;;
-# --wkml)
-# MODULES="$MODULES wxml common utils fsys"
-# ;;
+ --wkml)
+ MODULES="$MODULES wkml wxml common utils fsys"
+ ;;
*)
usage
@@ -78,8 +78,8 @@ while test $# -gt 0; do
done
if [ "x$MODULES" = x ]; then
- MODULES="dom sax wcml wxml common utils fsys"
-# MODULES="dom sax wkml wcml wxml common utils fsys"
+# MODULES="dom sax wcml wxml common utils fsys"
+ MODULES="dom sax wkml wcml wxml common utils fsys"
fi
case $MODULES in *fsys*)
@@ -110,10 +110,11 @@ case $MODULES in *dom*)
LIBS="$libdir/libFoX_dom.@LIBEXT@ $LIBS"
;;
esac
-#case $MODULES in *wkml*)
-# LIBS="$libdir/libFoX_wkml.@LIBEXT@ $LIBS"
-# ;;
-#esac
+case $MODULES in *wkml*)
+ LIBS="$libdir/libFoX_wkml.@LIBEXT@ $LIBS"
+ ;;
+esac
+
case $FLAGS in
FC)
View
@@ -53,14 +53,15 @@ wcml_lib_check: wxml_lib_check
(cd wcml; $(MAKE) VPATH=$(VPATH)/wcml check)
touch wcml_lib_check
#
-#wkml_lib: objsdir utils_lib wxml_lib
-# (cd wkml; $(MAKE) VPATH=$(VPATH)/wkml)
-#wkml_lib_clean:
-# if test -d wkml; then (cd wkml; $(MAKE) VPATH=$(VPATH)/wkml clean) fi
-#wkml_lib_check: wxml_lib_check
-# (cd wkml; $(MAKE) VPATH=$(VPATH)/wkml check)
-# touch wkml_lib_check
-#
+wkml_lib: objsdir utils_lib wxml_lib
+ (cd wkml; $(MAKE) VPATH=$(VPATH)/wkml)
+wkml_lib_clean:
+ if test -d wkml; then (cd wkml; $(MAKE) VPATH=$(VPATH)/wkml clean) fi
+wkml_lib_check: wxml_lib_check
+ (cd wkml; $(MAKE) VPATH=$(VPATH)/wkml check)
+ touch wkml_lib_check
+
+
common_lib: objsdir fsys_lib utils_lib
(cd common; $(MAKE) VPATH=$(VPATH)/common)
common_lib_clean:
@@ -105,22 +106,24 @@ cutdown:
done
cutdown-wxml: cutdown
- rm -rf wcml/ sax/ dom/
+ rm -rf wcml/ wkml/ sax/ dom/
cutdown-wcml: cutdown
rm -rf sax/ dom/
+cutdown-wkml: cutdown
+ rm -rf sax/ dom/
+
cutdown-sax: cutdown
- rm -rf wxml/ wcml/ dom/
+ rm -rf wxml/ wcml/ wkml/ dom/
cutdown-dom: cutdown
rm -rf wcml/
-#cutdown-wkml: cutdown
-# rm -rf sax/ dom/
-clean: wxml_lib_clean wcml_lib_clean common_lib_clean fsys_lib_clean sax_lib_clean dom_lib_clean utils_lib_clean
-#clean: wkml_lib_clean wxml_lib_clean wcml_lib_clean common_lib_clean fsys_lib_clean sax_lib_clean dom_lib_clean utils_lib_clean
+
+#clean: wxml_lib_clean wcml_lib_clean common_lib_clean fsys_lib_clean sax_lib_clean dom_lib_clean utils_lib_clean
+clean: wkml_lib_clean wxml_lib_clean wcml_lib_clean common_lib_clean fsys_lib_clean sax_lib_clean dom_lib_clean utils_lib_clean
if test -d examples; then (cd examples; $(MAKE) VPATH=$(VPATH)/examples clean) fi
rm -rf objs .FoX check.out *_check
#
View
@@ -88,9 +88,9 @@ AC_ARG_ENABLE([wxml],
AC_ARG_ENABLE([wcml],
AC_HELP_STRING([--enable-wcml], [Compile wcml subsystem (for CML output)]),
[eval wcml_$enableval=wcml_lib])
-dnl AC_ARG_ENABLE([wkml],
-dnl AC_HELP_STRING([--enable-wkml], [Compile wkml subsystem (for KML output)]),
-dnl [eval wkml_$enableval=wkml_lib])
+AC_ARG_ENABLE([wkml],
+ AC_HELP_STRING([--enable-wkml], [Compile wkml subsystem (for KML output)]),
+ [eval wkml_$enableval=wkml_lib])
AC_ARG_ENABLE([sax],
AC_HELP_STRING([--enable-sax], [Compile SAX parser]),
[eval sax_$enableval=sax_lib])
@@ -104,7 +104,7 @@ if test x$wxml_yes$wcml_yes$wkml_yes$sax_yes$dom_yes = x; then
if test x$CUTDOWN_TARGET = x; then
if test x$wxml_no = x; then wxml_yes=wxml_lib; fi
if test x$wcml_no = x; then wcml_yes=wcml_lib; fi
-dnl if test x$wkml_no = x; then wkml_yes=wkml_lib; fi
+ if test x$wkml_no = x; then wkml_yes=wkml_lib; fi
if test x$sax_no = x; then sax_yes=sax_lib; fi
if test x$dom_no = x; then dom_yes=dom_lib; fi
else
@@ -128,8 +128,8 @@ dnl DUMMYLIB doesnt work with DOM
fi
dnl
dnl Finally, construct the build targets
-BUILD_TARGETS="$wxml_yes $wcml_yes $sax_yes $dom_yes"
-dnl BUILD_TARGETS="$wxml_yes $wcml_yes $wkml_yes $sax_yes $dom_yes"
+dnl BUILD_TARGETS="$wxml_yes $wcml_yes $sax_yes $dom_yes"
+BUILD_TARGETS="$wxml_yes $wcml_yes $wkml_yes $sax_yes $dom_yes"
AC_SUBST(BUILD_TARGETS)
dnl
dnl Check for compiler kind flags
Oops, something went wrong.

0 comments on commit 0aded32

Please sign in to comment.