Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/source/about.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ code. Of particular note is the work and support by Kalliopi Kanaki (former ESS
ERIC, now IAEA), Xiao Xiao Cai (former DTU, now CSNS) and Richard Hall-Wilton
(former ESS ERIC, now FDK-SD). Although a lot of the technical details and names
changed in the meantime, this `old tutorial from 2015
<https://indico.esss.lu.se/event/335/attachments/2549/3795/dgcode_tutorial_june2015.pdf>`__
<https://indico.ess.eu/event/335/attachments/2549/3795/dgcode_tutorial_june2015.pdf>`__
might still be interesting for those interested in the history of dgcode.
11 changes: 3 additions & 8 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,9 @@ def setup(app):
templates_path = ['_templates']
exclude_patterns = []

#A few annoying autogenerated links cause spurious failures:
linkcheck_ignore = [
'https://github.com/mctools/ncrystal/wiki/Using-NCrystal#uniform-material-configuration-syntax',
'https://github.com/mctools/simplebuild-dgcode/issues/38#issuecomment-1999469177',
#These have cert issues, but not in my browser (?!?):
'https://indico.esss.lu.se/event/335/attachments/2549/3795/dgcode_tutorial_june2015.pdf',
'https://indico.esss.lu.se/event/617/',
]
#Anchors in GitHub wiki pages are created by JavaScript, so they can not be
#checked (the pages themselves are still checked):
linkcheck_anchors_ignore_for_url = [ r'https://github\.com/.*/wiki/.*' ]

# -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
Expand Down
8 changes: 3 additions & 5 deletions doc/source/mcpl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@ McStas, MCNP, etc. It is described in great detail in a `published paper
with other programmes can be found on the `MCPL website
<https://mctools.github.io/mcpl/>`__. Rather than being comprehensive, the
present page will focus on MCPL tools and recipes that are most likely to be of
interest for users of dgcode. There is also some information in the `MCPL talk
given at the DG jamboree September 2016
<https://indico.esss.lu.se/event/617/>`__. Since the paper and that talk, the
number of applications supporting MCPL has only continued to grow, but the basic
concepts are still relevant.
interest for users of dgcode. Since the paper, the number of applications
supporting MCPL has only continued to grow, but the basic concepts are still
relevant.

|image_mcplpaper| \ |image_mcplwww|

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <cstdio>
#ifdef MCPLEXTRA_AVOID_USING_PYTHON
# include <cstdlib>
# include <stdexcept>
# include "sys/wait.h"
# include <iostream>
# include "Utils/Cmd.hh"
Expand Down Expand Up @@ -173,8 +172,10 @@ int main(int argc, char** argv) {
}
std::cout<<"Launching: "<<cmd<<std::endl;
int status = std::system(cmd);
if ( ! (status >=0 && WIFEXITED( status ) && WEXITSTATUS( status ) == 0 ) )
throw std::runtime_error(std::string("cmd failed: ")+cmd);
if ( ! (status >=0 && WIFEXITED( status ) && WEXITSTATUS( status ) == 0 ) ) {
std::cerr<<"ERROR: Command failed: "<<cmd<<std::endl;
return 1;
}
#else
try {
pyextra::ensurePyInit();
Expand Down
Loading