Merge pull request #289 from climbfuji/bugfixes_from_public_release

Bring hotfixes from release/public-v4 back to master, add syntax check for parsing \htmlinclude lines
NCAR · May 11, 2020 · 6890b2f · 6890b2f
2 parents 092c293 + 2a6e41a
commit 6890b2f
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 914 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif (NOT PROJECT)
 cmake_minimum_required(VERSION 3.0)
 
 project(ccpp
-        VERSION 3.0.0
+        VERSION 4.0.0
         LANGUAGES C CXX Fortran)
 
 # Use rpaths on MacOSX

diff --git a/doc/DevelopersGuide/CCPP_VARIABLES_FV3.pdf b/doc/DevelopersGuide/CCPP_VARIABLES_FV3.pdf
diff --git a/doc/DevelopersGuide/CCPP_VARIABLES_SCM.pdf b/doc/DevelopersGuide/CCPP_VARIABLES_SCM.pdf
diff --git a/doc/DevelopersGuide/Makefile b/doc/DevelopersGuide/Makefile
diff --git a/doc/DevelopersGuide/README.md b/doc/DevelopersGuide/README.md
@@ -0,0 +1,12 @@
+# CCPP Framework Developers Guide
+
+The PDF files in this directory are generated in the following manner:
+
+When the ``ccpp_prebuild.py`` script is run for a host model, such as a single
+column model (SCM) or the UFS Weather Model, a file named ``CCPP_VARIABLES_SCM.tex`` or 
+``CCPP_VARIABLES_FV3.tex`` is created in this directory.  
+
+To create the PDF files, the latex to pdf converter is necessary:
+
+``pdflatex CCPP_VARIABLES_SCM.tex``
+``pdflatex CCPP_VARIABLES_FV3.tex``
diff --git a/doc/DevelopersGuide/acknow.tex b/doc/DevelopersGuide/acknow.tex
diff --git a/doc/DevelopersGuide/chap_appendix.tex b/doc/DevelopersGuide/chap_appendix.tex
diff --git a/doc/DevelopersGuide/chap_hostmodel.tex b/doc/DevelopersGuide/chap_hostmodel.tex
diff --git a/doc/DevelopersGuide/chap_intro.tex b/doc/DevelopersGuide/chap_intro.tex
diff --git a/doc/DevelopersGuide/chap_schemes.tex b/doc/DevelopersGuide/chap_schemes.tex
diff --git a/doc/DevelopersGuide/host_cap_template.F90 b/doc/DevelopersGuide/host_cap_template.F90
diff --git a/doc/DevelopersGuide/images/ccpp_design_with_ccpp_prebuild.pdf b/doc/DevelopersGuide/images/ccpp_design_with_ccpp_prebuild.pdf
diff --git a/doc/DevelopersGuide/images/dtc_logo.png b/doc/DevelopersGuide/images/dtc_logo.png
diff --git a/doc/DevelopersGuide/main.tex b/doc/DevelopersGuide/main.tex