From 36a79afa3bb3cf87587b98da8a3283fb51e64d71 Mon Sep 17 00:00:00 2001
From: Anne Philipp <anne.philipp@univie.ac.at>
Date: Sat, 3 Nov 2018 14:16:07 +0100
Subject: [PATCH] added header info and corrected controlfile path definition
for ec server
---
documentation/Sphinx/make.bat | 36 -------------------------------
source/python/_config.py | 40 ++++++++++++++++++-----------------
2 files changed, 21 insertions(+), 55 deletions(-)
delete mode 100644 documentation/Sphinx/make.bat
diff --git a/documentation/Sphinx/make.bat b/documentation/Sphinx/make.bat
deleted file mode 100644
index df5b146..0000000
--- a/documentation/Sphinx/make.bat
+++ /dev/null
@@ -1,36 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
- set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=source
-set BUILDDIR=build
-set SPHINXPROJ=flex_extract
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
- echo.
- echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
- echo.installed, then set the SPHINXBUILD environment variable to point
- echo.to the full path of the 'sphinx-build' executable. Alternatively you
- echo.may add the Sphinx directory to PATH.
- echo.
- echo.If you don't have Sphinx installed, grab it from
- echo.http://sphinx-doc.org/
- exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd
diff --git a/source/python/_config.py b/source/python/_config.py
index 4c94074..1460837 100644
--- a/source/python/_config.py
+++ b/source/python/_config.py
@@ -1,22 +1,24 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#*******************************************************************************
-# @Author: Anne Philipp (University of Vienna)
-#
-# @Date: August 2018
-#
-# @Change History:
-#
-# @License:
-# (C) Copyright 2014-2018.
-#
-# This software is licensed under the terms of the Apache Licence Version 2.0
-# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
-# @Description:
-# Contains constant value parameter for flex_extract.
-#
-#*******************************************************************************
+'''
+*******************************************************************************
+ @Author: Anne Philipp (University of Vienna)
+
+ @Date: August 2018
+
+ @Change History:
+
+ @License:
+ (C) Copyright 2014-2018.
+
+ This software is licensed under the terms of the Apache Licence Version 2.0
+ which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+
+ @Description:
+ Contains constant value parameter for flex_extract.
+
+*******************************************************************************
+'''
# ------------------------------------------------------------------------------
# MODULES
@@ -77,8 +79,8 @@ PATH_JOBSCRIPTS = os.path.join(PATH_RUN_DIR, 'jobscripts')
PATH_FORTRAN_SRC = os.path.join(PATH_SOURCES, 'fortran')
PATH_TEST_DIR = os.path.join(PATH_SOURCES, 'pythontest')
PATH_INPUT_DIR = os.path.join(PATH_RUN_DIR, INPUT_DIRNAME_DEFAULT)
-if os.getenv('CONTROL'):# and '/' in os.getenv('CONTROL'):
- # this is only needed if remote version with job script is used!
+if os.getenv('CONTROL'):
+ # this is only needed if gateway version with job script is used!
# because job is directly submitted from SCRATCH and because the
# CONTROL file is stored there, the normal path is not valid.
PATH_CONTROLFILES = '.'
--
GitLab