1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Tue, 3 Mar 2026 00:29:51 +0900
Subject: Drop obsolete rb_clone_setup, CLONESETUP
Forwarded: not-needed
Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
---
ext/numru/netcdfraw.c | 56 ---------------------------------------------------
test/clone.rb | 49 --------------------------------------------
2 files changed, 105 deletions(-)
delete mode 100644 test/clone.rb
diff --git a/ext/numru/netcdfraw.c b/ext/numru/netcdfraw.c
index c1d0363..c90cf7e 100644
--- a/ext/numru/netcdfraw.c
+++ b/ext/numru/netcdfraw.c
@@ -508,58 +508,6 @@ nc_mark_obj(struct NetCDFVar *netcdf_var)
}
-VALUE
-NetCDF_clone(VALUE file)
-{
- VALUE clone;
- struct Netcdf *nc1, *nc2;
-
- Data_Get_Struct(file, struct Netcdf, nc1);
- nc2 = NetCDF_init(nc1->ncid, nc1->name);
- clone = Data_Wrap_Struct(cNetCDF, 0, NetCDF_free, nc2);
- CLONESETUP(clone, file);
- return clone;
-}
-
-VALUE
-NetCDF_dim_clone(VALUE dim)
-{
- VALUE clone;
- struct NetCDFDim *nd1, *nd2;
-
- Data_Get_Struct(dim, struct NetCDFDim, nd1);
- nd2 = NetCDF_dim_init(nd1->ncid, nd1->dimid);
- clone = Data_Wrap_Struct(cNetCDFDim, 0, NetCDF_dim_free, nd2);
- CLONESETUP(clone, dim);
- return clone;
-}
-
-VALUE
-NetCDF_att_clone(VALUE att)
-{
- VALUE clone;
- struct NetCDFAtt *na1, *na2;
-
- Data_Get_Struct(att, struct NetCDFAtt, na1);
- na2 = NetCDF_att_init(na1->ncid, na1->varid, na1->name);
- clone = Data_Wrap_Struct(cNetCDFAtt, 0, Netcdf_att_free, na2);
- CLONESETUP(clone, att);
- return clone;
-}
-
-VALUE
-NetCDF_var_clone(VALUE var)
-{
- VALUE clone;
- struct NetCDFVar *nv1, *nv2;
-
- Data_Get_Struct(var, struct NetCDFVar, nv1);
- nv2 = NetCDF_var_init(nv1->ncid, nv1->varid, nv1->file);
- clone = Data_Wrap_Struct(cNetCDFVar, nc_mark_obj, NetCDF_var_free, nv2);
- CLONESETUP(clone, var);
- return clone;
-}
-
VALUE
NetCDF_inq_libvers(VALUE mod)
{
@@ -4571,7 +4519,6 @@ Init_netcdfraw(void)
/* The methods of the NetCDF class */
rb_define_singleton_method(cNetCDF,"libvers",NetCDF_inq_libvers,0);
rb_define_singleton_method(cNetCDF,"nc_open",NetCDF_open,2);
- rb_define_method(cNetCDF,"clone",NetCDF_clone,0);
rb_define_method(cNetCDF,"close",NetCDF_close,0);
/* rb_define_singleton_method(cNetCDF,"new",NetCDF_open,2); */
rb_define_singleton_method(cNetCDF,"nc_create",NetCDF_create,2);
@@ -4601,7 +4548,6 @@ Init_netcdfraw(void)
/* rb_define_method(cNetCDF,"eql?",NetCDF_eql,1); */
/* The methods of the NetCDFDim class */
- rb_define_method(cNetCDFDim,"clone",NetCDF_dim_clone,0);
rb_define_method(cNetCDFDim,"length",NetCDF_dim_length,0);
rb_define_method(cNetCDFDim,"name=",NetCDF_dim_name,1);
rb_define_method(cNetCDFDim,"name",NetCDF_dim_inqname,0);
@@ -4610,7 +4556,6 @@ Init_netcdfraw(void)
/* rb_define_method(cNetCDFDim,"eql?",NetCDF_dim_eql,1); */
/* The methods of the NetCDFAtt class */
- rb_define_method(cNetCDFAtt,"clone",NetCDF_att_clone,0);
rb_define_method(cNetCDFAtt,"name",NetCDF_att_inq_name,0);
rb_define_method(cNetCDFAtt,"name=",NetCDF_att_rename,1);
rb_define_method(cNetCDFAtt,"delete",NetCDF_att_delete,0);
@@ -4629,7 +4574,6 @@ Init_netcdfraw(void)
rb_define_method(cNetCDFVar,"endian=",NetCDF_var_set_endian,1);
rb_define_method(cNetCDFVar,"endian",NetCDF_var_endian,0);
#endif
- rb_define_method(cNetCDFVar,"clone",NetCDF_var_clone,0);
rb_define_method(cNetCDFVar,"name",NetCDF_var_inq_name,0);
rb_define_method(cNetCDFVar,"ndims",NetCDF_var_ndims,0);
rb_define_method(cNetCDFVar,"vartype",NetCDF_var_vartype,0);
diff --git a/test/clone.rb b/test/clone.rb
deleted file mode 100644
index 4b85ab5..0000000
--- a/test/clone.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test/unit'
-require 'numru/netcdf'
-include NumRu
-
-class TestClone < Test::Unit::TestCase
- def setup
- @s = 'tmp.nc'
- @f = NetCDF.create(@s)
- @f.redef
- @d = @f.def_dim('x',3)
- @v = @f.def_var('x','sfloat',[@d])
- @a = @f.put_att('long_name','xx')
- @f.enddef
- @v.put([1,2,3])
- @f.freeze
- end
-
- def teardown
- @f.close
- if File.exist?(@s)
- begin
- File.delete(@s)
- rescue
- p $!
- end
- end
- end
-
- def test_clone_netcdf_path
- f = @f.clone
- assert_equal @f.path, f.path
- assert(@f.frozen? == f.frozen?)
- d = @d.clone
- assert_equal @d, d
- v = @v.clone
- assert_equal @v, v
- a = @a.clone
- assert_equal @a, a
- end
-
- def test_clone_netcdf_clone
- f = @f.clone
- assert(@f.frozen? == f.frozen?)
- # d = @d.dup
- # v = @v.dup
- # a = @a.dup
- end
-
-end
|
