Index: CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card	(revision 2270)
+++ CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card	(revision 2284)
@@ -61,5 +61,4 @@
         (${config_UserChoices_JobName}_1d_grid_U.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_U.nc, Post_1D_grid_U),\
         (${config_UserChoices_JobName}_1d_grid_V.nc, ${R_OUT_OCE_O_D}/${PREFIX}_1D_grid_V.nc, Post_1D_grid_V),\
-        (${PREFIX_NWRITE}_${DATE_OPA}_diaptr.nc, ${R_OUT_OCE_NWRITE}/${PREFIX}_${WF1}_diaptr.nc, Post_1M_diaptr),\
         (damping.coeff.nc , ${R_OUT_OCE_O_D}/${PREFIX}_damping.coeff.nc, NONE),\
         (output.abort.nc  , ${R_OUT_OCE_D}/${PREFIX}_output.abort.nc, NONE),\
@@ -70,5 +69,5 @@
 [Post_1M_scalar]
 Patches = ()
-GatherWithInternal = (time_average_1mo)
+GatherWithInternal = (time_counter)
 TimeSeriesVars2D = (masso, volo, zosga, zossga, zostoga, thetaoga, soga)
 ChunckJob2D = NONE
@@ -79,8 +78,8 @@
 [Post_1M_grid_T]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1mo)
-TimeSeriesVars2D = (evs, ficeberg, friver, fsitherm, hfcorr, hfevapds, hfibthermds, hfrainds, hfrunoffds, hfsithermds, hfsnthermds, nshfls, omlmax, pbo, pr, prsn, sfdsi, so20chgt, so28chgt, sohefldo, sohtc300, soicecov, somixhgt, somxl010, sosaline, soshfldo, sossheig, sosstsst, sotaumod, sowaflcd, sowaflup, sowindsp, tossq, vsfsit, wfcorr, zossq)
-ChunckJob2D = NONE
-TimeSeriesVars3D = (rhopoto, rsds, thkcello, vosaline,votemper)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
+TimeSeriesVars2D = (sohefldo, soicecov, somixhgt, somxl010, sosaline, soshfldo, sossheig, sosstsst, sowaflup, sowindsp)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (thkcello, vosaline,votemper)
 ChunckJob3D = 50Y
 Seasonal=ON
@@ -88,8 +87,8 @@
 [Post_1M_grid_U]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1mo)
-TimeSeriesVars2D = (hfx, hfxba, hfxdiff, sozotaux)
-ChunckJob2D = NONE
-TimeSeriesVars3D = (umo, vozocrtx,vozoeivu)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
+TimeSeriesVars2D = (sozotaux)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (vozocrtx,vozoeivu)
 ChunckJob3D = 50Y
 Seasonal=ON
@@ -97,8 +96,8 @@
 [Post_1M_grid_V]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1mo)
-TimeSeriesVars2D = (hfy, hfyba, hfydiff, sometauy)
-ChunckJob2D = NONE
-TimeSeriesVars3D = (vmo, vomecrty, vomeeivv)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
+TimeSeriesVars2D = (sometauy)
+ChunckJob2D = NONE
+TimeSeriesVars3D = (vomecrty, vomeeivv)
 ChunckJob3D = 50Y
 Seasonal=ON
@@ -106,5 +105,5 @@
 [Post_1M_grid_W]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1mo)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = (soleaeiw, soleahtw)
 ChunckJob2D = NONE
@@ -115,5 +114,5 @@
 [Post_1M_diaptr]
 Patches = ()
-GatherWithInternal = (nav_lat, time_average_1mo)
+GatherWithInternal = (nav_lat, time_counter)
 TimeSeriesVars2D = (zotemglo, zosalglo, zomsfglo, zotematl, zosalatl, zomsfatl, zotempac, zosalpac, zomsfpac, zotemind, zosalind, zomsfind, zotemipc, zosalipc, zomsfipc, sohtatl, sostatl, sohtpac, sostpac, sohtind, sostind, sohtipc, sostipc, sophtadv, sophtove, sophtldf, sopstadv, sopstove, zomsfeiv, sophteiv, sopsteiv)
 ChunckJob2D = NONE
@@ -126,5 +125,5 @@
 [Post_1D_grid_T]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1d)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = (omldamax, sosstsst, tossq)
 ChunckJob2D = 200Y
@@ -135,5 +134,5 @@
 [Post_1D_grid_U]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1d)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = ()
 ChunckJob2D = 200Y
@@ -144,5 +143,5 @@
 [Post_1D_grid_V]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1d)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = ()
 ChunckJob2D = 200Y
@@ -155,5 +154,5 @@
 [Post_1Y_scalar]
 Patches = ()
-GatherWithInternal = (time_counter, time_average_1y)
+GatherWithInternal = (time_counter, time_counter)
 TimeSeriesVars2D = (masso, volo, zosga, zossga, zostoga, thetaoga, soga)
 ChunckJob2D = NONE
@@ -164,5 +163,5 @@
 [Post_1Y_grid_T]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1y)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = (evs, ficeberg, friver, fsitherm, hfcorr, hfevapds, hfibthermds, hfrainds, hfrunoffds, hfsithermds, hfsnthermds, nshfls, omlmax, pbo, pr, prsn, sfdsi, so20chgt, so28chgt, sohefldo, sohtc300, soicecov, somixhgt, somxl010, sosaline, soshfldo, sossheig, sosstsst, sotaumod, sowaflcd, sowaflup, sowindsp, tossq, vsfsit, wfcorr, zossq)
 ChunckJob2D = NONE
@@ -173,5 +172,5 @@
 [Post_1Y_grid_U]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1y)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = (hfx, hfxba, hfxdiff, sozotaux)
 ChunckJob2D = NONE
@@ -182,5 +181,5 @@
 [Post_1Y_grid_V]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1y)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = (hfy, hfyba, hfydiff, sometauy)
 ChunckJob2D = NONE
@@ -191,5 +190,5 @@
 [Post_1Y_grid_W]
 Patches = ()
-GatherWithInternal = (nav_lon, nav_lat, time_average_1y)
+GatherWithInternal = (nav_lon, nav_lat, time_counter)
 TimeSeriesVars2D = (soleaeiw, soleahtw)
 ChunckJob2D = NONE
@@ -200,5 +199,5 @@
 [Post_1Y_diaptr]
 Patches = ()
-GatherWithInternal = (nav_lat, time_average_1y)
+GatherWithInternal = (nav_lat, time_counter)
 TimeSeriesVars2D = (zotemglo, zosalglo, zomsfglo, zotematl, zosalatl, zomsfatl, zotempac, zosalpac, zomsfpac, zotemind, zosalind, zomsfind, zotemipc, zosalipc, zomsfipc, sohtatl, sostatl, sohtpac, sostpac, sohtind, sostind, sohtipc, sostipc, sophtadv, sophtove, sophtldf, sopstadv, sopstove, zomsfeiv, sophteiv, sopsteiv)
 ChunckJob2D = NONE
