refactor

input/bf_nemo_1.json

@@ -26,5 +26,7 @@
 		}
 	],
 	"timeperiod": 3,
+	"maxperiod" : 47,
 	"domain" : "BF_NEMO"
+
 }
\ No newline at end of file

input/helcom_nemo_1.json

@@ -38,5 +38,6 @@
 		}
 	],
 	"timeperiod": 3,
+	"maxperiod" : 200,	
 	"domain" : "HELCOM_NEMO"
 }
\ No newline at end of file

input/helcom_nemo_2.json

@@ -26,6 +26,7 @@
         }
     ],
     "timeperiod": 3,
+	"maxperiod" : 200,    
     "domain" : "HELCOM_NEMO"
 
 }
\ No newline at end of file

input/vn_nemo_1.json

@@ -26,5 +26,6 @@
 		}
 	],
 	"timeperiod": 3,
+	"maxperiod" : 59,	
 	"domain" : "VN_NEMO"	
 }
\ No newline at end of file

runner/model.py

@@ -35,6 +35,8 @@ class Runner(object):
     end = datetime.utcnow()
     end += timedelta(hours=jdata['timeperiod'])
     if (timeperiod):
+      if (timeperiod > jdata['maxperiod']):
+        timeperiod = jdata['maxperiod']
       end = datetime.utcnow()
       end += timedelta(hours=timeperiod)
     setting['end'] = end.strftime("%Y-%m-%d %H:%M")+':00'

validate.py

@@ -13,11 +13,12 @@ def main(method):
       for m in mlist:
         m(24, 'validate', 300);
         sleep(3)
-    elif method == 'b':
-       raise ValueError('B is not implemented')  
+    elif method == 'long':
+      for m in mlist:
+        m(200, 'validate', 300);
+        sleep(3)
     else:
        raise ValueError('Validation method is not defined. Try using python validate.py all')  
-      
     sys.exit(0)
   except Exception as error:
     print error    
@@ -29,5 +30,5 @@ if __name__ == "__main__":
   method = ''
   if (len(sys.argv) > 1):
     method = sys.argv[1]
-  main(method)
+    main(method)
   
\ No newline at end of file