Merge pull request #87 from tscheypidi/module_rename

Various minor tweaks
magpiemodel · May 2, 2019 · 5334ffd · 5334ffd
2 parents 1b2b012 + 58f339c
commit 5334ffd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,13 +20,7 @@ magpie_calib.*
 .Rhistory
 
 #ignore documentation folder
-/doc/*/
-/doc/*.pdf
-/doc/*.rds
-/doc/*.tex
-/doc/*.aux
-/doc/*.log
-/doc/*.gz
+/doc/
 
 #ignore run specific files and folders
 /225*/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### added
+
+
+### changed
+ - **modules** modular structure updated from version 1 to version 2
+
+
+ ### fixed
+
+
 
 ## [4.1.0] - 2019-05-02
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -76,7 +76,7 @@ authors:
     email: popp@pik-potsdam.de
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.1
+version: 4.2dev
 date-released: 2019-05-02
 repository-code: https://github.com/magpiemodel/magpie
 keywords:

diff --git a/doc/literature.bib → literature.bib b/doc/literature.bib → literature.bib
diff --git a/doc/images/logo.png → logo.png b/doc/images/logo.png → logo.png