Revised report for case study

examples/case_study_1/cases.py

@@ -52,7 +52,7 @@ def get_cases():
     cases_load_diversity = copy.deepcopy(cases)
     for ele in cases_load_diversity:
         ele['name'] = "{}_diverse_loads".format(ele["name"])
-        ele['parameters'] = {'flo.kIntNor': 0.75}
+        ele['parameters'] = {'flo.kIntNor': 0.5}
 
     cases = cases + cases_load_diversity
 
@@ -80,4 +80,4 @@ def get_result_file_name(name):
     case = get_case(name)
     model_name = (os.path.splitext(case['model'])[1])[1:]
     mat_name = "{}.mat".format( model_name )
-    return os.path.join(name, mat_name)
+    return os.path.join("simulations", name, mat_name)

examples/case_study_1/run_simulations.py

@@ -55,7 +55,7 @@ def _simulate(spec):
 
     wor_dir = create_working_directory()
 
-    out_dir = os.path.join(wor_dir, spec["name"])
+    out_dir = os.path.join(wor_dir, "simulations", spec["name"])
 
     # Update MODELICAPATH to get the right library version
     os.environ["MODELICAPATH"] = ":".join([spec['lib_dir'], out_dir])
@@ -84,7 +84,7 @@ def _simulate(spec):
     s.simulate()
 
     # Copy results back
-    res_des = os.path.join(CWD, spec["name"])
+    res_des = os.path.join(CWD, "simulations", spec["name"])
     if os.path.isdir(res_des):
        shutil.rmtree(res_des)
     print("Copying results to {}".format(res_des))

specification/fixLatex.py

@@ -4,8 +4,8 @@
 from io import open
 print(sys.version)
 
-oldFil=os.path.join("build", "latex", "cdl_specification.tex")
-newFil=os.path.join("build", "latex", "cdl_specification.tex-new")
+oldFil=os.path.join("build", "latex", "cdl_report.tex")
+newFil=os.path.join("build", "latex", "cdl_report.tex-new")
 
 def freplace(old, new):
     with open(oldFil, mode="rt", encoding="utf-8") as fin, open(newFil, mode="wt", encoding="utf-8") as fout:
@@ -34,4 +34,3 @@ def freplace(old, new):
 
 freplace('\\begin{Verbatim}[',
         '\\begin{Verbatim}[fontsize=\\footnotesize, ')
-

specification/source/_static/bootstrap_custom.css

@@ -115,7 +115,7 @@ h2 {
 }
 
 h3 {
-    margin: 1em 0 -0.3em 0;
+    margin: 1em 0 0.5em 0;
     font-size: 1em;
 }
 

specification/source/_static/sphinxdoc.css

@@ -147,7 +147,7 @@ h2 {
 }
 
 h3 {
-    margin: 1em 0 -0.3em 0;
+    margin: 1em 0 0.5em 0 !important;
     font-size: 1em;
 }
 

specification/source/conf.py

@@ -273,7 +273,7 @@
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index',
-   'cdl_specification.tex',
+   'cdl_report.tex',
    u'Control Description Language',
    '', 'manual'),
 ]
@@ -284,10 +284,13 @@
 #'classoptions': ',openany'                        : remove blank pages in PDF.
 #'babel': '\\usepackage[english]{babel}'           : suppress error message caused by undefined language.
 #'maketitle': '\\pagenumbering{gobble}\\maketitle' : switch off the page numbering in the tile and the index.
+release = ''
 latex_elements = {'classoptions': ', openany',         # remove blank pages in PDF.
-                   'releasename': 'Version',
+                   'releasename': '',
                   'babel': '\\usepackage[english]{babel}'}
 
+
+
 #                 'fontpkg': '\\usepackage[scaled]{helvet}'
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -440,7 +443,19 @@
 \belowcaptionskip=5pt
 
 
-\pagestyle{fancy}
+\pagestyle{normal}
+\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
+\renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}}
+\fancyhf{}
+\fancyhead[LE,RO]{\thepage}
+\fancyhead[RE]{\leftmark}
+\fancyhead[LO]{\rightmark}
+\fancypagestyle{plain}{%
+   \fancyhead{} % get rid of headers
+   \renewcommand{\headrulewidth}{0pt} % and the line
+}
+
+
 %%\fancyhf{}
 %%\rhead[LE,RO]{\thechapter .}
 %\lhead{Guides and tutorials}