Merge branch 'develop' into f/FAST_CpSurface

johnjasa · Jun 17, 2020 · 2b4149d · 2b4149d
2 parents d2c26ea + ffa17c9
commit 2b4149d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "ROSCO"]
 	path = ROSCO
 	url = https://github.com/NREL/ROSCO.git
-	branch = develop
diff --git a/ROSCO_toolbox/turbine.py b/ROSCO_toolbox/turbine.py
@@ -195,7 +195,7 @@ def load_from_fast(self, FAST_InputFile,FAST_directory, FAST_ver='OpenFAST',dev_
             self.precone = fast.fst_vt['ElastoDyn']['PreCone(1)']
         self.yaw = 0.0
         self.J = self.rotor_inertia + self.generator_inertia * self.Ng**2
-        self.rated_torque = self.rated_power/(self.GenEff/100*self.rated_rotor_speed*self.Ng)
+        self.rated_torque = self.rated_power/(self.GenEff/100*self.rated_rotor_speed*self.Ng*self.GBoxEff/100)
         self.max_torque = self.rated_torque * 1.1
         self.rotor_radius = self.TipRad
         # self.omega_dt = np.sqrt(self.DTTorSpr/self.J)