Changeset 1399 for tags/libIGCM_v3.0_beta1/AA_create_ts

Timestamp:

07/05/17 20:18:51 (7 years ago)

Author:

sdipsl

Message:

CMIP6 workflow. Merging trunk into branch 'branch' r:1375:1398

File:

• tags/libIGCM_v3.0_beta1/AA_create_ts (modified) (2 diffs)

tags/libIGCM_v3.0_beta1/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}