Skip to content

Commit d594254

Browse files
authored
Changes from svn r136
Changes from svn r82 through r136 were lost. This branch restores those changes (but not their authorship or detailed history) based on a recovered snapshot of r136.
2 parents 71de17b + 5746e82 commit d594254

File tree

114 files changed

+448345
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+448345
-520
lines changed

MODISdata/niwotAllDataMODIS.clim

Lines changed: 8158 additions & 0 deletions
Large diffs are not rendered by default.

MODISdata/niwotAllDataMODIS.out

Lines changed: 8158 additions & 0 deletions
Large diffs are not rendered by default.

Makefile

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,46 +9,39 @@ ESTIMATE_OFILES=$(ESTIMATE_CFILES:.c=.o)
99
SENSTEST_CFILES=sipnet.c sensTest.c paramchange.c runmean.c util.c spatialParams.c namelistInput.c outputItems.c
1010
SENSTEST_OFILES=$(SENSTEST_CFILES:.c=.o)
1111

12-
SENSTESTFULL_CFILES=sipnet.c sensTestFull.c paramchange.c runmean.c util.c spatialParams.c outputItems.c
13-
SENSTESTFULL_OFILES=$(SENSTESTFULL_CFILES:.c=.o)
14-
1512
SIPNET_CFILES=sipnet.c frontend.c runmean.c util.c spatialParams.c namelistInput.c outputItems.c
1613
SIPNET_OFILES=$(SIPNET_CFILES:.c=.o)
1714

18-
SIPNETGIRDLE_CFILES=sipnetGirdle.c frontendGirdle.c runmean.c util.c spatialParams.c
19-
SIPNETGIRDLE_OFILES=$(SIPNETGIRDLE_CFILES:.c=.o)
20-
2115
TRANSPOSE_CFILES=transpose.c util.c
2216
TRANSPOSE_OFILES=$(TRANSPOSE_CFILES:.c=.o)
2317

2418
SUBSET_DATA_CFILES=subsetData.c util.c namelistInput.c
2519
SUBSET_DATA_OFILES=$(SUBSET_DATA_CFILES:.c=.o)
2620

27-
all: estimate sensTest sensTestFull sipnet sipnetGirdle transpose subsetData
21+
# all: estimate sensTest sipnet transpose subsetData
22+
all: estimate sipnet transpose subsetData
2823

2924
estimate: $(ESTIMATE_OFILES)
3025
$(LD) $(LIBLINKS) -o estimate $(ESTIMATE_OFILES)
3126

32-
sensTest: $(SENSTEST_OFILES)
33-
$(LD) $(LIBLINKS) -o sensTest $(SENSTEST_OFILES)
34-
35-
sensTestFull: $(SENSTESTFULL_OFILES)
36-
$(LD) $(LIBLINKS) -o sensTestFull $(SENSTESTFULL_OFILES)
27+
#sensTest: $(SENSTEST_OFILES)
28+
# $(LD) $(LIBLINKS) -o sensTest $(SENSTEST_OFILES)
3729

3830
sipnet: $(SIPNET_OFILES)
3931
$(LD) $(LIBLINKS) -o sipnet $(SIPNET_OFILES)
4032

41-
sipnetGirdle: $(SIPNETGIRDLE_OFILES)
42-
$(LD) $(LIBLINKS) -o sipnetGirdle $(SIPNETGIRDLE_OFILES)
43-
4433
transpose: $(TRANSPOSE_OFILES)
4534
$(LD) $(LIBLINKS) -o transpose $(TRANSPOSE_OFILES)
4635

4736
subsetData: $(SUBSET_DATA_OFILES)
4837
$(LD) $(LIBLINKS) -o subsetData $(SUBSET_DATA_OFILES)
4938

5039
clean:
51-
rm -f $(ESTIMATE_OFILES) $(SENSTEST_OFILES) $(SENSTESTFULL_OFILES) $(SIPNET_OFILES) $(SIPNETGIRDLE_OFILES) $(TRANSPOSE_OFILES) $(SUBSET_DATA_OFILES) estimate sensTest sensTestFull sipnet sipnetGirdle transpose subsetData
40+
rm -f $(ESTIMATE_OFILES) $(SIPNET_OFILES) $(TRANSPOSE_OFILES) $(SUBSET_DATA_OFILES) estimate sensTest sipnet transpose subsetData
41+
42+
#clean:
43+
# rm -f $(ESTIMATE_OFILES) $(SENSTEST_OFILES) $(SIPNET_OFILES) $(TRANSPOSE_OFILES) $(SUBSET_DATA_OFILES) estimate sensTest sipnet transpose subsetData
44+
5245

5346
#This target automatically builds dependencies.
5447
depend::
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)