Changeset 1189 for trunk/libIGCM/libIGCM_config

Timestamp:

04/14/15 17:00:21 (9 years ago)

Author:

sdipsl

Message:

• Extend Big Brother scope to also watch post-processing jobs. Only the metrics LMDZ job for now. See #252
• Some refactoring

File:

• trunk/libIGCM/libIGCM_config/libIGCM_config.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -1248 +1248 @@
     # End of entire simulation #
     #==========================#
+    simulationIsOver=true
 
     # Mail notification
@@ -1256 +1257 @@
     IGCM_debug_Print 1 "Normal End of computation."
 
-    if ( $DEBUG_debug ) ; then
-      if [ X${ActivateBigBro} = Xtrue ] ; then
-        # RabbitMQ message code "END OF SIMULATION"
-        code=0100
-        # RabbitMQ message body
-        Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
-        # Fill the rabbitMQ queue
-        IGCM_debug_sendAMQP
-      fi
-    fi
-
-    # To be sure we flush message buffer and clean up behind us before the end of the simulation
-    FlushAMQP=TRUE
-
   else
     #=================#
     # Submit next job #
     #=================#
+    simulationIsOver=false
 
     IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "OnQueue"
@@ -1291 +1279 @@
   fi
 
-  # Supress Non Deleted Boundary files
-  #if [ ${DRYRUN} -le 2 ] ; then
-  #  IGCM_comp_DelFixeBoundaryFiles
-  #  ls -la
-  #fi
-
   # Clean ${RUN_DIR}=${RUN_DIR_PATH}/${config_UserChoices_JobName}.${$}
   # Only for production run (No clean up in DEV or DEB mode)
@@ -1303 +1285 @@
   [ X${JobType} = XRUN ] && IGCM_sys_RmRunDir -rf ${RUN_DIR_PATH}
 
-  if ( $DEBUG_debug ) ; then
-    # Inform the rabbitMQ queue
-    if [ X${ActivateBigBro} = Xtrue ] ; then
-      # RabbitMQ message code "WAITING"
-      code=1100
-      # RabbitMQ message body
-      Body=$( echo "{${genericSimulationID},\"msgCode\":\"${code}\",\"msgUID\":\"$(uuidgen)\",\"msgTimestamp\":\"$( date +"%Y-%m-%dT%H:%M:%S.%N%z" )\"}" )
-      # Fill the rabbitMQ queue
-      IGCM_debug_sendAMQP
-    fi
-  fi
+  # Inform the rabbitMQ queue
+  IGCM_debug_BigBro_Finalize
 
   IGCM_debug_PopStack "IGCM_config_Finalize"