diff -c -r oommf12a3/app/oxs/ext/atlasscalarfield.cc oommf/app/oxs/ext/atlasscalarfield.cc *** oommf12a3/app/oxs/ext/atlasscalarfield.cc Wed Mar 20 19:21:44 2002 --- oommf/app/oxs/ext/atlasscalarfield.cc Mon Dec 9 16:12:29 2002 *************** *** 40,50 **** OxsASFSpecifiedValue default_value; if(HasInitValue("default_value")) { default_value.value=GetRealInitValue("default_value"); ! default_value.isset=1; } // Fill out value vector with default_value. This is essentially ! // an empty padding if default.isset==0. unsigned int i; for(i=0;iGetRegionCount();i++) { values.push_back(default_value); --- 40,50 ---- OxsASFSpecifiedValue default_value; if(HasInitValue("default_value")) { default_value.value=GetRealInitValue("default_value"); ! default_value.value_is_set=1; } // Fill out value vector with default_value. This is essentially ! // an empty padding if default.value_is_set==0. unsigned int i; for(i=0;iGetRegionCount();i++) { values.push_back(default_value); *************** *** 86,92 **** value.c_str(),name.c_str()); throw Oxs_Ext::Error(this,buf); } else { ! values[region_id].isset = 1; } } DeleteInitValue("values"); --- 86,92 ---- value.c_str(),name.c_str()); throw Oxs_Ext::Error(this,buf); } else { ! values[region_id].value_is_set = 1; } } DeleteInitValue("values"); *************** *** 102,108 **** { const Oxs_Atlas* atlas = atlas_key.GetPtr(); INT4m id = atlas->GetRegionId(pt); ! if(!values[id].isset) { char buf[1024]; string regionname; atlas->GetRegionName(id,regionname); --- 102,108 ---- { const Oxs_Atlas* atlas = atlas_key.GetPtr(); INT4m id = atlas->GetRegionId(pt); ! if(!values[id].value_is_set) { char buf[1024]; string regionname; atlas->GetRegionName(id,regionname); diff -c -r oommf12a3/app/oxs/ext/atlasscalarfield.h oommf/app/oxs/ext/atlasscalarfield.h *** oommf12a3/app/oxs/ext/atlasscalarfield.h Thu Mar 21 15:05:10 2002 --- oommf/app/oxs/ext/atlasscalarfield.h Mon Dec 9 16:12:29 2002 *************** *** 21,29 **** // Struct for use inside Oxs_AtlasScalarField class only. // Defined outside that class to please MSVC++ 5.0. struct OxsASFSpecifiedValue { ! BOOL isset; REAL8m value; ! OxsASFSpecifiedValue() : isset(0), value(0.) {} }; // The next 3 operators are defined so MSVC++ 5.0 will accept // vector, but are left undefined because --- 21,29 ---- // Struct for use inside Oxs_AtlasScalarField class only. // Defined outside that class to please MSVC++ 5.0. struct OxsASFSpecifiedValue { ! BOOL value_is_set; REAL8m value; ! OxsASFSpecifiedValue() : value_is_set(0), value(0.) {} }; // The next 3 operators are defined so MSVC++ 5.0 will accept // vector, but are left undefined because diff -c -r oommf12a3/app/oxs/ext/atlasvectorfield.cc oommf/app/oxs/ext/atlasvectorfield.cc *** oommf12a3/app/oxs/ext/atlasvectorfield.cc Wed Mar 20 19:21:44 2002 --- oommf/app/oxs/ext/atlasvectorfield.cc Mon Dec 9 16:12:29 2002 *************** *** 47,58 **** OxsAVFSpecifiedValue default_value; if(HasInitValue("default_value")) { default_value.value = GetThreeVectorInitValue("default_value"); ! default_value.isset = 1; if(set_norm) default_value.value.SetMag(norm); } // Fill out value vector with default_value. This is essentially ! // an empty padding if default.isset==0. unsigned int i; for(i=0;iGetRegionCount();i++) { values.push_back(default_value); --- 47,58 ---- OxsAVFSpecifiedValue default_value; if(HasInitValue("default_value")) { default_value.value = GetThreeVectorInitValue("default_value"); ! default_value.value_is_set = 1; if(set_norm) default_value.value.SetMag(norm); } // Fill out value vector with default_value. This is essentially ! // an empty padding if default.value_is_set==0. unsigned int i; for(i=0;iGetRegionCount();i++) { values.push_back(default_value); *************** *** 98,104 **** name.c_str(),atlas_obj->InstanceName()); throw Oxs_Ext::Error(this,buf); } else { ! values[region_id].isset = 1; } } DeleteInitValue("values"); --- 98,104 ---- name.c_str(),atlas_obj->InstanceName()); throw Oxs_Ext::Error(this,buf); } else { ! values[region_id].value_is_set = 1; } } DeleteInitValue("values"); *************** *** 116,122 **** { const Oxs_Atlas* atlas = atlas_key.GetPtr(); INT4m id = atlas->GetRegionId(pt); ! if(!values[id].isset) { char buf[1024]; string regionname; atlas->GetRegionName(id,regionname); --- 116,122 ---- { const Oxs_Atlas* atlas = atlas_key.GetPtr(); INT4m id = atlas->GetRegionId(pt); ! if(!values[id].value_is_set) { char buf[1024]; string regionname; atlas->GetRegionName(id,regionname); diff -c -r oommf12a3/app/oxs/ext/atlasvectorfield.h oommf/app/oxs/ext/atlasvectorfield.h *** oommf12a3/app/oxs/ext/atlasvectorfield.h Thu Mar 21 15:05:10 2002 --- oommf/app/oxs/ext/atlasvectorfield.h Mon Dec 9 16:12:29 2002 *************** *** 21,29 **** // Struct for use inside Oxs_AtlasVectorField class only. // Defined outside that class to please MSVC++ 5.0. struct OxsAVFSpecifiedValue { ! BOOL isset; ThreeVector value; ! OxsAVFSpecifiedValue() : isset(0), value(0.,0.,0.) {} }; // The next 3 operators are defined so MSVC++ 5.0 will accept // vector, but are left undefined because --- 21,29 ---- // Struct for use inside Oxs_AtlasVectorField class only. // Defined outside that class to please MSVC++ 5.0. struct OxsAVFSpecifiedValue { ! BOOL value_is_set; ThreeVector value; ! OxsAVFSpecifiedValue() : value_is_set(0), value(0.,0.,0.) {} }; // The next 3 operators are defined so MSVC++ 5.0 will accept // vector, but are left undefined because