Merge pull request #263 from cyrillemidingoyi/newb

Newb

Author: cyrillemidingoyi

requirements.txt

@@ -36,4 +36,4 @@ unyt
 IPython
 antlr4-python3-runtime==4.8
 xmlformatter
-pandas
+pandas

src/pycropml/transpiler/ast_transform.py

@@ -88,7 +88,6 @@ def transformer(self):
         self.type_env.top['__name__'] = "str"
         self.q=None
 
-        #print(self.type_env.values)
         return {'type': 'module','definition':self.signature, 'iterators':self.iterators, 'body': body if isinstance(body, list) else [body]}
 
     def visit_definitions(self):
@@ -476,7 +475,6 @@ def visit_boolnode(self, node, location):
 
     def visit_indexnode(self, node, base, index, location):
         value_node = self.visit_node(base)
-        # print("val",value_node)
         if isinstance(base, ExprNodes.IndexNode):
             value_general_type = "array"
         else:
@@ -1047,7 +1045,6 @@ def visit_divnode(self, node, operand1, operand2, location):
                 }
 
     def visit_subnode(self, node, operand1, operand2, location):
-        print(node.py_result, node.target_code, location)
         op = node.operator
         operand1 = node.operand1
         operand2 = node.operand2
@@ -1102,7 +1099,6 @@ def visit_pownode(self, node, operand1, operand2, location):
         op = node.operator
         operand1 = node.operand1
         operand2 = node.operand2
-        #print(type(operand1), type(operand2))
         if isinstance(operand1, ExprNodes.AttributeNode) and operand1.obj.name=="u":
             return {
                     "type":"units",

src/pycropml/transpiler/generators/apsimGenerator.py

@@ -744,6 +744,18 @@ def copyconstrWrap(self):
         self.indentation -= 1        
         self.write("}")
 
+class ApsimInterface(CsharpCompo):
+    """ This class used to the component interface for APSIM platform.
+    """
+    def __init__(self, tree=None, model=None, name=None, customer=""):
+        CsharpCompo.__init__(self, tree, model, name)
+        self.model=model
+        self.tree = tree
+        self.name = name
+        self.customer=customer
+        
+
+
 def to_wrapper_apsim(models, rep, name, customer = ''):
     generator = ApsimCompo(model = models, customer=customer)
     generator.model2Node()

src/pycropml/transpiler/generators/fortranGenerator.py

@@ -63,13 +63,8 @@ def __init__(self, tree, model=None, name = None):
         self.params=[]
         self.recursive=False
         self.allocatable = {}
-        print(dir(self.model))
         self.privates = [p.name for p in model.inputs if "parametercategory" in dir(p) and p.parametercategory=="private" and "ARRAY" in p.datatype ]
         self.states_arr = [p.name for p in model.inputs if "variablecategory" in dir(p) and p.variablecategory=="state" and "ARRAY" in p.datatype ]
-        #self.exo_arr = [p.name for p in model.inputs if "variablecategory" in dir(p) and p.variablecategory=="exogenous" and "ARRAY" in p.datatype ]
-        print("privatessssss", self.privates)
-        #self.totfunctions = self.z.functions
-        #print("kkkkkkk", [f.name for f in self.totfunctions])
         if self.model: 
             self.doc= DocGenerator(model, '!')
         self.funcname = ""
@@ -558,11 +553,9 @@ def visit_function_definition(self, node):
         self.funcname = node.name
         self.recursive = node.recursive
         self.z = middleware(node, alloc = self.allocatable)
-        if node.name.startswith("init_soiltemperature"): print("iniiiiiiiiiiiiit", self.allocatable)
         self.z.transform(node)
         self.parameters=[]
         self.node_params=[]
-        if node.name.startswith("readParam"): print("mmmmmmmmmmmmmmmmmmmmmmmmmm", self.z.allocated_var)
         for pa in node.params:
             if pa.name not in self.mod_parameters:
                 self.parameters.append(pa.name)