Changeset 18 for CDB

Timestamp:

31/05/12 17:12:49 (8 years ago)

Author:

lalibert

Message:

Added a flag to remove automatic time differencing capability

File:

• CDB/trunk/driver/diag_driver_comp.py (modified) (2 diffs)

CDB/trunk/driver/diag_driver_comp.py

@@ -128 +128 @@
                     out.writei('CDB_VAR_ATTRIBUTION=`bash $CDB_SOURCE_DIR/retrieval_script.sh -d ${CDB_DIAG_NAME} -v ${CDB_VAR_LIST} -m ${CDB_MODEL} -e ${CDB_EXPT} -r ${CDB_RUN_ID} -y ${CDB_YEAR}`\n')
                     out.writei('for CDB_VAR in ${CDB_VAR_ATTRIBUTION}; do eval ${CDB_VAR}; done\n')
-                    out.writei('#Previous year\n')
-                    out.writei('let "CDB_YEAR-=1"\n')
-                    out.writei('CDB_VAR_ATTRIBUTION=`bash $CDB_SOURCE_DIR/retrieval_script.sh -d ${CDB_DIAG_NAME} -v ${CDB_VAR_LIST} -m ${CDB_MODEL} -e ${CDB_EXPT} -r ${CDB_RUN_ID} -y ${CDB_YEAR}`\n')
-                    out.writei('for CDB_VAR in ${CDB_VAR_ATTRIBUTION}; do eval PREV_${CDB_VAR}; done\n')
-                    out.writei('#Next year\n')
-                    out.writei('let "CDB_YEAR+=2"\n')
-                    out.writei('CDB_VAR_ATTRIBUTION=`bash $CDB_SOURCE_DIR/retrieval_script.sh -d ${CDB_DIAG_NAME} -v ${CDB_VAR_LIST} -m ${CDB_MODEL} -e ${CDB_EXPT} -r ${CDB_RUN_ID} -y ${CDB_YEAR}`\n')
-                    out.writei('for CDB_VAR in ${CDB_VAR_ATTRIBUTION}; do eval NEXT_${CDB_VAR}; done\n')
-                    out.writei('let "CDB_YEAR-=1"\n')
+                    if self.time_diff:
+                        out.writei('#Previous year\n')
+                        out.writei('let "CDB_YEAR-=1"\n')
+                        out.writei('CDB_VAR_ATTRIBUTION=`bash $CDB_SOURCE_DIR/retrieval_script.sh -d ${CDB_DIAG_NAME} -v ${CDB_VAR_LIST} -m ${CDB_MODEL} -e ${CDB_EXPT} -r ${CDB_RUN_ID} -y ${CDB_YEAR}`\n')
+                        out.writei('for CDB_VAR in ${CDB_VAR_ATTRIBUTION}; do eval PREV_${CDB_VAR}; done\n')
+                        out.writei('#Next year\n')
+                        out.writei('let "CDB_YEAR+=2"\n')
+                        out.writei('CDB_VAR_ATTRIBUTION=`bash $CDB_SOURCE_DIR/retrieval_script.sh -d ${CDB_DIAG_NAME} -v ${CDB_VAR_LIST} -m ${CDB_MODEL} -e ${CDB_EXPT} -r ${CDB_RUN_ID} -y ${CDB_YEAR}`\n')
+                        out.writei('for CDB_VAR in ${CDB_VAR_ATTRIBUTION}; do eval NEXT_${CDB_VAR}; done\n')
+                        out.writei('let "CDB_YEAR-=1"\n')
             elif line.lstrip()[:15].upper() == '#!END YEAR LOOP':
                 out.open.write('EndOfScriptMain\n')
@@ -378 +379 @@
                       default=False, action="store_true",
                       help="Do not put retrieval commands inside the script. For IPCC data there should not be any reason to use this feature.")
+    setup_group.add_option("--time_diff",dest="time_diff",
+                      default=False, action="store_true",
+                      help="Request the year before and the year after:
+                            allows to take a time derivative. If the years before and after are
+                            unavailable, the script terminates.")
     parser.add_option_group(proc_group)