Changeset 445 for XIOS/trunk/src/interface
- Timestamp:
- 06/19/13 10:09:36 (11 years ago)
- Location:
- XIOS/trunk/src/interface
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/interface/c/icdata.cpp
r403 r445 102 102 } 103 103 104 104 void cxios_solve_inheritance() 105 { 106 CTimer::get("XIOS").resume() ; 107 CContext* context = CContext::getCurrent() ; 108 context->solveAllInheritance(false) ; 109 CTimer::get("XIOS").suspend() ; 110 } 105 111 106 112 // ---------------------- Ecriture des données ------------------------------ -
XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(axis_hdl->long_name.get Value(),long_name , long_name_size))32 if(!string_copy(axis_hdl->long_name.getInheritedValue(),long_name , long_name_size)) 33 33 ERROR("void cxios_get_axis_long_name(axis_Ptr axis_hdl, char * long_name, int long_name_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !axis_hdl->long_name.isEmpty();40 return axis_hdl->long_name.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 57 57 { 58 58 CTimer::get("XIOS").resume(); 59 if(!string_copy(axis_hdl->name.get Value(),name , name_size))59 if(!string_copy(axis_hdl->name.getInheritedValue(),name , name_size)) 60 60 ERROR("void cxios_get_axis_name(axis_Ptr axis_hdl, char * name, int name_size)", <<"Input string is to short"); 61 61 CTimer::get("XIOS").suspend(); … … 65 65 { 66 66 CTimer::get("XIOS").resume(); 67 return !axis_hdl->name.isEmpty();67 return axis_hdl->name.hasInheritedValue(); 68 68 CTimer::get("XIOS").suspend(); 69 69 } … … 84 84 { 85 85 CTimer::get("XIOS").resume(); 86 if(!string_copy(axis_hdl->positive.get StringValue(),positive , positive_size))86 if(!string_copy(axis_hdl->positive.getInheritedStringValue(),positive , positive_size)) 87 87 ERROR("void cxios_get_axis_positive(axis_Ptr axis_hdl, char * positive, int positive_size)", <<"Input string is to short"); 88 88 CTimer::get("XIOS").suspend(); … … 92 92 { 93 93 CTimer::get("XIOS").resume(); 94 return !axis_hdl->positive.isEmpty();94 return axis_hdl->positive.hasInheritedValue(); 95 95 CTimer::get("XIOS").suspend(); 96 96 } … … 108 108 void cxios_get_axis_size(axis_Ptr axis_hdl, int* size) 109 109 { 110 *size = axis_hdl->size.get Value();110 *size = axis_hdl->size.getInheritedValue(); 111 111 } 112 112 … … 114 114 { 115 115 CTimer::get("XIOS").resume(); 116 return !axis_hdl->size.isEmpty();116 return axis_hdl->size.hasInheritedValue(); 117 117 CTimer::get("XIOS").suspend(); 118 118 } … … 133 133 { 134 134 CTimer::get("XIOS").resume(); 135 if(!string_copy(axis_hdl->standard_name.get Value(),standard_name , standard_name_size))135 if(!string_copy(axis_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size)) 136 136 ERROR("void cxios_get_axis_standard_name(axis_Ptr axis_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short"); 137 137 CTimer::get("XIOS").suspend(); … … 141 141 { 142 142 CTimer::get("XIOS").resume(); 143 return !axis_hdl->standard_name.isEmpty();143 return axis_hdl->standard_name.hasInheritedValue(); 144 144 CTimer::get("XIOS").suspend(); 145 145 } … … 160 160 { 161 161 CTimer::get("XIOS").resume(); 162 if(!string_copy(axis_hdl->unit.get Value(),unit , unit_size))162 if(!string_copy(axis_hdl->unit.getInheritedValue(),unit , unit_size)) 163 163 ERROR("void cxios_get_axis_unit(axis_Ptr axis_hdl, char * unit, int unit_size)", <<"Input string is to short"); 164 164 CTimer::get("XIOS").suspend(); … … 168 168 { 169 169 CTimer::get("XIOS").resume(); 170 return !axis_hdl->unit.isEmpty();170 return axis_hdl->unit.hasInheritedValue(); 171 171 CTimer::get("XIOS").suspend(); 172 172 } … … 187 187 CTimer::get("XIOS").resume(); 188 188 CArray<double,1> tmp(value,shape(extent1),neverDeleteData) ; 189 tmp=axis_hdl->value ;189 tmp=axis_hdl->value.getInheritedValue() ; 190 190 CTimer::get("XIOS").suspend(); 191 191 } … … 194 194 { 195 195 CTimer::get("XIOS").resume(); 196 return !axis_hdl->value.isEmpty();196 return axis_hdl->value.hasInheritedValue(); 197 197 CTimer::get("XIOS").suspend(); 198 198 } … … 210 210 void cxios_get_axis_zoom_begin(axis_Ptr axis_hdl, int* zoom_begin) 211 211 { 212 *zoom_begin = axis_hdl->zoom_begin.get Value();212 *zoom_begin = axis_hdl->zoom_begin.getInheritedValue(); 213 213 } 214 214 … … 216 216 { 217 217 CTimer::get("XIOS").resume(); 218 return !axis_hdl->zoom_begin.isEmpty();218 return axis_hdl->zoom_begin.hasInheritedValue(); 219 219 CTimer::get("XIOS").suspend(); 220 220 } … … 232 232 void cxios_get_axis_zoom_end(axis_Ptr axis_hdl, int* zoom_end) 233 233 { 234 *zoom_end = axis_hdl->zoom_end.get Value();234 *zoom_end = axis_hdl->zoom_end.getInheritedValue(); 235 235 } 236 236 … … 238 238 { 239 239 CTimer::get("XIOS").resume(); 240 return !axis_hdl->zoom_end.isEmpty();240 return axis_hdl->zoom_end.hasInheritedValue(); 241 241 CTimer::get("XIOS").suspend(); 242 242 } … … 254 254 void cxios_get_axis_zoom_size(axis_Ptr axis_hdl, int* zoom_size) 255 255 { 256 *zoom_size = axis_hdl->zoom_size.get Value();256 *zoom_size = axis_hdl->zoom_size.getInheritedValue(); 257 257 } 258 258 … … 260 260 { 261 261 CTimer::get("XIOS").resume(); 262 return !axis_hdl->zoom_size.isEmpty();262 return axis_hdl->zoom_size.hasInheritedValue(); 263 263 CTimer::get("XIOS").suspend(); 264 264 } -
XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(axisgroup_hdl->group_ref.get Value(),group_ref , group_ref_size))32 if(!string_copy(axisgroup_hdl->group_ref.getInheritedValue(),group_ref , group_ref_size)) 33 33 ERROR("void cxios_get_axisgroup_group_ref(axisgroup_Ptr axisgroup_hdl, char * group_ref, int group_ref_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !axisgroup_hdl->group_ref.isEmpty();40 return axisgroup_hdl->group_ref.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 57 57 { 58 58 CTimer::get("XIOS").resume(); 59 if(!string_copy(axisgroup_hdl->long_name.get Value(),long_name , long_name_size))59 if(!string_copy(axisgroup_hdl->long_name.getInheritedValue(),long_name , long_name_size)) 60 60 ERROR("void cxios_get_axisgroup_long_name(axisgroup_Ptr axisgroup_hdl, char * long_name, int long_name_size)", <<"Input string is to short"); 61 61 CTimer::get("XIOS").suspend(); … … 65 65 { 66 66 CTimer::get("XIOS").resume(); 67 return !axisgroup_hdl->long_name.isEmpty();67 return axisgroup_hdl->long_name.hasInheritedValue(); 68 68 CTimer::get("XIOS").suspend(); 69 69 } … … 84 84 { 85 85 CTimer::get("XIOS").resume(); 86 if(!string_copy(axisgroup_hdl->name.get Value(),name , name_size))86 if(!string_copy(axisgroup_hdl->name.getInheritedValue(),name , name_size)) 87 87 ERROR("void cxios_get_axisgroup_name(axisgroup_Ptr axisgroup_hdl, char * name, int name_size)", <<"Input string is to short"); 88 88 CTimer::get("XIOS").suspend(); … … 92 92 { 93 93 CTimer::get("XIOS").resume(); 94 return !axisgroup_hdl->name.isEmpty();94 return axisgroup_hdl->name.hasInheritedValue(); 95 95 CTimer::get("XIOS").suspend(); 96 96 } … … 111 111 { 112 112 CTimer::get("XIOS").resume(); 113 if(!string_copy(axisgroup_hdl->positive.get StringValue(),positive , positive_size))113 if(!string_copy(axisgroup_hdl->positive.getInheritedStringValue(),positive , positive_size)) 114 114 ERROR("void cxios_get_axisgroup_positive(axisgroup_Ptr axisgroup_hdl, char * positive, int positive_size)", <<"Input string is to short"); 115 115 CTimer::get("XIOS").suspend(); … … 119 119 { 120 120 CTimer::get("XIOS").resume(); 121 return !axisgroup_hdl->positive.isEmpty();121 return axisgroup_hdl->positive.hasInheritedValue(); 122 122 CTimer::get("XIOS").suspend(); 123 123 } … … 135 135 void cxios_get_axisgroup_size(axisgroup_Ptr axisgroup_hdl, int* size) 136 136 { 137 *size = axisgroup_hdl->size.get Value();137 *size = axisgroup_hdl->size.getInheritedValue(); 138 138 } 139 139 … … 141 141 { 142 142 CTimer::get("XIOS").resume(); 143 return !axisgroup_hdl->size.isEmpty();143 return axisgroup_hdl->size.hasInheritedValue(); 144 144 CTimer::get("XIOS").suspend(); 145 145 } … … 160 160 { 161 161 CTimer::get("XIOS").resume(); 162 if(!string_copy(axisgroup_hdl->standard_name.get Value(),standard_name , standard_name_size))162 if(!string_copy(axisgroup_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size)) 163 163 ERROR("void cxios_get_axisgroup_standard_name(axisgroup_Ptr axisgroup_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short"); 164 164 CTimer::get("XIOS").suspend(); … … 168 168 { 169 169 CTimer::get("XIOS").resume(); 170 return !axisgroup_hdl->standard_name.isEmpty();170 return axisgroup_hdl->standard_name.hasInheritedValue(); 171 171 CTimer::get("XIOS").suspend(); 172 172 } … … 187 187 { 188 188 CTimer::get("XIOS").resume(); 189 if(!string_copy(axisgroup_hdl->unit.get Value(),unit , unit_size))189 if(!string_copy(axisgroup_hdl->unit.getInheritedValue(),unit , unit_size)) 190 190 ERROR("void cxios_get_axisgroup_unit(axisgroup_Ptr axisgroup_hdl, char * unit, int unit_size)", <<"Input string is to short"); 191 191 CTimer::get("XIOS").suspend(); … … 195 195 { 196 196 CTimer::get("XIOS").resume(); 197 return !axisgroup_hdl->unit.isEmpty();197 return axisgroup_hdl->unit.hasInheritedValue(); 198 198 CTimer::get("XIOS").suspend(); 199 199 } … … 214 214 CTimer::get("XIOS").resume(); 215 215 CArray<double,1> tmp(value,shape(extent1),neverDeleteData) ; 216 tmp=axisgroup_hdl->value ;216 tmp=axisgroup_hdl->value.getInheritedValue() ; 217 217 CTimer::get("XIOS").suspend(); 218 218 } … … 221 221 { 222 222 CTimer::get("XIOS").resume(); 223 return !axisgroup_hdl->value.isEmpty();223 return axisgroup_hdl->value.hasInheritedValue(); 224 224 CTimer::get("XIOS").suspend(); 225 225 } … … 237 237 void cxios_get_axisgroup_zoom_begin(axisgroup_Ptr axisgroup_hdl, int* zoom_begin) 238 238 { 239 *zoom_begin = axisgroup_hdl->zoom_begin.get Value();239 *zoom_begin = axisgroup_hdl->zoom_begin.getInheritedValue(); 240 240 } 241 241 … … 243 243 { 244 244 CTimer::get("XIOS").resume(); 245 return !axisgroup_hdl->zoom_begin.isEmpty();245 return axisgroup_hdl->zoom_begin.hasInheritedValue(); 246 246 CTimer::get("XIOS").suspend(); 247 247 } … … 259 259 void cxios_get_axisgroup_zoom_end(axisgroup_Ptr axisgroup_hdl, int* zoom_end) 260 260 { 261 *zoom_end = axisgroup_hdl->zoom_end.get Value();261 *zoom_end = axisgroup_hdl->zoom_end.getInheritedValue(); 262 262 } 263 263 … … 265 265 { 266 266 CTimer::get("XIOS").resume(); 267 return !axisgroup_hdl->zoom_end.isEmpty();267 return axisgroup_hdl->zoom_end.hasInheritedValue(); 268 268 CTimer::get("XIOS").suspend(); 269 269 } … … 281 281 void cxios_get_axisgroup_zoom_size(axisgroup_Ptr axisgroup_hdl, int* zoom_size) 282 282 { 283 *zoom_size = axisgroup_hdl->zoom_size.get Value();283 *zoom_size = axisgroup_hdl->zoom_size.getInheritedValue(); 284 284 } 285 285 … … 287 287 { 288 288 CTimer::get("XIOS").resume(); 289 return !axisgroup_hdl->zoom_size.isEmpty();289 return axisgroup_hdl->zoom_size.hasInheritedValue(); 290 290 CTimer::get("XIOS").suspend(); 291 291 } -
XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(context_hdl->calendar_type.get Value(),calendar_type , calendar_type_size))32 if(!string_copy(context_hdl->calendar_type.getInheritedValue(),calendar_type , calendar_type_size)) 33 33 ERROR("void cxios_get_context_calendar_type(context_Ptr context_hdl, char * calendar_type, int calendar_type_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !context_hdl->calendar_type.isEmpty();40 return context_hdl->calendar_type.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 57 57 { 58 58 CTimer::get("XIOS").resume(); 59 if(!string_copy(context_hdl->output_dir.get Value(),output_dir , output_dir_size))59 if(!string_copy(context_hdl->output_dir.getInheritedValue(),output_dir , output_dir_size)) 60 60 ERROR("void cxios_get_context_output_dir(context_Ptr context_hdl, char * output_dir, int output_dir_size)", <<"Input string is to short"); 61 61 CTimer::get("XIOS").suspend(); … … 65 65 { 66 66 CTimer::get("XIOS").resume(); 67 return !context_hdl->output_dir.isEmpty();67 return context_hdl->output_dir.hasInheritedValue(); 68 68 CTimer::get("XIOS").suspend(); 69 69 } … … 84 84 { 85 85 CTimer::get("XIOS").resume(); 86 if(!string_copy(context_hdl->start_date.get Value(),start_date , start_date_size))86 if(!string_copy(context_hdl->start_date.getInheritedValue(),start_date , start_date_size)) 87 87 ERROR("void cxios_get_context_start_date(context_Ptr context_hdl, char * start_date, int start_date_size)", <<"Input string is to short"); 88 88 CTimer::get("XIOS").suspend(); … … 92 92 { 93 93 CTimer::get("XIOS").resume(); 94 return !context_hdl->start_date.isEmpty();94 return context_hdl->start_date.hasInheritedValue(); 95 95 CTimer::get("XIOS").suspend(); 96 96 } … … 111 111 { 112 112 CTimer::get("XIOS").resume(); 113 if(!string_copy(context_hdl->time_origin.get Value(),time_origin , time_origin_size))113 if(!string_copy(context_hdl->time_origin.getInheritedValue(),time_origin , time_origin_size)) 114 114 ERROR("void cxios_get_context_time_origin(context_Ptr context_hdl, char * time_origin, int time_origin_size)", <<"Input string is to short"); 115 115 CTimer::get("XIOS").suspend(); … … 119 119 { 120 120 CTimer::get("XIOS").resume(); 121 return !context_hdl->time_origin.isEmpty();121 return context_hdl->time_origin.hasInheritedValue(); 122 122 CTimer::get("XIOS").suspend(); 123 123 } … … 138 138 { 139 139 CTimer::get("XIOS").resume(); 140 if(!string_copy(context_hdl->timestep.get Value(),timestep , timestep_size))140 if(!string_copy(context_hdl->timestep.getInheritedValue(),timestep , timestep_size)) 141 141 ERROR("void cxios_get_context_timestep(context_Ptr context_hdl, char * timestep, int timestep_size)", <<"Input string is to short"); 142 142 CTimer::get("XIOS").suspend(); … … 146 146 { 147 147 CTimer::get("XIOS").resume(); 148 return !context_hdl->timestep.isEmpty();148 return context_hdl->timestep.hasInheritedValue(); 149 149 CTimer::get("XIOS").suspend(); 150 150 } -
XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp
r432 r445 27 27 void cxios_get_domain_data_dim(domain_Ptr domain_hdl, int* data_dim) 28 28 { 29 *data_dim = domain_hdl->data_dim.get Value();29 *data_dim = domain_hdl->data_dim.getInheritedValue(); 30 30 } 31 31 … … 33 33 { 34 34 CTimer::get("XIOS").resume(); 35 return !domain_hdl->data_dim.isEmpty();35 return domain_hdl->data_dim.hasInheritedValue(); 36 36 CTimer::get("XIOS").suspend(); 37 37 } … … 52 52 CTimer::get("XIOS").resume(); 53 53 CArray<int,1> tmp(data_i_index,shape(extent1),neverDeleteData) ; 54 tmp=domain_hdl->data_i_index ;54 tmp=domain_hdl->data_i_index.getInheritedValue() ; 55 55 CTimer::get("XIOS").suspend(); 56 56 } … … 59 59 { 60 60 CTimer::get("XIOS").resume(); 61 return !domain_hdl->data_i_index.isEmpty();61 return domain_hdl->data_i_index.hasInheritedValue(); 62 62 CTimer::get("XIOS").suspend(); 63 63 } … … 75 75 void cxios_get_domain_data_ibegin(domain_Ptr domain_hdl, int* data_ibegin) 76 76 { 77 *data_ibegin = domain_hdl->data_ibegin.get Value();77 *data_ibegin = domain_hdl->data_ibegin.getInheritedValue(); 78 78 } 79 79 … … 81 81 { 82 82 CTimer::get("XIOS").resume(); 83 return !domain_hdl->data_ibegin.isEmpty();83 return domain_hdl->data_ibegin.hasInheritedValue(); 84 84 CTimer::get("XIOS").suspend(); 85 85 } … … 100 100 CTimer::get("XIOS").resume(); 101 101 CArray<int,1> tmp(data_j_index,shape(extent1),neverDeleteData) ; 102 tmp=domain_hdl->data_j_index ;102 tmp=domain_hdl->data_j_index.getInheritedValue() ; 103 103 CTimer::get("XIOS").suspend(); 104 104 } … … 107 107 { 108 108 CTimer::get("XIOS").resume(); 109 return !domain_hdl->data_j_index.isEmpty();109 return domain_hdl->data_j_index.hasInheritedValue(); 110 110 CTimer::get("XIOS").suspend(); 111 111 } … … 123 123 void cxios_get_domain_data_jbegin(domain_Ptr domain_hdl, int* data_jbegin) 124 124 { 125 *data_jbegin = domain_hdl->data_jbegin.get Value();125 *data_jbegin = domain_hdl->data_jbegin.getInheritedValue(); 126 126 } 127 127 … … 129 129 { 130 130 CTimer::get("XIOS").resume(); 131 return !domain_hdl->data_jbegin.isEmpty();131 return domain_hdl->data_jbegin.hasInheritedValue(); 132 132 CTimer::get("XIOS").suspend(); 133 133 } … … 145 145 void cxios_get_domain_data_n_index(domain_Ptr domain_hdl, int* data_n_index) 146 146 { 147 *data_n_index = domain_hdl->data_n_index.get Value();147 *data_n_index = domain_hdl->data_n_index.getInheritedValue(); 148 148 } 149 149 … … 151 151 { 152 152 CTimer::get("XIOS").resume(); 153 return !domain_hdl->data_n_index.isEmpty();153 return domain_hdl->data_n_index.hasInheritedValue(); 154 154 CTimer::get("XIOS").suspend(); 155 155 } … … 167 167 void cxios_get_domain_data_ni(domain_Ptr domain_hdl, int* data_ni) 168 168 { 169 *data_ni = domain_hdl->data_ni.get Value();169 *data_ni = domain_hdl->data_ni.getInheritedValue(); 170 170 } 171 171 … … 173 173 { 174 174 CTimer::get("XIOS").resume(); 175 return !domain_hdl->data_ni.isEmpty();175 return domain_hdl->data_ni.hasInheritedValue(); 176 176 CTimer::get("XIOS").suspend(); 177 177 } … … 189 189 void cxios_get_domain_data_nj(domain_Ptr domain_hdl, int* data_nj) 190 190 { 191 *data_nj = domain_hdl->data_nj.get Value();191 *data_nj = domain_hdl->data_nj.getInheritedValue(); 192 192 } 193 193 … … 195 195 { 196 196 CTimer::get("XIOS").resume(); 197 return !domain_hdl->data_nj.isEmpty();197 return domain_hdl->data_nj.hasInheritedValue(); 198 198 CTimer::get("XIOS").suspend(); 199 199 } … … 214 214 { 215 215 CTimer::get("XIOS").resume(); 216 if(!string_copy(domain_hdl->domain_group_ref.get Value(),domain_group_ref , domain_group_ref_size))216 if(!string_copy(domain_hdl->domain_group_ref.getInheritedValue(),domain_group_ref , domain_group_ref_size)) 217 217 ERROR("void cxios_get_domain_domain_group_ref(domain_Ptr domain_hdl, char * domain_group_ref, int domain_group_ref_size)", <<"Input string is to short"); 218 218 CTimer::get("XIOS").suspend(); … … 222 222 { 223 223 CTimer::get("XIOS").resume(); 224 return !domain_hdl->domain_group_ref.isEmpty();224 return domain_hdl->domain_group_ref.hasInheritedValue(); 225 225 CTimer::get("XIOS").suspend(); 226 226 } … … 238 238 void cxios_get_domain_ibegin(domain_Ptr domain_hdl, int* ibegin) 239 239 { 240 *ibegin = domain_hdl->ibegin.get Value();240 *ibegin = domain_hdl->ibegin.getInheritedValue(); 241 241 } 242 242 … … 244 244 { 245 245 CTimer::get("XIOS").resume(); 246 return !domain_hdl->ibegin.isEmpty();246 return domain_hdl->ibegin.hasInheritedValue(); 247 247 CTimer::get("XIOS").suspend(); 248 248 } … … 260 260 void cxios_get_domain_iend(domain_Ptr domain_hdl, int* iend) 261 261 { 262 *iend = domain_hdl->iend.get Value();262 *iend = domain_hdl->iend.getInheritedValue(); 263 263 } 264 264 … … 266 266 { 267 267 CTimer::get("XIOS").resume(); 268 return !domain_hdl->iend.isEmpty();268 return domain_hdl->iend.hasInheritedValue(); 269 269 CTimer::get("XIOS").suspend(); 270 270 } … … 282 282 void cxios_get_domain_jbegin(domain_Ptr domain_hdl, int* jbegin) 283 283 { 284 *jbegin = domain_hdl->jbegin.get Value();284 *jbegin = domain_hdl->jbegin.getInheritedValue(); 285 285 } 286 286 … … 288 288 { 289 289 CTimer::get("XIOS").resume(); 290 return !domain_hdl->jbegin.isEmpty();290 return domain_hdl->jbegin.hasInheritedValue(); 291 291 CTimer::get("XIOS").suspend(); 292 292 } … … 304 304 void cxios_get_domain_jend(domain_Ptr domain_hdl, int* jend) 305 305 { 306 *jend = domain_hdl->jend.get Value();306 *jend = domain_hdl->jend.getInheritedValue(); 307 307 } 308 308 … … 310 310 { 311 311 CTimer::get("XIOS").resume(); 312 return !domain_hdl->jend.isEmpty();312 return domain_hdl->jend.hasInheritedValue(); 313 313 CTimer::get("XIOS").suspend(); 314 314 } … … 329 329 CTimer::get("XIOS").resume(); 330 330 CArray<double,1> tmp(latvalue,shape(extent1),neverDeleteData) ; 331 tmp=domain_hdl->latvalue ;331 tmp=domain_hdl->latvalue.getInheritedValue() ; 332 332 CTimer::get("XIOS").suspend(); 333 333 } … … 336 336 { 337 337 CTimer::get("XIOS").resume(); 338 return !domain_hdl->latvalue.isEmpty();338 return domain_hdl->latvalue.hasInheritedValue(); 339 339 CTimer::get("XIOS").suspend(); 340 340 } … … 355 355 { 356 356 CTimer::get("XIOS").resume(); 357 if(!string_copy(domain_hdl->long_name.get Value(),long_name , long_name_size))357 if(!string_copy(domain_hdl->long_name.getInheritedValue(),long_name , long_name_size)) 358 358 ERROR("void cxios_get_domain_long_name(domain_Ptr domain_hdl, char * long_name, int long_name_size)", <<"Input string is to short"); 359 359 CTimer::get("XIOS").suspend(); … … 363 363 { 364 364 CTimer::get("XIOS").resume(); 365 return !domain_hdl->long_name.isEmpty();365 return domain_hdl->long_name.hasInheritedValue(); 366 366 CTimer::get("XIOS").suspend(); 367 367 } … … 382 382 CTimer::get("XIOS").resume(); 383 383 CArray<double,1> tmp(lonvalue,shape(extent1),neverDeleteData) ; 384 tmp=domain_hdl->lonvalue ;384 tmp=domain_hdl->lonvalue.getInheritedValue() ; 385 385 CTimer::get("XIOS").suspend(); 386 386 } … … 389 389 { 390 390 CTimer::get("XIOS").resume(); 391 return !domain_hdl->lonvalue.isEmpty();391 return domain_hdl->lonvalue.hasInheritedValue(); 392 392 CTimer::get("XIOS").suspend(); 393 393 } … … 408 408 CTimer::get("XIOS").resume(); 409 409 CArray<bool,2> tmp(mask,shape(extent1,extent2),neverDeleteData) ; 410 tmp=domain_hdl->mask ;410 tmp=domain_hdl->mask.getInheritedValue() ; 411 411 CTimer::get("XIOS").suspend(); 412 412 } … … 415 415 { 416 416 CTimer::get("XIOS").resume(); 417 return !domain_hdl->mask.isEmpty();417 return domain_hdl->mask.hasInheritedValue(); 418 418 CTimer::get("XIOS").suspend(); 419 419 } … … 434 434 { 435 435 CTimer::get("XIOS").resume(); 436 if(!string_copy(domain_hdl->name.get Value(),name , name_size))436 if(!string_copy(domain_hdl->name.getInheritedValue(),name , name_size)) 437 437 ERROR("void cxios_get_domain_name(domain_Ptr domain_hdl, char * name, int name_size)", <<"Input string is to short"); 438 438 CTimer::get("XIOS").suspend(); … … 442 442 { 443 443 CTimer::get("XIOS").resume(); 444 return !domain_hdl->name.isEmpty();444 return domain_hdl->name.hasInheritedValue(); 445 445 CTimer::get("XIOS").suspend(); 446 446 } … … 458 458 void cxios_get_domain_ni(domain_Ptr domain_hdl, int* ni) 459 459 { 460 *ni = domain_hdl->ni.get Value();460 *ni = domain_hdl->ni.getInheritedValue(); 461 461 } 462 462 … … 464 464 { 465 465 CTimer::get("XIOS").resume(); 466 return !domain_hdl->ni.isEmpty();466 return domain_hdl->ni.hasInheritedValue(); 467 467 CTimer::get("XIOS").suspend(); 468 468 } … … 480 480 void cxios_get_domain_ni_glo(domain_Ptr domain_hdl, int* ni_glo) 481 481 { 482 *ni_glo = domain_hdl->ni_glo.get Value();482 *ni_glo = domain_hdl->ni_glo.getInheritedValue(); 483 483 } 484 484 … … 486 486 { 487 487 CTimer::get("XIOS").resume(); 488 return !domain_hdl->ni_glo.isEmpty();488 return domain_hdl->ni_glo.hasInheritedValue(); 489 489 CTimer::get("XIOS").suspend(); 490 490 } … … 502 502 void cxios_get_domain_nj(domain_Ptr domain_hdl, int* nj) 503 503 { 504 *nj = domain_hdl->nj.get Value();504 *nj = domain_hdl->nj.getInheritedValue(); 505 505 } 506 506 … … 508 508 { 509 509 CTimer::get("XIOS").resume(); 510 return !domain_hdl->nj.isEmpty();510 return domain_hdl->nj.hasInheritedValue(); 511 511 CTimer::get("XIOS").suspend(); 512 512 } … … 524 524 void cxios_get_domain_nj_glo(domain_Ptr domain_hdl, int* nj_glo) 525 525 { 526 *nj_glo = domain_hdl->nj_glo.get Value();526 *nj_glo = domain_hdl->nj_glo.getInheritedValue(); 527 527 } 528 528 … … 530 530 { 531 531 CTimer::get("XIOS").resume(); 532 return !domain_hdl->nj_glo.isEmpty();532 return domain_hdl->nj_glo.hasInheritedValue(); 533 533 CTimer::get("XIOS").suspend(); 534 534 } … … 549 549 { 550 550 CTimer::get("XIOS").resume(); 551 if(!string_copy(domain_hdl->standard_name.get Value(),standard_name , standard_name_size))551 if(!string_copy(domain_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size)) 552 552 ERROR("void cxios_get_domain_standard_name(domain_Ptr domain_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short"); 553 553 CTimer::get("XIOS").suspend(); … … 557 557 { 558 558 CTimer::get("XIOS").resume(); 559 return !domain_hdl->standard_name.isEmpty();559 return domain_hdl->standard_name.hasInheritedValue(); 560 560 CTimer::get("XIOS").suspend(); 561 561 } … … 573 573 void cxios_get_domain_zoom_ibegin(domain_Ptr domain_hdl, int* zoom_ibegin) 574 574 { 575 *zoom_ibegin = domain_hdl->zoom_ibegin.get Value();575 *zoom_ibegin = domain_hdl->zoom_ibegin.getInheritedValue(); 576 576 } 577 577 … … 579 579 { 580 580 CTimer::get("XIOS").resume(); 581 return !domain_hdl->zoom_ibegin.isEmpty();581 return domain_hdl->zoom_ibegin.hasInheritedValue(); 582 582 CTimer::get("XIOS").suspend(); 583 583 } … … 595 595 void cxios_get_domain_zoom_ibegin_loc(domain_Ptr domain_hdl, int* zoom_ibegin_loc) 596 596 { 597 *zoom_ibegin_loc = domain_hdl->zoom_ibegin_loc.get Value();597 *zoom_ibegin_loc = domain_hdl->zoom_ibegin_loc.getInheritedValue(); 598 598 } 599 599 … … 601 601 { 602 602 CTimer::get("XIOS").resume(); 603 return !domain_hdl->zoom_ibegin_loc.isEmpty();603 return domain_hdl->zoom_ibegin_loc.hasInheritedValue(); 604 604 CTimer::get("XIOS").suspend(); 605 605 } … … 617 617 void cxios_get_domain_zoom_jbegin(domain_Ptr domain_hdl, int* zoom_jbegin) 618 618 { 619 *zoom_jbegin = domain_hdl->zoom_jbegin.get Value();619 *zoom_jbegin = domain_hdl->zoom_jbegin.getInheritedValue(); 620 620 } 621 621 … … 623 623 { 624 624 CTimer::get("XIOS").resume(); 625 return !domain_hdl->zoom_jbegin.isEmpty();625 return domain_hdl->zoom_jbegin.hasInheritedValue(); 626 626 CTimer::get("XIOS").suspend(); 627 627 } … … 639 639 void cxios_get_domain_zoom_jbegin_loc(domain_Ptr domain_hdl, int* zoom_jbegin_loc) 640 640 { 641 *zoom_jbegin_loc = domain_hdl->zoom_jbegin_loc.get Value();641 *zoom_jbegin_loc = domain_hdl->zoom_jbegin_loc.getInheritedValue(); 642 642 } 643 643 … … 645 645 { 646 646 CTimer::get("XIOS").resume(); 647 return !domain_hdl->zoom_jbegin_loc.isEmpty();647 return domain_hdl->zoom_jbegin_loc.hasInheritedValue(); 648 648 CTimer::get("XIOS").suspend(); 649 649 } … … 661 661 void cxios_get_domain_zoom_ni(domain_Ptr domain_hdl, int* zoom_ni) 662 662 { 663 *zoom_ni = domain_hdl->zoom_ni.get Value();663 *zoom_ni = domain_hdl->zoom_ni.getInheritedValue(); 664 664 } 665 665 … … 667 667 { 668 668 CTimer::get("XIOS").resume(); 669 return !domain_hdl->zoom_ni.isEmpty();669 return domain_hdl->zoom_ni.hasInheritedValue(); 670 670 CTimer::get("XIOS").suspend(); 671 671 } … … 683 683 void cxios_get_domain_zoom_ni_loc(domain_Ptr domain_hdl, int* zoom_ni_loc) 684 684 { 685 *zoom_ni_loc = domain_hdl->zoom_ni_loc.get Value();685 *zoom_ni_loc = domain_hdl->zoom_ni_loc.getInheritedValue(); 686 686 } 687 687 … … 689 689 { 690 690 CTimer::get("XIOS").resume(); 691 return !domain_hdl->zoom_ni_loc.isEmpty();691 return domain_hdl->zoom_ni_loc.hasInheritedValue(); 692 692 CTimer::get("XIOS").suspend(); 693 693 } … … 705 705 void cxios_get_domain_zoom_nj(domain_Ptr domain_hdl, int* zoom_nj) 706 706 { 707 *zoom_nj = domain_hdl->zoom_nj.get Value();707 *zoom_nj = domain_hdl->zoom_nj.getInheritedValue(); 708 708 } 709 709 … … 711 711 { 712 712 CTimer::get("XIOS").resume(); 713 return !domain_hdl->zoom_nj.isEmpty();713 return domain_hdl->zoom_nj.hasInheritedValue(); 714 714 CTimer::get("XIOS").suspend(); 715 715 } … … 727 727 void cxios_get_domain_zoom_nj_loc(domain_Ptr domain_hdl, int* zoom_nj_loc) 728 728 { 729 *zoom_nj_loc = domain_hdl->zoom_nj_loc.get Value();729 *zoom_nj_loc = domain_hdl->zoom_nj_loc.getInheritedValue(); 730 730 } 731 731 … … 733 733 { 734 734 CTimer::get("XIOS").resume(); 735 return !domain_hdl->zoom_nj_loc.isEmpty();735 return domain_hdl->zoom_nj_loc.hasInheritedValue(); 736 736 CTimer::get("XIOS").suspend(); 737 737 } -
XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp
r432 r445 27 27 void cxios_get_domaingroup_data_dim(domaingroup_Ptr domaingroup_hdl, int* data_dim) 28 28 { 29 *data_dim = domaingroup_hdl->data_dim.get Value();29 *data_dim = domaingroup_hdl->data_dim.getInheritedValue(); 30 30 } 31 31 … … 33 33 { 34 34 CTimer::get("XIOS").resume(); 35 return !domaingroup_hdl->data_dim.isEmpty();35 return domaingroup_hdl->data_dim.hasInheritedValue(); 36 36 CTimer::get("XIOS").suspend(); 37 37 } … … 52 52 CTimer::get("XIOS").resume(); 53 53 CArray<int,1> tmp(data_i_index,shape(extent1),neverDeleteData) ; 54 tmp=domaingroup_hdl->data_i_index ;54 tmp=domaingroup_hdl->data_i_index.getInheritedValue() ; 55 55 CTimer::get("XIOS").suspend(); 56 56 } … … 59 59 { 60 60 CTimer::get("XIOS").resume(); 61 return !domaingroup_hdl->data_i_index.isEmpty();61 return domaingroup_hdl->data_i_index.hasInheritedValue(); 62 62 CTimer::get("XIOS").suspend(); 63 63 } … … 75 75 void cxios_get_domaingroup_data_ibegin(domaingroup_Ptr domaingroup_hdl, int* data_ibegin) 76 76 { 77 *data_ibegin = domaingroup_hdl->data_ibegin.get Value();77 *data_ibegin = domaingroup_hdl->data_ibegin.getInheritedValue(); 78 78 } 79 79 … … 81 81 { 82 82 CTimer::get("XIOS").resume(); 83 return !domaingroup_hdl->data_ibegin.isEmpty();83 return domaingroup_hdl->data_ibegin.hasInheritedValue(); 84 84 CTimer::get("XIOS").suspend(); 85 85 } … … 100 100 CTimer::get("XIOS").resume(); 101 101 CArray<int,1> tmp(data_j_index,shape(extent1),neverDeleteData) ; 102 tmp=domaingroup_hdl->data_j_index ;102 tmp=domaingroup_hdl->data_j_index.getInheritedValue() ; 103 103 CTimer::get("XIOS").suspend(); 104 104 } … … 107 107 { 108 108 CTimer::get("XIOS").resume(); 109 return !domaingroup_hdl->data_j_index.isEmpty();109 return domaingroup_hdl->data_j_index.hasInheritedValue(); 110 110 CTimer::get("XIOS").suspend(); 111 111 } … … 123 123 void cxios_get_domaingroup_data_jbegin(domaingroup_Ptr domaingroup_hdl, int* data_jbegin) 124 124 { 125 *data_jbegin = domaingroup_hdl->data_jbegin.get Value();125 *data_jbegin = domaingroup_hdl->data_jbegin.getInheritedValue(); 126 126 } 127 127 … … 129 129 { 130 130 CTimer::get("XIOS").resume(); 131 return !domaingroup_hdl->data_jbegin.isEmpty();131 return domaingroup_hdl->data_jbegin.hasInheritedValue(); 132 132 CTimer::get("XIOS").suspend(); 133 133 } … … 145 145 void cxios_get_domaingroup_data_n_index(domaingroup_Ptr domaingroup_hdl, int* data_n_index) 146 146 { 147 *data_n_index = domaingroup_hdl->data_n_index.get Value();147 *data_n_index = domaingroup_hdl->data_n_index.getInheritedValue(); 148 148 } 149 149 … … 151 151 { 152 152 CTimer::get("XIOS").resume(); 153 return !domaingroup_hdl->data_n_index.isEmpty();153 return domaingroup_hdl->data_n_index.hasInheritedValue(); 154 154 CTimer::get("XIOS").suspend(); 155 155 } … … 167 167 void cxios_get_domaingroup_data_ni(domaingroup_Ptr domaingroup_hdl, int* data_ni) 168 168 { 169 *data_ni = domaingroup_hdl->data_ni.get Value();169 *data_ni = domaingroup_hdl->data_ni.getInheritedValue(); 170 170 } 171 171 … … 173 173 { 174 174 CTimer::get("XIOS").resume(); 175 return !domaingroup_hdl->data_ni.isEmpty();175 return domaingroup_hdl->data_ni.hasInheritedValue(); 176 176 CTimer::get("XIOS").suspend(); 177 177 } … … 189 189 void cxios_get_domaingroup_data_nj(domaingroup_Ptr domaingroup_hdl, int* data_nj) 190 190 { 191 *data_nj = domaingroup_hdl->data_nj.get Value();191 *data_nj = domaingroup_hdl->data_nj.getInheritedValue(); 192 192 } 193 193 … … 195 195 { 196 196 CTimer::get("XIOS").resume(); 197 return !domaingroup_hdl->data_nj.isEmpty();197 return domaingroup_hdl->data_nj.hasInheritedValue(); 198 198 CTimer::get("XIOS").suspend(); 199 199 } … … 214 214 { 215 215 CTimer::get("XIOS").resume(); 216 if(!string_copy(domaingroup_hdl->domain_group_ref.get Value(),domain_group_ref , domain_group_ref_size))216 if(!string_copy(domaingroup_hdl->domain_group_ref.getInheritedValue(),domain_group_ref , domain_group_ref_size)) 217 217 ERROR("void cxios_get_domaingroup_domain_group_ref(domaingroup_Ptr domaingroup_hdl, char * domain_group_ref, int domain_group_ref_size)", <<"Input string is to short"); 218 218 CTimer::get("XIOS").suspend(); … … 222 222 { 223 223 CTimer::get("XIOS").resume(); 224 return !domaingroup_hdl->domain_group_ref.isEmpty();224 return domaingroup_hdl->domain_group_ref.hasInheritedValue(); 225 225 CTimer::get("XIOS").suspend(); 226 226 } … … 241 241 { 242 242 CTimer::get("XIOS").resume(); 243 if(!string_copy(domaingroup_hdl->group_ref.get Value(),group_ref , group_ref_size))243 if(!string_copy(domaingroup_hdl->group_ref.getInheritedValue(),group_ref , group_ref_size)) 244 244 ERROR("void cxios_get_domaingroup_group_ref(domaingroup_Ptr domaingroup_hdl, char * group_ref, int group_ref_size)", <<"Input string is to short"); 245 245 CTimer::get("XIOS").suspend(); … … 249 249 { 250 250 CTimer::get("XIOS").resume(); 251 return !domaingroup_hdl->group_ref.isEmpty();251 return domaingroup_hdl->group_ref.hasInheritedValue(); 252 252 CTimer::get("XIOS").suspend(); 253 253 } … … 265 265 void cxios_get_domaingroup_ibegin(domaingroup_Ptr domaingroup_hdl, int* ibegin) 266 266 { 267 *ibegin = domaingroup_hdl->ibegin.get Value();267 *ibegin = domaingroup_hdl->ibegin.getInheritedValue(); 268 268 } 269 269 … … 271 271 { 272 272 CTimer::get("XIOS").resume(); 273 return !domaingroup_hdl->ibegin.isEmpty();273 return domaingroup_hdl->ibegin.hasInheritedValue(); 274 274 CTimer::get("XIOS").suspend(); 275 275 } … … 287 287 void cxios_get_domaingroup_iend(domaingroup_Ptr domaingroup_hdl, int* iend) 288 288 { 289 *iend = domaingroup_hdl->iend.get Value();289 *iend = domaingroup_hdl->iend.getInheritedValue(); 290 290 } 291 291 … … 293 293 { 294 294 CTimer::get("XIOS").resume(); 295 return !domaingroup_hdl->iend.isEmpty();295 return domaingroup_hdl->iend.hasInheritedValue(); 296 296 CTimer::get("XIOS").suspend(); 297 297 } … … 309 309 void cxios_get_domaingroup_jbegin(domaingroup_Ptr domaingroup_hdl, int* jbegin) 310 310 { 311 *jbegin = domaingroup_hdl->jbegin.get Value();311 *jbegin = domaingroup_hdl->jbegin.getInheritedValue(); 312 312 } 313 313 … … 315 315 { 316 316 CTimer::get("XIOS").resume(); 317 return !domaingroup_hdl->jbegin.isEmpty();317 return domaingroup_hdl->jbegin.hasInheritedValue(); 318 318 CTimer::get("XIOS").suspend(); 319 319 } … … 331 331 void cxios_get_domaingroup_jend(domaingroup_Ptr domaingroup_hdl, int* jend) 332 332 { 333 *jend = domaingroup_hdl->jend.get Value();333 *jend = domaingroup_hdl->jend.getInheritedValue(); 334 334 } 335 335 … … 337 337 { 338 338 CTimer::get("XIOS").resume(); 339 return !domaingroup_hdl->jend.isEmpty();339 return domaingroup_hdl->jend.hasInheritedValue(); 340 340 CTimer::get("XIOS").suspend(); 341 341 } … … 356 356 CTimer::get("XIOS").resume(); 357 357 CArray<double,1> tmp(latvalue,shape(extent1),neverDeleteData) ; 358 tmp=domaingroup_hdl->latvalue ;358 tmp=domaingroup_hdl->latvalue.getInheritedValue() ; 359 359 CTimer::get("XIOS").suspend(); 360 360 } … … 363 363 { 364 364 CTimer::get("XIOS").resume(); 365 return !domaingroup_hdl->latvalue.isEmpty();365 return domaingroup_hdl->latvalue.hasInheritedValue(); 366 366 CTimer::get("XIOS").suspend(); 367 367 } … … 382 382 { 383 383 CTimer::get("XIOS").resume(); 384 if(!string_copy(domaingroup_hdl->long_name.get Value(),long_name , long_name_size))384 if(!string_copy(domaingroup_hdl->long_name.getInheritedValue(),long_name , long_name_size)) 385 385 ERROR("void cxios_get_domaingroup_long_name(domaingroup_Ptr domaingroup_hdl, char * long_name, int long_name_size)", <<"Input string is to short"); 386 386 CTimer::get("XIOS").suspend(); … … 390 390 { 391 391 CTimer::get("XIOS").resume(); 392 return !domaingroup_hdl->long_name.isEmpty();392 return domaingroup_hdl->long_name.hasInheritedValue(); 393 393 CTimer::get("XIOS").suspend(); 394 394 } … … 409 409 CTimer::get("XIOS").resume(); 410 410 CArray<double,1> tmp(lonvalue,shape(extent1),neverDeleteData) ; 411 tmp=domaingroup_hdl->lonvalue ;411 tmp=domaingroup_hdl->lonvalue.getInheritedValue() ; 412 412 CTimer::get("XIOS").suspend(); 413 413 } … … 416 416 { 417 417 CTimer::get("XIOS").resume(); 418 return !domaingroup_hdl->lonvalue.isEmpty();418 return domaingroup_hdl->lonvalue.hasInheritedValue(); 419 419 CTimer::get("XIOS").suspend(); 420 420 } … … 435 435 CTimer::get("XIOS").resume(); 436 436 CArray<bool,2> tmp(mask,shape(extent1,extent2),neverDeleteData) ; 437 tmp=domaingroup_hdl->mask ;437 tmp=domaingroup_hdl->mask.getInheritedValue() ; 438 438 CTimer::get("XIOS").suspend(); 439 439 } … … 442 442 { 443 443 CTimer::get("XIOS").resume(); 444 return !domaingroup_hdl->mask.isEmpty();444 return domaingroup_hdl->mask.hasInheritedValue(); 445 445 CTimer::get("XIOS").suspend(); 446 446 } … … 461 461 { 462 462 CTimer::get("XIOS").resume(); 463 if(!string_copy(domaingroup_hdl->name.get Value(),name , name_size))463 if(!string_copy(domaingroup_hdl->name.getInheritedValue(),name , name_size)) 464 464 ERROR("void cxios_get_domaingroup_name(domaingroup_Ptr domaingroup_hdl, char * name, int name_size)", <<"Input string is to short"); 465 465 CTimer::get("XIOS").suspend(); … … 469 469 { 470 470 CTimer::get("XIOS").resume(); 471 return !domaingroup_hdl->name.isEmpty();471 return domaingroup_hdl->name.hasInheritedValue(); 472 472 CTimer::get("XIOS").suspend(); 473 473 } … … 485 485 void cxios_get_domaingroup_ni(domaingroup_Ptr domaingroup_hdl, int* ni) 486 486 { 487 *ni = domaingroup_hdl->ni.get Value();487 *ni = domaingroup_hdl->ni.getInheritedValue(); 488 488 } 489 489 … … 491 491 { 492 492 CTimer::get("XIOS").resume(); 493 return !domaingroup_hdl->ni.isEmpty();493 return domaingroup_hdl->ni.hasInheritedValue(); 494 494 CTimer::get("XIOS").suspend(); 495 495 } … … 507 507 void cxios_get_domaingroup_ni_glo(domaingroup_Ptr domaingroup_hdl, int* ni_glo) 508 508 { 509 *ni_glo = domaingroup_hdl->ni_glo.get Value();509 *ni_glo = domaingroup_hdl->ni_glo.getInheritedValue(); 510 510 } 511 511 … … 513 513 { 514 514 CTimer::get("XIOS").resume(); 515 return !domaingroup_hdl->ni_glo.isEmpty();515 return domaingroup_hdl->ni_glo.hasInheritedValue(); 516 516 CTimer::get("XIOS").suspend(); 517 517 } … … 529 529 void cxios_get_domaingroup_nj(domaingroup_Ptr domaingroup_hdl, int* nj) 530 530 { 531 *nj = domaingroup_hdl->nj.get Value();531 *nj = domaingroup_hdl->nj.getInheritedValue(); 532 532 } 533 533 … … 535 535 { 536 536 CTimer::get("XIOS").resume(); 537 return !domaingroup_hdl->nj.isEmpty();537 return domaingroup_hdl->nj.hasInheritedValue(); 538 538 CTimer::get("XIOS").suspend(); 539 539 } … … 551 551 void cxios_get_domaingroup_nj_glo(domaingroup_Ptr domaingroup_hdl, int* nj_glo) 552 552 { 553 *nj_glo = domaingroup_hdl->nj_glo.get Value();553 *nj_glo = domaingroup_hdl->nj_glo.getInheritedValue(); 554 554 } 555 555 … … 557 557 { 558 558 CTimer::get("XIOS").resume(); 559 return !domaingroup_hdl->nj_glo.isEmpty();559 return domaingroup_hdl->nj_glo.hasInheritedValue(); 560 560 CTimer::get("XIOS").suspend(); 561 561 } … … 576 576 { 577 577 CTimer::get("XIOS").resume(); 578 if(!string_copy(domaingroup_hdl->standard_name.get Value(),standard_name , standard_name_size))578 if(!string_copy(domaingroup_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size)) 579 579 ERROR("void cxios_get_domaingroup_standard_name(domaingroup_Ptr domaingroup_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short"); 580 580 CTimer::get("XIOS").suspend(); … … 584 584 { 585 585 CTimer::get("XIOS").resume(); 586 return !domaingroup_hdl->standard_name.isEmpty();586 return domaingroup_hdl->standard_name.hasInheritedValue(); 587 587 CTimer::get("XIOS").suspend(); 588 588 } … … 600 600 void cxios_get_domaingroup_zoom_ibegin(domaingroup_Ptr domaingroup_hdl, int* zoom_ibegin) 601 601 { 602 *zoom_ibegin = domaingroup_hdl->zoom_ibegin.get Value();602 *zoom_ibegin = domaingroup_hdl->zoom_ibegin.getInheritedValue(); 603 603 } 604 604 … … 606 606 { 607 607 CTimer::get("XIOS").resume(); 608 return !domaingroup_hdl->zoom_ibegin.isEmpty();608 return domaingroup_hdl->zoom_ibegin.hasInheritedValue(); 609 609 CTimer::get("XIOS").suspend(); 610 610 } … … 622 622 void cxios_get_domaingroup_zoom_ibegin_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_ibegin_loc) 623 623 { 624 *zoom_ibegin_loc = domaingroup_hdl->zoom_ibegin_loc.get Value();624 *zoom_ibegin_loc = domaingroup_hdl->zoom_ibegin_loc.getInheritedValue(); 625 625 } 626 626 … … 628 628 { 629 629 CTimer::get("XIOS").resume(); 630 return !domaingroup_hdl->zoom_ibegin_loc.isEmpty();630 return domaingroup_hdl->zoom_ibegin_loc.hasInheritedValue(); 631 631 CTimer::get("XIOS").suspend(); 632 632 } … … 644 644 void cxios_get_domaingroup_zoom_jbegin(domaingroup_Ptr domaingroup_hdl, int* zoom_jbegin) 645 645 { 646 *zoom_jbegin = domaingroup_hdl->zoom_jbegin.get Value();646 *zoom_jbegin = domaingroup_hdl->zoom_jbegin.getInheritedValue(); 647 647 } 648 648 … … 650 650 { 651 651 CTimer::get("XIOS").resume(); 652 return !domaingroup_hdl->zoom_jbegin.isEmpty();652 return domaingroup_hdl->zoom_jbegin.hasInheritedValue(); 653 653 CTimer::get("XIOS").suspend(); 654 654 } … … 666 666 void cxios_get_domaingroup_zoom_jbegin_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_jbegin_loc) 667 667 { 668 *zoom_jbegin_loc = domaingroup_hdl->zoom_jbegin_loc.get Value();668 *zoom_jbegin_loc = domaingroup_hdl->zoom_jbegin_loc.getInheritedValue(); 669 669 } 670 670 … … 672 672 { 673 673 CTimer::get("XIOS").resume(); 674 return !domaingroup_hdl->zoom_jbegin_loc.isEmpty();674 return domaingroup_hdl->zoom_jbegin_loc.hasInheritedValue(); 675 675 CTimer::get("XIOS").suspend(); 676 676 } … … 688 688 void cxios_get_domaingroup_zoom_ni(domaingroup_Ptr domaingroup_hdl, int* zoom_ni) 689 689 { 690 *zoom_ni = domaingroup_hdl->zoom_ni.get Value();690 *zoom_ni = domaingroup_hdl->zoom_ni.getInheritedValue(); 691 691 } 692 692 … … 694 694 { 695 695 CTimer::get("XIOS").resume(); 696 return !domaingroup_hdl->zoom_ni.isEmpty();696 return domaingroup_hdl->zoom_ni.hasInheritedValue(); 697 697 CTimer::get("XIOS").suspend(); 698 698 } … … 710 710 void cxios_get_domaingroup_zoom_ni_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_ni_loc) 711 711 { 712 *zoom_ni_loc = domaingroup_hdl->zoom_ni_loc.get Value();712 *zoom_ni_loc = domaingroup_hdl->zoom_ni_loc.getInheritedValue(); 713 713 } 714 714 … … 716 716 { 717 717 CTimer::get("XIOS").resume(); 718 return !domaingroup_hdl->zoom_ni_loc.isEmpty();718 return domaingroup_hdl->zoom_ni_loc.hasInheritedValue(); 719 719 CTimer::get("XIOS").suspend(); 720 720 } … … 732 732 void cxios_get_domaingroup_zoom_nj(domaingroup_Ptr domaingroup_hdl, int* zoom_nj) 733 733 { 734 *zoom_nj = domaingroup_hdl->zoom_nj.get Value();734 *zoom_nj = domaingroup_hdl->zoom_nj.getInheritedValue(); 735 735 } 736 736 … … 738 738 { 739 739 CTimer::get("XIOS").resume(); 740 return !domaingroup_hdl->zoom_nj.isEmpty();740 return domaingroup_hdl->zoom_nj.hasInheritedValue(); 741 741 CTimer::get("XIOS").suspend(); 742 742 } … … 754 754 void cxios_get_domaingroup_zoom_nj_loc(domaingroup_Ptr domaingroup_hdl, int* zoom_nj_loc) 755 755 { 756 *zoom_nj_loc = domaingroup_hdl->zoom_nj_loc.get Value();756 *zoom_nj_loc = domaingroup_hdl->zoom_nj_loc.getInheritedValue(); 757 757 } 758 758 … … 760 760 { 761 761 CTimer::get("XIOS").resume(); 762 return !domaingroup_hdl->zoom_nj_loc.isEmpty();762 return domaingroup_hdl->zoom_nj_loc.hasInheritedValue(); 763 763 CTimer::get("XIOS").suspend(); 764 764 } -
XIOS/trunk/src/interface/c_attr/icfield_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(field_hdl->axis_ref.get Value(),axis_ref , axis_ref_size))32 if(!string_copy(field_hdl->axis_ref.getInheritedValue(),axis_ref , axis_ref_size)) 33 33 ERROR("void cxios_get_field_axis_ref(field_Ptr field_hdl, char * axis_ref, int axis_ref_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !field_hdl->axis_ref.isEmpty();40 return field_hdl->axis_ref.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 54 54 void cxios_get_field_default_value(field_Ptr field_hdl, double* default_value) 55 55 { 56 *default_value = field_hdl->default_value.get Value();56 *default_value = field_hdl->default_value.getInheritedValue(); 57 57 } 58 58 … … 60 60 { 61 61 CTimer::get("XIOS").resume(); 62 return !field_hdl->default_value.isEmpty();62 return field_hdl->default_value.hasInheritedValue(); 63 63 CTimer::get("XIOS").suspend(); 64 64 } … … 79 79 { 80 80 CTimer::get("XIOS").resume(); 81 if(!string_copy(field_hdl->domain_ref.get Value(),domain_ref , domain_ref_size))81 if(!string_copy(field_hdl->domain_ref.getInheritedValue(),domain_ref , domain_ref_size)) 82 82 ERROR("void cxios_get_field_domain_ref(field_Ptr field_hdl, char * domain_ref, int domain_ref_size)", <<"Input string is to short"); 83 83 CTimer::get("XIOS").suspend(); … … 87 87 { 88 88 CTimer::get("XIOS").resume(); 89 return !field_hdl->domain_ref.isEmpty();89 return field_hdl->domain_ref.hasInheritedValue(); 90 90 CTimer::get("XIOS").suspend(); 91 91 } … … 103 103 void cxios_get_field_enabled(field_Ptr field_hdl, bool* enabled) 104 104 { 105 *enabled = field_hdl->enabled.get Value();105 *enabled = field_hdl->enabled.getInheritedValue(); 106 106 } 107 107 … … 109 109 { 110 110 CTimer::get("XIOS").resume(); 111 return !field_hdl->enabled.isEmpty();111 return field_hdl->enabled.hasInheritedValue(); 112 112 CTimer::get("XIOS").suspend(); 113 113 } … … 128 128 { 129 129 CTimer::get("XIOS").resume(); 130 if(!string_copy(field_hdl->field_ref.get Value(),field_ref , field_ref_size))130 if(!string_copy(field_hdl->field_ref.getInheritedValue(),field_ref , field_ref_size)) 131 131 ERROR("void cxios_get_field_field_ref(field_Ptr field_hdl, char * field_ref, int field_ref_size)", <<"Input string is to short"); 132 132 CTimer::get("XIOS").suspend(); … … 136 136 { 137 137 CTimer::get("XIOS").resume(); 138 return !field_hdl->field_ref.isEmpty();138 return field_hdl->field_ref.hasInheritedValue(); 139 139 CTimer::get("XIOS").suspend(); 140 140 } … … 155 155 { 156 156 CTimer::get("XIOS").resume(); 157 if(!string_copy(field_hdl->freq_offset.get Value(),freq_offset , freq_offset_size))157 if(!string_copy(field_hdl->freq_offset.getInheritedValue(),freq_offset , freq_offset_size)) 158 158 ERROR("void cxios_get_field_freq_offset(field_Ptr field_hdl, char * freq_offset, int freq_offset_size)", <<"Input string is to short"); 159 159 CTimer::get("XIOS").suspend(); … … 163 163 { 164 164 CTimer::get("XIOS").resume(); 165 return !field_hdl->freq_offset.isEmpty();165 return field_hdl->freq_offset.hasInheritedValue(); 166 166 CTimer::get("XIOS").suspend(); 167 167 } … … 182 182 { 183 183 CTimer::get("XIOS").resume(); 184 if(!string_copy(field_hdl->freq_op.get Value(),freq_op , freq_op_size))184 if(!string_copy(field_hdl->freq_op.getInheritedValue(),freq_op , freq_op_size)) 185 185 ERROR("void cxios_get_field_freq_op(field_Ptr field_hdl, char * freq_op, int freq_op_size)", <<"Input string is to short"); 186 186 CTimer::get("XIOS").suspend(); … … 190 190 { 191 191 CTimer::get("XIOS").resume(); 192 return !field_hdl->freq_op.isEmpty();192 return field_hdl->freq_op.hasInheritedValue(); 193 193 CTimer::get("XIOS").suspend(); 194 194 } … … 209 209 { 210 210 CTimer::get("XIOS").resume(); 211 if(!string_copy(field_hdl->grid_ref.get Value(),grid_ref , grid_ref_size))211 if(!string_copy(field_hdl->grid_ref.getInheritedValue(),grid_ref , grid_ref_size)) 212 212 ERROR("void cxios_get_field_grid_ref(field_Ptr field_hdl, char * grid_ref, int grid_ref_size)", <<"Input string is to short"); 213 213 CTimer::get("XIOS").suspend(); … … 217 217 { 218 218 CTimer::get("XIOS").resume(); 219 return !field_hdl->grid_ref.isEmpty();219 return field_hdl->grid_ref.hasInheritedValue(); 220 220 CTimer::get("XIOS").suspend(); 221 221 } … … 233 233 void cxios_get_field_level(field_Ptr field_hdl, int* level) 234 234 { 235 *level = field_hdl->level.get Value();235 *level = field_hdl->level.getInheritedValue(); 236 236 } 237 237 … … 239 239 { 240 240 CTimer::get("XIOS").resume(); 241 return !field_hdl->level.isEmpty();241 return field_hdl->level.hasInheritedValue(); 242 242 CTimer::get("XIOS").suspend(); 243 243 } … … 258 258 { 259 259 CTimer::get("XIOS").resume(); 260 if(!string_copy(field_hdl->long_name.get Value(),long_name , long_name_size))260 if(!string_copy(field_hdl->long_name.getInheritedValue(),long_name , long_name_size)) 261 261 ERROR("void cxios_get_field_long_name(field_Ptr field_hdl, char * long_name, int long_name_size)", <<"Input string is to short"); 262 262 CTimer::get("XIOS").suspend(); … … 266 266 { 267 267 CTimer::get("XIOS").resume(); 268 return !field_hdl->long_name.isEmpty();268 return field_hdl->long_name.hasInheritedValue(); 269 269 CTimer::get("XIOS").suspend(); 270 270 } … … 285 285 { 286 286 CTimer::get("XIOS").resume(); 287 if(!string_copy(field_hdl->name.get Value(),name , name_size))287 if(!string_copy(field_hdl->name.getInheritedValue(),name , name_size)) 288 288 ERROR("void cxios_get_field_name(field_Ptr field_hdl, char * name, int name_size)", <<"Input string is to short"); 289 289 CTimer::get("XIOS").suspend(); … … 293 293 { 294 294 CTimer::get("XIOS").resume(); 295 return !field_hdl->name.isEmpty();295 return field_hdl->name.hasInheritedValue(); 296 296 CTimer::get("XIOS").suspend(); 297 297 } … … 312 312 { 313 313 CTimer::get("XIOS").resume(); 314 if(!string_copy(field_hdl->operation.get Value(),operation , operation_size))314 if(!string_copy(field_hdl->operation.getInheritedValue(),operation , operation_size)) 315 315 ERROR("void cxios_get_field_operation(field_Ptr field_hdl, char * operation, int operation_size)", <<"Input string is to short"); 316 316 CTimer::get("XIOS").suspend(); … … 320 320 { 321 321 CTimer::get("XIOS").resume(); 322 return !field_hdl->operation.isEmpty();322 return field_hdl->operation.hasInheritedValue(); 323 323 CTimer::get("XIOS").suspend(); 324 324 } … … 336 336 void cxios_get_field_prec(field_Ptr field_hdl, int* prec) 337 337 { 338 *prec = field_hdl->prec.get Value();338 *prec = field_hdl->prec.getInheritedValue(); 339 339 } 340 340 … … 342 342 { 343 343 CTimer::get("XIOS").resume(); 344 return !field_hdl->prec.isEmpty();344 return field_hdl->prec.hasInheritedValue(); 345 345 CTimer::get("XIOS").suspend(); 346 346 } … … 361 361 { 362 362 CTimer::get("XIOS").resume(); 363 if(!string_copy(field_hdl->standard_name.get Value(),standard_name , standard_name_size))363 if(!string_copy(field_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size)) 364 364 ERROR("void cxios_get_field_standard_name(field_Ptr field_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short"); 365 365 CTimer::get("XIOS").suspend(); … … 369 369 { 370 370 CTimer::get("XIOS").resume(); 371 return !field_hdl->standard_name.isEmpty();371 return field_hdl->standard_name.hasInheritedValue(); 372 372 CTimer::get("XIOS").suspend(); 373 373 } … … 388 388 { 389 389 CTimer::get("XIOS").resume(); 390 if(!string_copy(field_hdl->unit.get Value(),unit , unit_size))390 if(!string_copy(field_hdl->unit.getInheritedValue(),unit , unit_size)) 391 391 ERROR("void cxios_get_field_unit(field_Ptr field_hdl, char * unit, int unit_size)", <<"Input string is to short"); 392 392 CTimer::get("XIOS").suspend(); … … 396 396 { 397 397 CTimer::get("XIOS").resume(); 398 return !field_hdl->unit.isEmpty();398 return field_hdl->unit.hasInheritedValue(); 399 399 CTimer::get("XIOS").suspend(); 400 400 } -
XIOS/trunk/src/interface/c_attr/icfieldgroup_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(fieldgroup_hdl->axis_ref.get Value(),axis_ref , axis_ref_size))32 if(!string_copy(fieldgroup_hdl->axis_ref.getInheritedValue(),axis_ref , axis_ref_size)) 33 33 ERROR("void cxios_get_fieldgroup_axis_ref(fieldgroup_Ptr fieldgroup_hdl, char * axis_ref, int axis_ref_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !fieldgroup_hdl->axis_ref.isEmpty();40 return fieldgroup_hdl->axis_ref.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 54 54 void cxios_get_fieldgroup_default_value(fieldgroup_Ptr fieldgroup_hdl, double* default_value) 55 55 { 56 *default_value = fieldgroup_hdl->default_value.get Value();56 *default_value = fieldgroup_hdl->default_value.getInheritedValue(); 57 57 } 58 58 … … 60 60 { 61 61 CTimer::get("XIOS").resume(); 62 return !fieldgroup_hdl->default_value.isEmpty();62 return fieldgroup_hdl->default_value.hasInheritedValue(); 63 63 CTimer::get("XIOS").suspend(); 64 64 } … … 79 79 { 80 80 CTimer::get("XIOS").resume(); 81 if(!string_copy(fieldgroup_hdl->domain_ref.get Value(),domain_ref , domain_ref_size))81 if(!string_copy(fieldgroup_hdl->domain_ref.getInheritedValue(),domain_ref , domain_ref_size)) 82 82 ERROR("void cxios_get_fieldgroup_domain_ref(fieldgroup_Ptr fieldgroup_hdl, char * domain_ref, int domain_ref_size)", <<"Input string is to short"); 83 83 CTimer::get("XIOS").suspend(); … … 87 87 { 88 88 CTimer::get("XIOS").resume(); 89 return !fieldgroup_hdl->domain_ref.isEmpty();89 return fieldgroup_hdl->domain_ref.hasInheritedValue(); 90 90 CTimer::get("XIOS").suspend(); 91 91 } … … 103 103 void cxios_get_fieldgroup_enabled(fieldgroup_Ptr fieldgroup_hdl, bool* enabled) 104 104 { 105 *enabled = fieldgroup_hdl->enabled.get Value();105 *enabled = fieldgroup_hdl->enabled.getInheritedValue(); 106 106 } 107 107 … … 109 109 { 110 110 CTimer::get("XIOS").resume(); 111 return !fieldgroup_hdl->enabled.isEmpty();111 return fieldgroup_hdl->enabled.hasInheritedValue(); 112 112 CTimer::get("XIOS").suspend(); 113 113 } … … 128 128 { 129 129 CTimer::get("XIOS").resume(); 130 if(!string_copy(fieldgroup_hdl->field_ref.get Value(),field_ref , field_ref_size))130 if(!string_copy(fieldgroup_hdl->field_ref.getInheritedValue(),field_ref , field_ref_size)) 131 131 ERROR("void cxios_get_fieldgroup_field_ref(fieldgroup_Ptr fieldgroup_hdl, char * field_ref, int field_ref_size)", <<"Input string is to short"); 132 132 CTimer::get("XIOS").suspend(); … … 136 136 { 137 137 CTimer::get("XIOS").resume(); 138 return !fieldgroup_hdl->field_ref.isEmpty();138 return fieldgroup_hdl->field_ref.hasInheritedValue(); 139 139 CTimer::get("XIOS").suspend(); 140 140 } … … 155 155 { 156 156 CTimer::get("XIOS").resume(); 157 if(!string_copy(fieldgroup_hdl->freq_offset.get Value(),freq_offset , freq_offset_size))157 if(!string_copy(fieldgroup_hdl->freq_offset.getInheritedValue(),freq_offset , freq_offset_size)) 158 158 ERROR("void cxios_get_fieldgroup_freq_offset(fieldgroup_Ptr fieldgroup_hdl, char * freq_offset, int freq_offset_size)", <<"Input string is to short"); 159 159 CTimer::get("XIOS").suspend(); … … 163 163 { 164 164 CTimer::get("XIOS").resume(); 165 return !fieldgroup_hdl->freq_offset.isEmpty();165 return fieldgroup_hdl->freq_offset.hasInheritedValue(); 166 166 CTimer::get("XIOS").suspend(); 167 167 } … … 182 182 { 183 183 CTimer::get("XIOS").resume(); 184 if(!string_copy(fieldgroup_hdl->freq_op.get Value(),freq_op , freq_op_size))184 if(!string_copy(fieldgroup_hdl->freq_op.getInheritedValue(),freq_op , freq_op_size)) 185 185 ERROR("void cxios_get_fieldgroup_freq_op(fieldgroup_Ptr fieldgroup_hdl, char * freq_op, int freq_op_size)", <<"Input string is to short"); 186 186 CTimer::get("XIOS").suspend(); … … 190 190 { 191 191 CTimer::get("XIOS").resume(); 192 return !fieldgroup_hdl->freq_op.isEmpty();192 return fieldgroup_hdl->freq_op.hasInheritedValue(); 193 193 CTimer::get("XIOS").suspend(); 194 194 } … … 209 209 { 210 210 CTimer::get("XIOS").resume(); 211 if(!string_copy(fieldgroup_hdl->grid_ref.get Value(),grid_ref , grid_ref_size))211 if(!string_copy(fieldgroup_hdl->grid_ref.getInheritedValue(),grid_ref , grid_ref_size)) 212 212 ERROR("void cxios_get_fieldgroup_grid_ref(fieldgroup_Ptr fieldgroup_hdl, char * grid_ref, int grid_ref_size)", <<"Input string is to short"); 213 213 CTimer::get("XIOS").suspend(); … … 217 217 { 218 218 CTimer::get("XIOS").resume(); 219 return !fieldgroup_hdl->grid_ref.isEmpty();219 return fieldgroup_hdl->grid_ref.hasInheritedValue(); 220 220 CTimer::get("XIOS").suspend(); 221 221 } … … 236 236 { 237 237 CTimer::get("XIOS").resume(); 238 if(!string_copy(fieldgroup_hdl->group_ref.get Value(),group_ref , group_ref_size))238 if(!string_copy(fieldgroup_hdl->group_ref.getInheritedValue(),group_ref , group_ref_size)) 239 239 ERROR("void cxios_get_fieldgroup_group_ref(fieldgroup_Ptr fieldgroup_hdl, char * group_ref, int group_ref_size)", <<"Input string is to short"); 240 240 CTimer::get("XIOS").suspend(); … … 244 244 { 245 245 CTimer::get("XIOS").resume(); 246 return !fieldgroup_hdl->group_ref.isEmpty();246 return fieldgroup_hdl->group_ref.hasInheritedValue(); 247 247 CTimer::get("XIOS").suspend(); 248 248 } … … 260 260 void cxios_get_fieldgroup_level(fieldgroup_Ptr fieldgroup_hdl, int* level) 261 261 { 262 *level = fieldgroup_hdl->level.get Value();262 *level = fieldgroup_hdl->level.getInheritedValue(); 263 263 } 264 264 … … 266 266 { 267 267 CTimer::get("XIOS").resume(); 268 return !fieldgroup_hdl->level.isEmpty();268 return fieldgroup_hdl->level.hasInheritedValue(); 269 269 CTimer::get("XIOS").suspend(); 270 270 } … … 285 285 { 286 286 CTimer::get("XIOS").resume(); 287 if(!string_copy(fieldgroup_hdl->long_name.get Value(),long_name , long_name_size))287 if(!string_copy(fieldgroup_hdl->long_name.getInheritedValue(),long_name , long_name_size)) 288 288 ERROR("void cxios_get_fieldgroup_long_name(fieldgroup_Ptr fieldgroup_hdl, char * long_name, int long_name_size)", <<"Input string is to short"); 289 289 CTimer::get("XIOS").suspend(); … … 293 293 { 294 294 CTimer::get("XIOS").resume(); 295 return !fieldgroup_hdl->long_name.isEmpty();295 return fieldgroup_hdl->long_name.hasInheritedValue(); 296 296 CTimer::get("XIOS").suspend(); 297 297 } … … 312 312 { 313 313 CTimer::get("XIOS").resume(); 314 if(!string_copy(fieldgroup_hdl->name.get Value(),name , name_size))314 if(!string_copy(fieldgroup_hdl->name.getInheritedValue(),name , name_size)) 315 315 ERROR("void cxios_get_fieldgroup_name(fieldgroup_Ptr fieldgroup_hdl, char * name, int name_size)", <<"Input string is to short"); 316 316 CTimer::get("XIOS").suspend(); … … 320 320 { 321 321 CTimer::get("XIOS").resume(); 322 return !fieldgroup_hdl->name.isEmpty();322 return fieldgroup_hdl->name.hasInheritedValue(); 323 323 CTimer::get("XIOS").suspend(); 324 324 } … … 339 339 { 340 340 CTimer::get("XIOS").resume(); 341 if(!string_copy(fieldgroup_hdl->operation.get Value(),operation , operation_size))341 if(!string_copy(fieldgroup_hdl->operation.getInheritedValue(),operation , operation_size)) 342 342 ERROR("void cxios_get_fieldgroup_operation(fieldgroup_Ptr fieldgroup_hdl, char * operation, int operation_size)", <<"Input string is to short"); 343 343 CTimer::get("XIOS").suspend(); … … 347 347 { 348 348 CTimer::get("XIOS").resume(); 349 return !fieldgroup_hdl->operation.isEmpty();349 return fieldgroup_hdl->operation.hasInheritedValue(); 350 350 CTimer::get("XIOS").suspend(); 351 351 } … … 363 363 void cxios_get_fieldgroup_prec(fieldgroup_Ptr fieldgroup_hdl, int* prec) 364 364 { 365 *prec = fieldgroup_hdl->prec.get Value();365 *prec = fieldgroup_hdl->prec.getInheritedValue(); 366 366 } 367 367 … … 369 369 { 370 370 CTimer::get("XIOS").resume(); 371 return !fieldgroup_hdl->prec.isEmpty();371 return fieldgroup_hdl->prec.hasInheritedValue(); 372 372 CTimer::get("XIOS").suspend(); 373 373 } … … 388 388 { 389 389 CTimer::get("XIOS").resume(); 390 if(!string_copy(fieldgroup_hdl->standard_name.get Value(),standard_name , standard_name_size))390 if(!string_copy(fieldgroup_hdl->standard_name.getInheritedValue(),standard_name , standard_name_size)) 391 391 ERROR("void cxios_get_fieldgroup_standard_name(fieldgroup_Ptr fieldgroup_hdl, char * standard_name, int standard_name_size)", <<"Input string is to short"); 392 392 CTimer::get("XIOS").suspend(); … … 396 396 { 397 397 CTimer::get("XIOS").resume(); 398 return !fieldgroup_hdl->standard_name.isEmpty();398 return fieldgroup_hdl->standard_name.hasInheritedValue(); 399 399 CTimer::get("XIOS").suspend(); 400 400 } … … 415 415 { 416 416 CTimer::get("XIOS").resume(); 417 if(!string_copy(fieldgroup_hdl->unit.get Value(),unit , unit_size))417 if(!string_copy(fieldgroup_hdl->unit.getInheritedValue(),unit , unit_size)) 418 418 ERROR("void cxios_get_fieldgroup_unit(fieldgroup_Ptr fieldgroup_hdl, char * unit, int unit_size)", <<"Input string is to short"); 419 419 CTimer::get("XIOS").suspend(); … … 423 423 { 424 424 CTimer::get("XIOS").resume(); 425 return !fieldgroup_hdl->unit.isEmpty();425 return fieldgroup_hdl->unit.hasInheritedValue(); 426 426 CTimer::get("XIOS").suspend(); 427 427 } -
XIOS/trunk/src/interface/c_attr/icfile_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(file_hdl->description.get Value(),description , description_size))32 if(!string_copy(file_hdl->description.getInheritedValue(),description , description_size)) 33 33 ERROR("void cxios_get_file_description(file_Ptr file_hdl, char * description, int description_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !file_hdl->description.isEmpty();40 return file_hdl->description.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 54 54 void cxios_get_file_enabled(file_Ptr file_hdl, bool* enabled) 55 55 { 56 *enabled = file_hdl->enabled.get Value();56 *enabled = file_hdl->enabled.getInheritedValue(); 57 57 } 58 58 … … 60 60 { 61 61 CTimer::get("XIOS").resume(); 62 return !file_hdl->enabled.isEmpty();62 return file_hdl->enabled.hasInheritedValue(); 63 63 CTimer::get("XIOS").suspend(); 64 64 } … … 76 76 void cxios_get_file_min_digits(file_Ptr file_hdl, int* min_digits) 77 77 { 78 *min_digits = file_hdl->min_digits.get Value();78 *min_digits = file_hdl->min_digits.getInheritedValue(); 79 79 } 80 80 … … 82 82 { 83 83 CTimer::get("XIOS").resume(); 84 return !file_hdl->min_digits.isEmpty();84 return file_hdl->min_digits.hasInheritedValue(); 85 85 CTimer::get("XIOS").suspend(); 86 86 } … … 101 101 { 102 102 CTimer::get("XIOS").resume(); 103 if(!string_copy(file_hdl->name.get Value(),name , name_size))103 if(!string_copy(file_hdl->name.getInheritedValue(),name , name_size)) 104 104 ERROR("void cxios_get_file_name(file_Ptr file_hdl, char * name, int name_size)", <<"Input string is to short"); 105 105 CTimer::get("XIOS").suspend(); … … 109 109 { 110 110 CTimer::get("XIOS").resume(); 111 return !file_hdl->name.isEmpty();111 return file_hdl->name.hasInheritedValue(); 112 112 CTimer::get("XIOS").suspend(); 113 113 } … … 128 128 { 129 129 CTimer::get("XIOS").resume(); 130 if(!string_copy(file_hdl->name_suffix.get Value(),name_suffix , name_suffix_size))130 if(!string_copy(file_hdl->name_suffix.getInheritedValue(),name_suffix , name_suffix_size)) 131 131 ERROR("void cxios_get_file_name_suffix(file_Ptr file_hdl, char * name_suffix, int name_suffix_size)", <<"Input string is to short"); 132 132 CTimer::get("XIOS").suspend(); … … 136 136 { 137 137 CTimer::get("XIOS").resume(); 138 return !file_hdl->name_suffix.isEmpty();138 return file_hdl->name_suffix.hasInheritedValue(); 139 139 CTimer::get("XIOS").suspend(); 140 140 } … … 155 155 { 156 156 CTimer::get("XIOS").resume(); 157 if(!string_copy(file_hdl->output_freq.get Value(),output_freq , output_freq_size))157 if(!string_copy(file_hdl->output_freq.getInheritedValue(),output_freq , output_freq_size)) 158 158 ERROR("void cxios_get_file_output_freq(file_Ptr file_hdl, char * output_freq, int output_freq_size)", <<"Input string is to short"); 159 159 CTimer::get("XIOS").suspend(); … … 163 163 { 164 164 CTimer::get("XIOS").resume(); 165 return !file_hdl->output_freq.isEmpty();165 return file_hdl->output_freq.hasInheritedValue(); 166 166 CTimer::get("XIOS").suspend(); 167 167 } … … 179 179 void cxios_get_file_output_level(file_Ptr file_hdl, int* output_level) 180 180 { 181 *output_level = file_hdl->output_level.get Value();181 *output_level = file_hdl->output_level.getInheritedValue(); 182 182 } 183 183 … … 185 185 { 186 186 CTimer::get("XIOS").resume(); 187 return !file_hdl->output_level.isEmpty();187 return file_hdl->output_level.hasInheritedValue(); 188 188 CTimer::get("XIOS").suspend(); 189 189 } … … 204 204 { 205 205 CTimer::get("XIOS").resume(); 206 if(!string_copy(file_hdl->par_access.get Value(),par_access , par_access_size))206 if(!string_copy(file_hdl->par_access.getInheritedValue(),par_access , par_access_size)) 207 207 ERROR("void cxios_get_file_par_access(file_Ptr file_hdl, char * par_access, int par_access_size)", <<"Input string is to short"); 208 208 CTimer::get("XIOS").suspend(); … … 212 212 { 213 213 CTimer::get("XIOS").resume(); 214 return !file_hdl->par_access.isEmpty();214 return file_hdl->par_access.hasInheritedValue(); 215 215 CTimer::get("XIOS").suspend(); 216 216 } … … 231 231 { 232 232 CTimer::get("XIOS").resume(); 233 if(!string_copy(file_hdl->split_freq.get Value(),split_freq , split_freq_size))233 if(!string_copy(file_hdl->split_freq.getInheritedValue(),split_freq , split_freq_size)) 234 234 ERROR("void cxios_get_file_split_freq(file_Ptr file_hdl, char * split_freq, int split_freq_size)", <<"Input string is to short"); 235 235 CTimer::get("XIOS").suspend(); … … 239 239 { 240 240 CTimer::get("XIOS").resume(); 241 return !file_hdl->split_freq.isEmpty();241 return file_hdl->split_freq.hasInheritedValue(); 242 242 CTimer::get("XIOS").suspend(); 243 243 } … … 258 258 { 259 259 CTimer::get("XIOS").resume(); 260 if(!string_copy(file_hdl->split_freq_format.get Value(),split_freq_format , split_freq_format_size))260 if(!string_copy(file_hdl->split_freq_format.getInheritedValue(),split_freq_format , split_freq_format_size)) 261 261 ERROR("void cxios_get_file_split_freq_format(file_Ptr file_hdl, char * split_freq_format, int split_freq_format_size)", <<"Input string is to short"); 262 262 CTimer::get("XIOS").suspend(); … … 266 266 { 267 267 CTimer::get("XIOS").resume(); 268 return !file_hdl->split_freq_format.isEmpty();268 return file_hdl->split_freq_format.hasInheritedValue(); 269 269 CTimer::get("XIOS").suspend(); 270 270 } … … 285 285 { 286 286 CTimer::get("XIOS").resume(); 287 if(!string_copy(file_hdl->sync_freq.get Value(),sync_freq , sync_freq_size))287 if(!string_copy(file_hdl->sync_freq.getInheritedValue(),sync_freq , sync_freq_size)) 288 288 ERROR("void cxios_get_file_sync_freq(file_Ptr file_hdl, char * sync_freq, int sync_freq_size)", <<"Input string is to short"); 289 289 CTimer::get("XIOS").suspend(); … … 293 293 { 294 294 CTimer::get("XIOS").resume(); 295 return !file_hdl->sync_freq.isEmpty();295 return file_hdl->sync_freq.hasInheritedValue(); 296 296 CTimer::get("XIOS").suspend(); 297 297 } … … 312 312 { 313 313 CTimer::get("XIOS").resume(); 314 if(!string_copy(file_hdl->type.get StringValue(),type , type_size))314 if(!string_copy(file_hdl->type.getInheritedStringValue(),type , type_size)) 315 315 ERROR("void cxios_get_file_type(file_Ptr file_hdl, char * type, int type_size)", <<"Input string is to short"); 316 316 CTimer::get("XIOS").suspend(); … … 320 320 { 321 321 CTimer::get("XIOS").resume(); 322 return !file_hdl->type.isEmpty();322 return file_hdl->type.hasInheritedValue(); 323 323 CTimer::get("XIOS").suspend(); 324 324 } -
XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(filegroup_hdl->description.get Value(),description , description_size))32 if(!string_copy(filegroup_hdl->description.getInheritedValue(),description , description_size)) 33 33 ERROR("void cxios_get_filegroup_description(filegroup_Ptr filegroup_hdl, char * description, int description_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !filegroup_hdl->description.isEmpty();40 return filegroup_hdl->description.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 54 54 void cxios_get_filegroup_enabled(filegroup_Ptr filegroup_hdl, bool* enabled) 55 55 { 56 *enabled = filegroup_hdl->enabled.get Value();56 *enabled = filegroup_hdl->enabled.getInheritedValue(); 57 57 } 58 58 … … 60 60 { 61 61 CTimer::get("XIOS").resume(); 62 return !filegroup_hdl->enabled.isEmpty();62 return filegroup_hdl->enabled.hasInheritedValue(); 63 63 CTimer::get("XIOS").suspend(); 64 64 } … … 79 79 { 80 80 CTimer::get("XIOS").resume(); 81 if(!string_copy(filegroup_hdl->group_ref.get Value(),group_ref , group_ref_size))81 if(!string_copy(filegroup_hdl->group_ref.getInheritedValue(),group_ref , group_ref_size)) 82 82 ERROR("void cxios_get_filegroup_group_ref(filegroup_Ptr filegroup_hdl, char * group_ref, int group_ref_size)", <<"Input string is to short"); 83 83 CTimer::get("XIOS").suspend(); … … 87 87 { 88 88 CTimer::get("XIOS").resume(); 89 return !filegroup_hdl->group_ref.isEmpty();89 return filegroup_hdl->group_ref.hasInheritedValue(); 90 90 CTimer::get("XIOS").suspend(); 91 91 } … … 103 103 void cxios_get_filegroup_min_digits(filegroup_Ptr filegroup_hdl, int* min_digits) 104 104 { 105 *min_digits = filegroup_hdl->min_digits.get Value();105 *min_digits = filegroup_hdl->min_digits.getInheritedValue(); 106 106 } 107 107 … … 109 109 { 110 110 CTimer::get("XIOS").resume(); 111 return !filegroup_hdl->min_digits.isEmpty();111 return filegroup_hdl->min_digits.hasInheritedValue(); 112 112 CTimer::get("XIOS").suspend(); 113 113 } … … 128 128 { 129 129 CTimer::get("XIOS").resume(); 130 if(!string_copy(filegroup_hdl->name.get Value(),name , name_size))130 if(!string_copy(filegroup_hdl->name.getInheritedValue(),name , name_size)) 131 131 ERROR("void cxios_get_filegroup_name(filegroup_Ptr filegroup_hdl, char * name, int name_size)", <<"Input string is to short"); 132 132 CTimer::get("XIOS").suspend(); … … 136 136 { 137 137 CTimer::get("XIOS").resume(); 138 return !filegroup_hdl->name.isEmpty();138 return filegroup_hdl->name.hasInheritedValue(); 139 139 CTimer::get("XIOS").suspend(); 140 140 } … … 155 155 { 156 156 CTimer::get("XIOS").resume(); 157 if(!string_copy(filegroup_hdl->name_suffix.get Value(),name_suffix , name_suffix_size))157 if(!string_copy(filegroup_hdl->name_suffix.getInheritedValue(),name_suffix , name_suffix_size)) 158 158 ERROR("void cxios_get_filegroup_name_suffix(filegroup_Ptr filegroup_hdl, char * name_suffix, int name_suffix_size)", <<"Input string is to short"); 159 159 CTimer::get("XIOS").suspend(); … … 163 163 { 164 164 CTimer::get("XIOS").resume(); 165 return !filegroup_hdl->name_suffix.isEmpty();165 return filegroup_hdl->name_suffix.hasInheritedValue(); 166 166 CTimer::get("XIOS").suspend(); 167 167 } … … 182 182 { 183 183 CTimer::get("XIOS").resume(); 184 if(!string_copy(filegroup_hdl->output_freq.get Value(),output_freq , output_freq_size))184 if(!string_copy(filegroup_hdl->output_freq.getInheritedValue(),output_freq , output_freq_size)) 185 185 ERROR("void cxios_get_filegroup_output_freq(filegroup_Ptr filegroup_hdl, char * output_freq, int output_freq_size)", <<"Input string is to short"); 186 186 CTimer::get("XIOS").suspend(); … … 190 190 { 191 191 CTimer::get("XIOS").resume(); 192 return !filegroup_hdl->output_freq.isEmpty();192 return filegroup_hdl->output_freq.hasInheritedValue(); 193 193 CTimer::get("XIOS").suspend(); 194 194 } … … 206 206 void cxios_get_filegroup_output_level(filegroup_Ptr filegroup_hdl, int* output_level) 207 207 { 208 *output_level = filegroup_hdl->output_level.get Value();208 *output_level = filegroup_hdl->output_level.getInheritedValue(); 209 209 } 210 210 … … 212 212 { 213 213 CTimer::get("XIOS").resume(); 214 return !filegroup_hdl->output_level.isEmpty();214 return filegroup_hdl->output_level.hasInheritedValue(); 215 215 CTimer::get("XIOS").suspend(); 216 216 } … … 231 231 { 232 232 CTimer::get("XIOS").resume(); 233 if(!string_copy(filegroup_hdl->par_access.get Value(),par_access , par_access_size))233 if(!string_copy(filegroup_hdl->par_access.getInheritedValue(),par_access , par_access_size)) 234 234 ERROR("void cxios_get_filegroup_par_access(filegroup_Ptr filegroup_hdl, char * par_access, int par_access_size)", <<"Input string is to short"); 235 235 CTimer::get("XIOS").suspend(); … … 239 239 { 240 240 CTimer::get("XIOS").resume(); 241 return !filegroup_hdl->par_access.isEmpty();241 return filegroup_hdl->par_access.hasInheritedValue(); 242 242 CTimer::get("XIOS").suspend(); 243 243 } … … 258 258 { 259 259 CTimer::get("XIOS").resume(); 260 if(!string_copy(filegroup_hdl->split_freq.get Value(),split_freq , split_freq_size))260 if(!string_copy(filegroup_hdl->split_freq.getInheritedValue(),split_freq , split_freq_size)) 261 261 ERROR("void cxios_get_filegroup_split_freq(filegroup_Ptr filegroup_hdl, char * split_freq, int split_freq_size)", <<"Input string is to short"); 262 262 CTimer::get("XIOS").suspend(); … … 266 266 { 267 267 CTimer::get("XIOS").resume(); 268 return !filegroup_hdl->split_freq.isEmpty();268 return filegroup_hdl->split_freq.hasInheritedValue(); 269 269 CTimer::get("XIOS").suspend(); 270 270 } … … 285 285 { 286 286 CTimer::get("XIOS").resume(); 287 if(!string_copy(filegroup_hdl->split_freq_format.get Value(),split_freq_format , split_freq_format_size))287 if(!string_copy(filegroup_hdl->split_freq_format.getInheritedValue(),split_freq_format , split_freq_format_size)) 288 288 ERROR("void cxios_get_filegroup_split_freq_format(filegroup_Ptr filegroup_hdl, char * split_freq_format, int split_freq_format_size)", <<"Input string is to short"); 289 289 CTimer::get("XIOS").suspend(); … … 293 293 { 294 294 CTimer::get("XIOS").resume(); 295 return !filegroup_hdl->split_freq_format.isEmpty();295 return filegroup_hdl->split_freq_format.hasInheritedValue(); 296 296 CTimer::get("XIOS").suspend(); 297 297 } … … 312 312 { 313 313 CTimer::get("XIOS").resume(); 314 if(!string_copy(filegroup_hdl->sync_freq.get Value(),sync_freq , sync_freq_size))314 if(!string_copy(filegroup_hdl->sync_freq.getInheritedValue(),sync_freq , sync_freq_size)) 315 315 ERROR("void cxios_get_filegroup_sync_freq(filegroup_Ptr filegroup_hdl, char * sync_freq, int sync_freq_size)", <<"Input string is to short"); 316 316 CTimer::get("XIOS").suspend(); … … 320 320 { 321 321 CTimer::get("XIOS").resume(); 322 return !filegroup_hdl->sync_freq.isEmpty();322 return filegroup_hdl->sync_freq.hasInheritedValue(); 323 323 CTimer::get("XIOS").suspend(); 324 324 } … … 339 339 { 340 340 CTimer::get("XIOS").resume(); 341 if(!string_copy(filegroup_hdl->type.get StringValue(),type , type_size))341 if(!string_copy(filegroup_hdl->type.getInheritedStringValue(),type , type_size)) 342 342 ERROR("void cxios_get_filegroup_type(filegroup_Ptr filegroup_hdl, char * type, int type_size)", <<"Input string is to short"); 343 343 CTimer::get("XIOS").suspend(); … … 347 347 { 348 348 CTimer::get("XIOS").resume(); 349 return !filegroup_hdl->type.isEmpty();349 return filegroup_hdl->type.hasInheritedValue(); 350 350 CTimer::get("XIOS").suspend(); 351 351 } -
XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(grid_hdl->axis_ref.get Value(),axis_ref , axis_ref_size))32 if(!string_copy(grid_hdl->axis_ref.getInheritedValue(),axis_ref , axis_ref_size)) 33 33 ERROR("void cxios_get_grid_axis_ref(grid_Ptr grid_hdl, char * axis_ref, int axis_ref_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !grid_hdl->axis_ref.isEmpty();40 return grid_hdl->axis_ref.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 57 57 { 58 58 CTimer::get("XIOS").resume(); 59 if(!string_copy(grid_hdl->description.get Value(),description , description_size))59 if(!string_copy(grid_hdl->description.getInheritedValue(),description , description_size)) 60 60 ERROR("void cxios_get_grid_description(grid_Ptr grid_hdl, char * description, int description_size)", <<"Input string is to short"); 61 61 CTimer::get("XIOS").suspend(); … … 65 65 { 66 66 CTimer::get("XIOS").resume(); 67 return !grid_hdl->description.isEmpty();67 return grid_hdl->description.hasInheritedValue(); 68 68 CTimer::get("XIOS").suspend(); 69 69 } … … 84 84 { 85 85 CTimer::get("XIOS").resume(); 86 if(!string_copy(grid_hdl->domain_ref.get Value(),domain_ref , domain_ref_size))86 if(!string_copy(grid_hdl->domain_ref.getInheritedValue(),domain_ref , domain_ref_size)) 87 87 ERROR("void cxios_get_grid_domain_ref(grid_Ptr grid_hdl, char * domain_ref, int domain_ref_size)", <<"Input string is to short"); 88 88 CTimer::get("XIOS").suspend(); … … 92 92 { 93 93 CTimer::get("XIOS").resume(); 94 return !grid_hdl->domain_ref.isEmpty();94 return grid_hdl->domain_ref.hasInheritedValue(); 95 95 CTimer::get("XIOS").suspend(); 96 96 } … … 111 111 CTimer::get("XIOS").resume(); 112 112 CArray<bool,3> tmp(mask,shape(extent1,extent2,extent3),neverDeleteData) ; 113 tmp=grid_hdl->mask ;113 tmp=grid_hdl->mask.getInheritedValue() ; 114 114 CTimer::get("XIOS").suspend(); 115 115 } … … 118 118 { 119 119 CTimer::get("XIOS").resume(); 120 return !grid_hdl->mask.isEmpty();120 return grid_hdl->mask.hasInheritedValue(); 121 121 CTimer::get("XIOS").suspend(); 122 122 } … … 137 137 { 138 138 CTimer::get("XIOS").resume(); 139 if(!string_copy(grid_hdl->name.get Value(),name , name_size))139 if(!string_copy(grid_hdl->name.getInheritedValue(),name , name_size)) 140 140 ERROR("void cxios_get_grid_name(grid_Ptr grid_hdl, char * name, int name_size)", <<"Input string is to short"); 141 141 CTimer::get("XIOS").suspend(); … … 145 145 { 146 146 CTimer::get("XIOS").resume(); 147 return !grid_hdl->name.isEmpty();147 return grid_hdl->name.hasInheritedValue(); 148 148 CTimer::get("XIOS").suspend(); 149 149 } -
XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp
r432 r445 30 30 { 31 31 CTimer::get("XIOS").resume(); 32 if(!string_copy(gridgroup_hdl->axis_ref.get Value(),axis_ref , axis_ref_size))32 if(!string_copy(gridgroup_hdl->axis_ref.getInheritedValue(),axis_ref , axis_ref_size)) 33 33 ERROR("void cxios_get_gridgroup_axis_ref(gridgroup_Ptr gridgroup_hdl, char * axis_ref, int axis_ref_size)", <<"Input string is to short"); 34 34 CTimer::get("XIOS").suspend(); … … 38 38 { 39 39 CTimer::get("XIOS").resume(); 40 return !gridgroup_hdl->axis_ref.isEmpty();40 return gridgroup_hdl->axis_ref.hasInheritedValue(); 41 41 CTimer::get("XIOS").suspend(); 42 42 } … … 57 57 { 58 58 CTimer::get("XIOS").resume(); 59 if(!string_copy(gridgroup_hdl->description.get Value(),description , description_size))59 if(!string_copy(gridgroup_hdl->description.getInheritedValue(),description , description_size)) 60 60 ERROR("void cxios_get_gridgroup_description(gridgroup_Ptr gridgroup_hdl, char * description, int description_size)", <<"Input string is to short"); 61 61 CTimer::get("XIOS").suspend(); … … 65 65 { 66 66 CTimer::get("XIOS").resume(); 67 return !gridgroup_hdl->description.isEmpty();67 return gridgroup_hdl->description.hasInheritedValue(); 68 68 CTimer::get("XIOS").suspend(); 69 69 } … … 84 84 { 85 85 CTimer::get("XIOS").resume(); 86 if(!string_copy(gridgroup_hdl->domain_ref.get Value(),domain_ref , domain_ref_size))86 if(!string_copy(gridgroup_hdl->domain_ref.getInheritedValue(),domain_ref , domain_ref_size)) 87 87 ERROR("void cxios_get_gridgroup_domain_ref(gridgroup_Ptr gridgroup_hdl, char * domain_ref, int domain_ref_size)", <<"Input string is to short"); 88 88 CTimer::get("XIOS").suspend(); … … 92 92 { 93 93 CTimer::get("XIOS").resume(); 94 return !gridgroup_hdl->domain_ref.isEmpty();94 return gridgroup_hdl->domain_ref.hasInheritedValue(); 95 95 CTimer::get("XIOS").suspend(); 96 96 } … … 111 111 { 112 112 CTimer::get("XIOS").resume(); 113 if(!string_copy(gridgroup_hdl->group_ref.get Value(),group_ref , group_ref_size))113 if(!string_copy(gridgroup_hdl->group_ref.getInheritedValue(),group_ref , group_ref_size)) 114 114 ERROR("void cxios_get_gridgroup_group_ref(gridgroup_Ptr gridgroup_hdl, char * group_ref, int group_ref_size)", <<"Input string is to short"); 115 115 CTimer::get("XIOS").suspend(); … … 119 119 { 120 120 CTimer::get("XIOS").resume(); 121 return !gridgroup_hdl->group_ref.isEmpty();121 return gridgroup_hdl->group_ref.hasInheritedValue(); 122 122 CTimer::get("XIOS").suspend(); 123 123 } … … 138 138 CTimer::get("XIOS").resume(); 139 139 CArray<bool,3> tmp(mask,shape(extent1,extent2,extent3),neverDeleteData) ; 140 tmp=gridgroup_hdl->mask ;140 tmp=gridgroup_hdl->mask.getInheritedValue() ; 141 141 CTimer::get("XIOS").suspend(); 142 142 } … … 145 145 { 146 146 CTimer::get("XIOS").resume(); 147 return !gridgroup_hdl->mask.isEmpty();147 return gridgroup_hdl->mask.hasInheritedValue(); 148 148 CTimer::get("XIOS").suspend(); 149 149 } … … 164 164 { 165 165 CTimer::get("XIOS").resume(); 166 if(!string_copy(gridgroup_hdl->name.get Value(),name , name_size))166 if(!string_copy(gridgroup_hdl->name.getInheritedValue(),name , name_size)) 167 167 ERROR("void cxios_get_gridgroup_name(gridgroup_Ptr gridgroup_hdl, char * name, int name_size)", <<"Input string is to short"); 168 168 CTimer::get("XIOS").suspend(); … … 172 172 { 173 173 CTimer::get("XIOS").resume(); 174 return !gridgroup_hdl->name.isEmpty();174 return gridgroup_hdl->name.hasInheritedValue(); 175 175 CTimer::get("XIOS").suspend(); 176 176 } -
XIOS/trunk/src/interface/fortran/idata.F90
r325 r445 37 37 SUBROUTINE cxios_finalize() BIND(C) 38 38 END SUBROUTINE cxios_finalize 39 40 SUBROUTINE cxios_solve_inheritance() BIND(C) 41 END SUBROUTINE cxios_solve_inheritance 39 42 40 43 … … 148 151 END SUBROUTINE xios(context_finalize) 149 152 150 153 SUBROUTINE xios(solve_inheritance)() 154 IMPLICIT NONE 155 CALL cxios_solve_inheritance() 156 END SUBROUTINE xios(solve_inheritance) 157 151 158 152 159 SUBROUTINE xios(send_field_r8_1d)(fieldid, data1d_k8) -
XIOS/trunk/src/interface/fortran/ixios.F90
r432 r445 12 12 13 13 USE idata, ONLY : xios(initialize),xios(init_server), xios(finalize), xios(context_initialize), & 14 xios(close_context_definition), &14 xios(close_context_definition),xios(solve_inheritance), & 15 15 xios(context_finalize), xios(send_field_r8_1d), xios(send_field_r8_2d), & 16 16 xios(send_field_r8_3d), xios(send_field_r4_1d), xios(send_field_r4_2d), & … … 155 155 PUBLIC :: xios(set_current_context) 156 156 PUBLIC :: xios(set_timestep),xios(update_calendar) 157 PUBLIC :: xios(initialize), xios(init_server), xios(finalize), xios(context_initialize), 157 PUBLIC :: xios(initialize), xios(init_server), xios(finalize), xios(context_initialize),xios(solve_inheritance), & 158 158 xios(close_context_definition), xios(context_finalize), xios(send_field),xios(field_is_active) 159 159
Note: See TracChangeset
for help on using the changeset viewer.