Changeset 694 for trunk

Timestamp:

06/29/12 16:21:12 (12 years ago)

Author:

sdipsl

Message:

• add a switch to reconstruct station files from LMDZ
• do not re-order stations according to the CFMIP ordering (way too expansive in I/O). Will do that in memory during the cmor process

Location:

trunk/libIGCM

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_mercure.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -1100 +1100 @@
                 echo "export R_SAVE=${R_SAVE}                           " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                 echo "export R_BUFR=${R_BUFR}                           " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                echo "export R_OUT_KSH=${R_OUT_KSH}                     " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+                echo "export R_BUF_KSH=${R_BUF_KSH}                     " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
                 echo "export config_UserChoices_JobName=${config_UserChoices_JobName} " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
               fi
@@ -1105 +1107 @@
             # Prepare the shell dedicated to offline rebuild
             if [ $DRYRUN -le 1 ]; then
-              echo "IGCM_sys_rebuild ${file_in} ${generic_file_name}_*.nc" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
-              echo "IGCM_debug_Verif_Exit_Post                           " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+              if [ ${file_in} = histstn.nc ] ; then
+                echo "IGCM_sys_rebuild_station ${file_in} ${generic_file_name}_*.nc" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+              else
+                echo "IGCM_sys_rebuild ${file_in} ${generic_file_name}_*.nc" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+              fi
+              echo "IGCM_debug_Verif_Exit_Post" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
             fi
             #

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -1510 +1510 @@
   IGCM_sys_ncpdq -a time_counter,x -a time_counter,presnivs,x histstn_xt.nc ${file_out}
 
+  # Station re-ordering is too expansive to be run within libICGM
+  # This is due to (ncpdq - nrcat - ncpdq) I/O sequence.
+  # This re-ordering must be done "in memory" by the cmorization process
+  # Anyway this is the best sequence using (ncpdq - nrcat - ncpdq)
+  # BEGIN reordering
+
+  # Only LMDZ text output contains the exact ordering of the station.
+  # We isolate this in the code below:
+  #  0  38  -157.5000000000000  70.98591549295774
+  #  0  54  27.49999999999999   67.18309859154928
+  #  0  56  -62.50000000000001  82.39436619718309
+  #  0  79  12.49999999999999   78.59154929577466
+  #  0  116 -165.0000000000000  76.05633802816901
+  #  0  117 130.0000000000000   70.98591549295774
+  #  0  118 110.0000000000000   87.46478873239437
+  #  1  40  4.999999999999995   51.97183098591550
+#  typeset iStation iProc list_opt file_in file_out prefix_invert
+#  typeset -Z4 j4
+#  typeset -Z3 j3
+
+#  unset list_opt
+#  set +A list_opt $@
+
+  # Filename after rebuild
+#  file_out=${list_opt[0]}
+  # Prefix of output files
+#  prefix_invert=$( basename ${file_out} .nc )
+  # Number of procs
+#  num_proc=$( grep -i mpi_size ${PREFIX}_${Exe_Output} | wc -l )
+
+#  iProc=0
+#  while [ ${iProc} -lt ${num_proc} ] ; do
+    # Array containing Station as a number
+#    unset proc_stn
+#    set +A proc_stn $( grep "iophy_mpi rank ip lon lat  $iProc" ${PREFIX}_${Exe_Output} | sed -e "s/iophy_mpi rank ip lon lat //g" | awk ' {print $2}' )
+    # Number of stations produced by processor proc
+#    stationLast=${#proc_stn[*]}
+    # Proc number on 4 digits
+#    j4=${iProc}
+    # Init
+#    iStation=0
+#    while [ ${iStation} -lt ${stationLast} ] ; do
+      # Station number on 3 digits
+#      j3=${proc_stn[${iStation}]}
+      # Extract station
+      # Invert Axis : t,x -> x,t 
+      #               t,pres,x -> x,t,pres
+      # So that we can concatenate along x
+#      IGCM_sys_ncpdq -a x,time_counter -a x,time_counter,presnivs -d x,$iStation,$iStation ${prefix_invert}_${j4}.nc ${prefix_invert}_stn_${j3}.nc
+#      (( iStation = iStation + 1 ))
+#    done
+#    (( iProc = iProc + 1 ))
+#  done
+
+  # Concatenate all station along x
+#  IGCM_sys_ncrcat ${prefix_invert}_stn_???.nc ${prefix_invert}_xt.nc
+
+  # Re-invert file
+#  IGCM_sys_ncpdq -a time_counter,x -a time_counter,presnivs,x ${prefix_invert}_xt.nc ${file_out}
+
+  # END reordering
+
   IGCM_debug_PopStack "IGCM_sys_rebuild_station"
 }