Merge branch 'singhbalwinder/atm/move-fv-to-se-grid-part1' into maste…

…r (PR #307)

Changed grids from FV to SE for 6 tests in acme integration test suite

This commit changes grids from FV to SE dycore for all machines and
compiler combinations using update_acme_tests.py script. Tests moved
to the SE dycore takes more time to run than the FV dycore. Following
is the run time for each test case which was moved from FV to SE dycore:

ERB B1850C5 (f19_g16 = 26m; ne16_g37 = 1h 35m)
ERS B1850C5 (f09_g16 = 26m; ne30_g16 = 35m)
ERS B1850C5 (f19_g16 = 15m; ne16_g37 = 55m)
ERT B1850C5 (f19_g16 = 1h 35m; ne16_g37 = 6h 34m)
ERS_Ld3 FC5 (f19_g16 = 5m; ne16_g37 = 15m)
SMS_D_Ld3 FC5 (f19_f19 = 24m;ne16_ne16 = 2h 38m)

[non-BFB]
AG-334

* singhbalwinder/atm/move-fv-to-se-grid-part1:
  Changed grids from FV to SE for 6 tests in acme integration test suite

scripts/acme/update_acme_tests.py

@@ -31,25 +31,25 @@
 			 'SMS.hcru_hcru.I1850CRUCLM45CN']
                         ),
     "acme_integration" : ("acme_developer",
-                          ["ERB.f19_g16.B1850C5",
+                          ["ERB.ne16_g37.B1850C5",
                            "ERB.f45_g37.B1850C5",
                            "ERH.f45_g37.B1850C5",
-                           "ERS.f09_g16.B1850C5",
+                           "ERS.ne30_g16.B1850C5",
                            "ERS.f19_f19.FAMIPC5",
-                           "ERS.f19_g16.B1850C5",
+                           "ERS.ne16_g37.B1850C5",
                            "ERS_D.f45_g37.B1850C5",
                            "ERS_IOP_Ld3.f19_f19.FAMIPC5",
-                           "ERS_Ld3.f19_g16.FC5",
+                           "ERS_Ld3.ne16_g37.FC5",
                            "ERS_Ld3.ne30_ne30.FC5",
-                           "ERT.f19_g16.B1850C5",
+                           "ERT.ne16_g37.B1850C5",
                            "PET_PT.f19_g16.X",
                            "PET_PT.f45_g37_rx1.A",
                            "PFS.ne30_ne30.FC5",
                            "SEQ_IOP_PFC.f19_g16.X",
                            "SEQ_PFC.f45_g37.B1850C5",
                            "SMS.ne16_ne16.FC5AQUAP",
                            "SMS_D.f19_g16.B20TRC5",
-                           "SMS_D_Ld3.f19_f19.FC5"]
+                           "SMS_D_Ld3.ne16_ne16.FC5"]
                           ),
 }
 

scripts/ccsm_utils/Machines/mkbatch.cascade

@@ -17,8 +17,8 @@ if ( $ntasks % ${MAX_TASKS_PER_NODE} > 0) then
 endif
 @ taskpernode = ${MAX_TASKS_PER_NODE} / ${maxthrds}
 set qname = batch
-set tlimit = "00:59:00"
-if ($CCSM_ESTCOST > 2) set tlimit = "00:59:00"
+set tlimit = "07:59:00"
+if ($CCSM_ESTCOST > 2) set tlimit = "07:59:00"
 
 if ($?TESTMODE) then
  set file = $CASEROOT/${CASE}.test