Skip to content

Commit 3d0ff91

Browse files
mathomp4mathomp4
authored
Merge pull request #32 from GEOS-ESM/feature/sdrabenh/eliminate_partial_file_bug
Eliminate accidental post-processing of *.nc4-partial files
2 parents 4fcd3b8 + c417418 commit 3d0ff91

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
### Changed
1313

14-
- Update CI to use Baselibs default from CircleCI orb
15-
1614
### Fixed
1715

18-
- fixed the cmpz plots for rms and anomaly correlation
19-
2016
### Removed
2117

2218
### Deprecated
2319

20+
## [2.0.3] - 2023-08-24
21+
22+
### Changed
23+
24+
- Update CI to use Baselibs default from CircleCI orb
25+
26+
### Fixed
27+
28+
- Eliminate accidental post-processing of *.nc4-partial files
29+
- fixed the cmpz plots for rms and anomaly correlation
30+
2431
## [2.0.2] - 2023-06-28
2532

2633
### Fixed

‎post/gcmpost.script‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ if( $PLOTS[1] != "NULL" ) then
372372
# Default Model Development Case (No grads_ddf attribute)
373373
# -------------------------------------------------------
374374
cd $SOURCE/$collections[1]
375-
set monthlies = `/bin/ls -1 $expid.$collections[1].monthly* | grep -v $expid.$collections[1].monthly.clim`
375+
set monthlies = `/bin/ls -1 $expid.$collections[1].monthly* | grep -v $expid.$collections[1].monthly.clim | grep -v partial`
376376
set num = `/bin/ls -1 $monthlies | wc -l`
377377
if( $check_plot == 'NULL' ) set check_plot = TRUE
378378
@ date_node = $expdots + $ndots[1] + 4
@@ -488,16 +488,16 @@ end
488488
if( $RECDATE != "NULL" ) then
489489
if( ${#monthly_attribute} == 0 ) then
490490
/bin/rm -f ${expid}.${collection}.monthly.$RECDATE.*
491-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal | grep $RECDATE`
491+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal | grep $RECDATE | grep -v partial`
492492
else
493-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v diurnal | grep $RECDATE`
493+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v diurnal | grep $RECDATE | grep -v partial`
494494
endif
495495
else
496496
if( ${#monthly_attribute} == 0 ) then
497497
/bin/rm -f ${expid}.${collection}.monthly.*
498-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal`
498+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal | grep -v partial`
499499
else
500-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v diurnal`
500+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v diurnal | grep -v partial`
501501
endif
502502
endif
503503
echo "Collection: $collection"
@@ -584,9 +584,9 @@ foreach collection ( $collections )
584584
cd $SOURCE/holding/$collection/$date
585585

586586
if( ${#monthly_attribute} == 0 ) then
587-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal`
587+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal | grep -v partial`
588588
else
589-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v diurnal`
589+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v diurnal | grep -v partial`
590590
endif
591591

592592
set num = $#locals
@@ -767,7 +767,7 @@ foreach collection ( $collections )
767767
# Tar and Archive Dailies
768768
# -----------------------
769769
if( ${#monthly_attribute} == 0 ) then
770-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal`
770+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep -v monthly | grep -v diurnal | grep -v partial`
771771
if( $#locals != 0 ) then
772772
echo "Archiving Dailies for Collection: $collection for Date: $date"
773773
@ daily_date_node = $date_node
@@ -835,9 +835,9 @@ foreach collection ( $collections )
835835
if( ${#monthly_attribute} != 0 ) @ monthly_date_node = $date_node
836836

837837
if( ${#monthly_attribute} == 0 ) then
838-
set locals = `/bin/ls -1 | grep "${expid}.${collection}.*${ext}" | grep monthly | grep -v diurnal`
838+
set locals = `/bin/ls -1 | grep "${expid}.${collection}.*${ext}" | grep monthly | grep -v diurnal | grep -v partial`
839839
else
840-
set locals = `/bin/ls -1 | grep "${expid}.${collection}.[0-9]\{6\}01_0000z.${ext}" | grep -v diurnal`
840+
set locals = `/bin/ls -1 | grep "${expid}.${collection}.[0-9]\{6\}01_0000z.${ext}" | grep -v diurnal | grep -v partial`
841841
endif
842842

843843
echo "Archiving Monthlies for Collection: $collection for Date: $date"
@@ -896,7 +896,7 @@ foreach collection ( $collections )
896896
# Archive Monthlies (diurnal files)
897897
# ---------------------------------
898898
@ monthly_date_node = $date_node + 1 # Since diurnal is simply appended to collection name
899-
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep diurnal | grep -v monthly`
899+
set locals = `/bin/ls -1 | grep ${expid}.${collection} | grep diurnal | grep -v monthly | grep -v partial`
900900
set num = `/bin/ls -1 | grep ${expid}.${collection} | grep diurnal | grep -v monthly | wc -l`
901901
if( $num != 0 ) then
902902

@@ -1049,7 +1049,7 @@ foreach collection ( $collections )
10491049

10501050
cd $SOURCE/${collection}
10511051

1052-
set monthlies = `/bin/ls -1 $expid.${collection}.monthly* | grep -v clim`
1052+
set monthlies = `/bin/ls -1 $expid.${collection}.monthly* | grep -v clim | grep -v partial`
10531053
set num = `/bin/ls -1 $monthlies | wc -l`
10541054

10551055
# Create DDF File
@@ -1253,9 +1253,9 @@ foreach stream ($streams)
12531253
set monthly_attribute = `grep -i "^[\t ]*$collection.monthly:[\t ]*1" $HISTORYRC`
12541254
echo Checking stream: $stream for date: $date
12551255
if( ${#monthly_attribute} == 0 ) then
1256-
set checkstream = `/bin/ls -1 $SOURCE/$stream/$expid.$stream.monthly.${date}* | grep -v clim`
1256+
set checkstream = `/bin/ls -1 $SOURCE/$stream/$expid.$stream.monthly.${date}* | grep -v clim | grep -v partial`
12571257
else
1258-
set checkstream = `/bin/ls -1 $SOURCE/$stream/$expid.$stream.${date}* | grep -v clim`
1258+
set checkstream = `/bin/ls -1 $SOURCE/$stream/$expid.$stream.${date}* | grep -v clim | grep -v partial`
12591259
endif
12601260

12611261
echo checkstream: $checkstream

0 commit comments

Comments
 (0)