Subdir structure, first twinkles sections #54

doc/requirements/Makefile

@@ -12,11 +12,11 @@ BIB = bibtex
 #
 # Base name of the document:
 #
-DOCUMENT = main
+DOCUMENT = dc1
 #
 # All tex files used:
 #
-DEPENDENCIES=doc_settings.tex doc_macros.tex twinkles1.tex
+DEPENDENCIES=doc_settings.tex doc_macros.tex twinkles1/*.tex
 #
 # This line helps prevent make from getting confused in the case where you
 # have a file named 'clean'.
@@ -31,12 +31,12 @@ DEPENDENCIES=doc_settings.tex doc_macros.tex twinkles1.tex
 #
 # Main instructions, including dependencies:
 #
-main.pdf: main.tex $(DEPENDENCIES)
-	$(TEX) -halt-on-error main.tex
-	$(TEX) -halt-on-error main.tex
-	$(BIB) main
-	$(TEX) -halt-on-error main.tex
-	$(TEX) -halt-on-error main.tex
+main.pdf: $(DOCUMENT).tex $(DEPENDENCIES)
+	$(TEX) -halt-on-error $(DOCUMENT).tex
+	$(TEX) -halt-on-error $(DOCUMENT).tex
+	$(BIB) $(DOCUMENT)
+	$(TEX) -halt-on-error $(DOCUMENT).tex
+	$(TEX) -halt-on-error $(DOCUMENT).tex
 #
 # This will compile the document
 #
@@ -47,6 +47,7 @@ all: clean $(DOCUMENT).pdf
 #
 clean:
 	- $(RM) *.aux *.toc *.out *.log *.bbl *.blg *.wrt *~
+	- $(RM) */*.aux */*.toc */*.out */*.log */*.bbl */*.blg */*.wrt *~
 #
 vclean:	clean
 	- $(RM) $(DOCUMENT).pdf

doc/requirements/main.tex → doc/requirements/dc1.tex

@@ -52,7 +52,7 @@
 
 %%%%%%%% TWINKLES 1
 
-\include{twinkles1}
+\include{twinkles1/main}
 
 % ====================================================================
 

doc/requirements/twinkles1/main.tex

@@ -0,0 +1,48 @@
+% ====================================================================
+\chapter*{\TwinklesOne}
+\def\chpname{chp:twinkles1}
+\label{\chpname}
+\addcontentsline{toc}{chapter}{Twinkles 1}
+% ====================================================================
+
+% Contact list - repo in URL must be set correctly to enable queries
+% to be made:
+\renewcommand{\contact}[2]{%
+\href{https://github.com/DarkEnergyScienceCollaboration/Twinkles/issues/new?title=Question:\%20\&body=#2:\%20}{{\it #1}}%
+}
+
+\contact{Phil Marshall}{@drphilmarshall},
+\contact{Michael Wood-Vasey}{@wmwv},
+\contact{Richard Dubois}{@richardxdubois}
+
+% --------------------------------------------------------------------
+
+% Brief introduction, giving motivation for the Twinkles 1 survey.
+\input{twinkles1/motivation}
+
+% Planned science analysis developments that will drive the
+% Twinkles 1 design, and subsequent requirements.
+%\input{twinkles1/science}
+
+% The design of the Twinkles 1 dataset, resulting from the science
+% analyses defined in the previous section.
+%\input{twinkles1/design}
+
+% The consequent requirements on the simulation tools. Subsections
+% for OpSim, CatSim, and PhoSim, and their associated inputs and
+% interfaces.
+%\input{twinkles1/simulations}
+
+% The consequent requirements on the analysis software. Subsections
+% for DM Levels 1 and 2, DM+DESC Level 3, and DESC Level 4 code.
+%\input{twinkles1/analysis}
+
+% The consequent requirements on the DESC computing infrastructure
+% needed to enable execution of the above simulations and analysis
+% at the required scale.
+%\input{twinkles1/infrastructure}
+
+% Discussion of the above flowdown, and comments for future challenges.
+%\input{twinkles1/comments}
+
+% ====================================================================

doc/requirements/twinkles1.tex → doc/requirements/twinkles1/motivation.tex

@@ -1,21 +1,15 @@
 % ====================================================================
-\chapter*{\TwinklesOne}
-\def\chpname{chp:twinkles1}
-\label{\chpname}
-\addcontentsline{toc}{chapter}{Twinkles 1}
+\section{Motivation}
+\def\secname{\chpname:motivation}
+\label{\secname}
 % ====================================================================
 
-% Author list:
-\renewcommand{\contact}[2]{%
-\href{https://github.com/DarkEnergyScienceCollaboration/Twinkles/issues/new?title=Question:\%20\&body=#2:\%20}{{\it #1}}%
-}
-
 \contact{Phil Marshall}{@drphilmarshall},
 \contact{Michael Wood-Vasey}{@wmwv},
 \contact{Richard Dubois}{@richardxdubois}
 
 % --------------------------------------------------------------------
 
-% \input{introduction}
+Motivational text goes here.
 
 % ====================================================================