Merge pull request #1 from remindmodel/develop

Merge remindmodel/remind develop into my repo

modules/40_techpol/none/not_used.txt

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
 name,type,reason
 vm_demPe,variable,???
 vm_cap,variable,???
@@ -12,12 +6,6 @@ vm_prodSe,variable,???
 pm_ttot_val,parameter,???
 pm_prodCouple,parameter,???
 pm_pop,parameter,???
-sm_EJ_2_TWa,input,questionnaire
-vm_prodFe,input,questionnaire
-pm_inco0_t,input,questionnaire
-sm_DpKW_2_TDpTW,input,questionnaire
-sm_D2015_2_D2005,input,questionnaire
-pm_tkpremused,input,questionnaire
 pm_gdp,input,questionnaire
 vm_shUePeT,input,questionnaire
 pm_NuclearConstraint,input,questionnaire