Renamed fort44_old to fort44_pre_2007.

cherab · Sep 30, 2020 · e6430a3 · e6430a3
1 parent f125192
commit e6430a3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/cherab/solps/eirene/parser/fort44.py b/cherab/solps/eirene/parser/fort44.py
@@ -18,7 +18,7 @@
 
 from cherab.solps.eirene.parser.fort44_2017 import load_fort44_2017
 from cherab.solps.eirene.parser.fort44_2013 import load_fort44_2013
-from cherab.solps.eirene.parser.fort44_old import load_fort44_old
+from cherab.solps.eirene.parser.fort44_pre_2007 import load_fort44_pre_2007
 
 
 def load_fort44_file(file_path, debug=False):
@@ -59,18 +59,22 @@ def assign_fort44_parser(file_version):
     :return: Parsing function object
     """
 
+    # TODO write universal fort44 parser
+
+    # Parser load_fort44_pre_2007 is used also for 20071209, 20080706 and 20081111
+    # versions as a temporary solution. Parameter 'eneutrad' is not parsed from these file versions.
     fort44_parser_library = {
-        960511: load_fort44_old,
-        960513: load_fort44_old,
-        960623: load_fort44_old,
-        960727: load_fort44_old,
-        961228: load_fort44_old,
-        20000727: load_fort44_old,
-        20051115: load_fort44_old,
-        20060206: load_fort44_old,
-        20071209: load_fort44_old,  # here we are missing eneutrad
-        20080706: load_fort44_old,  # here we are missing eneutrad
-        20081111: load_fort44_old,  # here we are missing eneutrad
+        960511: load_fort44_pre_2007,
+        960513: load_fort44_pre_2007,
+        960623: load_fort44_pre_2007,
+        960727: load_fort44_pre_2007,
+        961228: load_fort44_pre_2007,
+        20000727: load_fort44_pre_2007,
+        20051115: load_fort44_pre_2007,
+        20060206: load_fort44_pre_2007,
+        20071209: load_fort44_pre_2007,
+        20080706: load_fort44_pre_2007,
+        20081111: load_fort44_pre_2007,
         20130210: load_fort44_2013,
         20170328: load_fort44_2017
     }

diff --git a/cherab/solps/eirene/parser/fort44_old.py → ...ab/solps/eirene/parser/fort44_pre_2007.py b/cherab/solps/eirene/parser/fort44_old.py → ...ab/solps/eirene/parser/fort44_pre_2007.py
@@ -20,7 +20,7 @@
 from cherab.solps.eirene.parser.utility import read_block44
 
 
-def load_fort44_old(file_path, debug=False):
+def load_fort44_pre_2007(file_path, debug=False):
     """ Read neutral species and wall flux information from fort.44
 
     Template for reading is ngread.F in b2plot of B2.5 source.