Merge pull request #5 from mcwimm/main

Add modules
pymanga · Jun 28, 2023 · 12f6f6f · 12f6f6f
2 parents a391830 + 2517b71
commit 12f6f6f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 __pycache__/
 .idea
-docs/
+docs/
+**.pyc
diff --git a/CreateProjectFiles/Constructors/CreateXML.py b/CreateProjectFiles/Constructors/CreateXML.py
@@ -63,6 +63,7 @@ def setModules(self, bg_keywords, ag_keywords, pd_keywords, mt_keywords, pop_key
             mt = Mortality(mt_keywords["mortality"])
         mt.setModule(mt_keywords)
         mt_module = mt.getModule()
+        pd_module.append(mt_module)
 
         # Set population
         if not pop_keywords:
@@ -103,10 +104,8 @@ def setModules(self, bg_keywords, ag_keywords, pd_keywords, mt_keywords, pop_key
                     ag_module,
                     bg_module,
                     ),
-                E.plant_dynamics(
-                    pd_module,
-                    mt_module
-                ),
+            pd_module,
+            #mt_module,
                 E.population(pop_module),
                 tl_module,
                 op_module,

diff --git a/CreateProjectFiles/Constructors/PlantDynamics/PlantDynamics.py b/CreateProjectFiles/Constructors/PlantDynamics/PlantDynamics.py
@@ -19,14 +19,14 @@ def setModule(self, keywords):
             self.setBettina(keywords)
         if self.module_name == "Kiwi":
             self.setKiwi(keywords)
-        if self.module_name == "BettinaNetwork":
+        if self.module_name == "NetworkBettina":
             self.setBettinaNetwork(keywords)
 
     def getModule(self):
         return self.module
 
     def setDefault(self):
-        self.module = E.type('SimpleTest')
+        self.module = E.plant_dynamics(E.type('SimpleTest'))
 
     def setBettina(self, keywords):
         self.module = E.type(keywords['type'])
@@ -35,5 +35,9 @@ def setKiwi(self, keywords):
         pass
 
     def setBettinaNetwork(self, keywords):
-        pass
+        self.module = E.plant_dynamics(
+            E.type(keywords['type']),
+            E.f_growth(keywords['f_growth']),
+            E.variant(keywords['variant']))
+
 
diff --git a/CreateProjectFiles/Constructors/Population/Population.py b/CreateProjectFiles/Constructors/Population/Population.py
@@ -51,4 +51,12 @@ def setRandom(self, keywords):
         )
 
     def setGroupFromFile(self, keywords):
-        pass
+        self.module = E.group(
+            E.name(keywords['name']),
+            E.species(keywords['species']),
+            E.distribution(
+                E.type(keywords['type']),
+                E.n_recruitment_per_step(keywords['n_recruitment_per_step']),
+                E.filename(keywords['filename'])
+                )
+            )
diff --git a/CreateProjectFiles/Constructors/Resources/Belowground.py b/CreateProjectFiles/Constructors/Resources/Belowground.py
@@ -24,6 +24,8 @@ def setModule(self, keywords):
             self.setFixedSalinity(keywords)
         if self.module_name == "SymmetricZOI":
             self.setSZoi(keywords)
+        if self.module_name == "NetworkFixedSalinity":
+            self.setNetworkFixedSalinity(keywords)
 
     def getModule(self):
         return self.module
@@ -39,6 +41,14 @@ def setFixedSalinity(self, keywords):
                         E.max_x(keywords['max_x']),
                         E.salinity(keywords['salinity'])
                     )
+    def setNetworkFixedSalinity(self, keywords):
+        self.module = E.belowground(
+                        E.type(keywords['type']),
+                        E.f_radius(keywords['f_radius']),
+                        E.min_x(keywords['min_x']),
+                        E.max_x(keywords['max_x']),
+                        E.salinity(keywords['salinity'])
+                    )
 
     def setSZoi(self, keywords):
         self.module = E.belowground(