Changeset 1393

Timestamp:

06/15/17 16:56:51 (7 years ago)

Author:

sdipsl

Message:

• remove TS_MO_YE creation. XIOS can handle this much better now.
• cosmetics

Location:

trunk/libIGCM

Files:

• AA_clean_latestPackperiod (modified) (2 diffs)
• AA_create_ts (modified) (2 diffs)

trunk/libIGCM/AA_clean_latestPackperiod

@@ -256 +256 @@
         IGCM_sys_Rm ${SUBMIT_DIR}/run.card
       else
-        #Â Update run.card
+        # Update run.card
         cp ${SUBMIT_DIR}/run.card ${SUBMIT_DIR}/run.card.old
         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "OnQueue"
@@ -264 +264 @@
         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodDateEnd \
                               $( IGCM_date_HumanDigit ${PeriodDateEnd} )
-        #Â Update job
+        # Update job
         cp Job_${config_UserChoices_JobName} Job_${config_UserChoices_JobName}.old
         sed -e "s/\(#.*Script_Output_${config_UserChoices_JobName}\.\)\([0-9]*\)\(.*\)/\1${Suffix}\3/" \

trunk/libIGCM/AA_create_ts

@@ -736 +736 @@
         #
         if [ "${DEPOT}" = "TRUE" ] ; then
-          # YEARLY AVERAGE DERIVED FROM MONTHLY MEAN
-          if ( [ ${FlagDir} = "1M" ] && [ -f ${file_out} ] ) ; then
-            file_before_YE=${config_UserChoices_JobName}_${DateBegin}_${DATE_FIN_JOB_B}_1Y_${var}.nc
-            file_out_YE=${config_UserChoices_JobName}_${DATE_BUILD_END}_1Y_${var}.nc
-            #
-            # Compute yearly average considering calendar
-            IGCM_sys_cdo yearmonmean -selvar,${var} ${file_out} ${file_out_YE}
-            # Extract all ancillary variables except $var, they will be appended after the cdo command
-            # Needed because cdo applies calculs on all variables
-            IGCM_sys_ncks -Oh -x -v ${var} ${file_out} ${file_out_YE%%.nc}_tmp1.nc
-            # This will remove the time axis because cdo rewrites severely with only considered useful variables
-            IGCM_sys_cdo -mulc,1 ${file_out_YE%%.nc}_tmp1.nc ${file_out_YE%%.nc}_tmp2.nc 2>/dev/null
-            if [ $? -eq 0 ] ; then
-              # Now append all ancillary variables if previous cdo operator ok
-              IGCM_sys_ncks -h -A ${file_out_YE%%.nc}_tmp2.nc ${file_out_YE}
-            fi
-
-            # Put global history attribut
-            IGCM_sys_ncatted -Oh -a history,global,o,c,"build by libIGCM/create_ts" ${file_out_YE}
-            IGCM_debug_Verif_Exit
-            #
-            eval IGCM_sys_Put_Out ${file_out_YE} \${R_OUT_${comp}}/Analyse/TS_MO_YE/${file_out_YE}
-            [ "${FLAG_B}" = "TRUE" ] && eval MENAGE \${R_OUT_${comp}}/Analyse/TS_MO_YE/ ${file_before_YE} ${file_out_YE}
-            IGCM_sys_Rm ${file_out_YE%%.nc}_tmp*.nc
-          fi
           # WE PUT FINAL FILE ON FILE SYSTEM
           [ "${FLAG_B}" = "FALSE" ] && file_out=${config_UserChoices_JobName}_${DATE_BUILD}_${FlagDir}_${var}.nc
@@ -786 +761 @@
 # DODS copy
 for comp in ${config_ListOfComponents[*]} ; do
-  for TS_Dir in TS_YE TS_MO TS_MO_YE TS_DA TS_HF TS_INS ; do
+  for TS_Dir in TS_YE TS_MO TS_DA TS_HF TS_INS ; do
     IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/${TS_Dir}
     [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/${TS_Dir}