Skip to content

Commit

Permalink
update to Archsim 4.0.2.17
Browse files Browse the repository at this point in the history
  • Loading branch information
@rosecodym
rosecodym committed Jul 3, 2016
1 parent d1bbdab commit 6fc4967
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 25 deletions.
3 changes: 2 additions & 1 deletion ArchsimConverter/ArchsimConverter.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="ArchSimLib4Umi">
<Reference Include="ArchSimLib4Umi, Version=4.0.2.17, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dependencies\ArchSimLib4Umi.dll</HintPath>
</Reference>
<Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
Expand Down
83 changes: 60 additions & 23 deletions ArchsimConverter/Conversion.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,30 @@ static Conversion()
Mapper
.CreateMap<Core.WindowMaterialBase, ArchsimLib.WindowMaterialBase>()
.IncludeBase<Core.MaterialBase, ArchsimLib.BaseMaterial>();
Mapper
.CreateMap<Core.GasMaterial, ArchsimLib.GasMaterial>()
.IncludeBase<Core.WindowMaterialBase, ArchsimLib.WindowMaterialBase>()
.ForMember(dest => dest.GasType, opt => opt.ResolveUsing(src => Enum.Parse(typeof(ArchsimLib.GasTypes), src.Type, ignoreCase: true)));
// GasMaterial mapping has some weird Automapper gremlin and has to be done by hand
// (This isn't the first Automapper gremlin I've found)

Mapper
.CreateMap<Core.ConstructionBase, ArchsimLib.BaseConstruction>()
.IncludeBase<Core.LibraryComponent, ArchsimLib.LibraryComponent>()
.ForMember(dest => dest.EmbodiedEnergy, opt => opt.Ignore())
.ForMember(dest => dest.EmbodiedEnergyStdDev, opt => opt.Ignore())
.ForMember(dest => dest.EmbodiedCarbon, opt => opt.Ignore())
.ForMember(dest => dest.EmbodiedCarbonStdDev, opt => opt.Ignore())
.ForMember(dest => dest.Cost, opt => opt.Ignore())
.ForMember(dest => dest.Life, opt => opt.Ignore());
Mapper
.CreateMap<Core.OpaqueConstruction, ArchsimLib.OpaqueConstruction>()
.IncludeBase<Core.ConstructionBase, ArchsimLib.BaseConstruction>()
.ForMember(dest => dest.Layers, opt => opt.Ignore());
.ForMember(dest => dest.Layers, opt => opt.Ignore())
.ForMember(dest => dest.Type, opt => opt.Ignore())
;
Mapper
.CreateMap<Core.WindowConstruction, ArchsimLib.GlazingConstruction>()
.IncludeBase<Core.ConstructionBase, ArchsimLib.BaseConstruction>()
.ForMember(dest => dest.Layers, opt => opt.Ignore());
.ForMember(dest => dest.Layers, opt => opt.Ignore())
.ForMember(dest => dest.Type, opt => opt.MapFrom(src => src.Category))
;

Mapper
.CreateMap<Core.ZoneConditioning, ArchsimLib.ZoneConditioning>()
Expand All @@ -55,7 +62,11 @@ static Conversion()
.ForMember(dest => dest.MechVentIsOn, opt => opt.MapFrom(src => src.IsMechVentOn))
.ForMember(dest => dest.MechVentSchedule, opt => opt.ResolveUsing(src => src.MechVentSchedule.Name))
.ForMember(dest => dest.MinFreshAirArea, opt => opt.MapFrom(src => src.MinFreshAirPerArea))
.ForMember(dest => dest.MinFreshAirPerson, opt => opt.MapFrom(src => src.MinFreshAirPerPerson));
.ForMember(dest => dest.MinFreshAirPerson, opt => opt.MapFrom(src => src.MinFreshAirPerPerson))
.ForMember(dest => dest.HumidistatOnOff, opt => opt.Ignore())
.ForMember(dest => dest.MinHumidity, opt => opt.Ignore())
.ForMember(dest => dest.MaxHumidity, opt => opt.Ignore())
;
Mapper
.CreateMap<Core.DomesticHotWaterSettings, ArchsimLib.DomHotWater>()
.IncludeBase<Core.LibraryComponent, ArchsimLib.LibraryComponent>()
Expand All @@ -69,27 +80,38 @@ static Conversion()
.ForMember(dest => dest.LightsAvailibilitySchedule, opt => opt.ResolveUsing(src => src.LightsAvailabilitySchedule.Name))
.ForMember(dest => dest.LightsIsOn, opt => opt.MapFrom(src => src.IsLightingOn))
.ForMember(dest => dest.OccupancySchedule, opt => opt.ResolveUsing(src => src.OccupancySchedule.Name))
.ForMember(dest => dest.PeopleIsOn, opt => opt.MapFrom(src => src.IsPeopleOn));
.ForMember(dest => dest.PeopleIsOn, opt => opt.MapFrom(src => src.IsPeopleOn))
.ForMember(dest => dest.MetabolicRate, opt => opt.Ignore())
;
Mapper
.CreateMap<Core.ZoneConstructions, ArchsimLib.ZoneConstruction>()
.IncludeBase<Core.LibraryComponent, ArchsimLib.LibraryComponent>()
.ForMember(dest => dest.FacadeConstruction, opt => opt.ResolveUsing(src => src.Facade.Name))
.ForMember(dest => dest.FacadeIsAdiabatic, opt => opt.MapFrom(src => src.IsFacadeAdiabatic))
.ForMember(dest => dest.FacadeIsAdiabatic, opt => opt.Ignore())
.ForMember(dest => dest.GroundConstruction, opt => opt.ResolveUsing(src => src.Ground.Name))
.ForMember(dest => dest.GroundIsAdiabatic, opt => opt.MapFrom(src => src.IsGroundAdiabatic))
.ForMember(dest => dest.GroundIsAdiabatic, opt => opt.Ignore())
.ForMember(dest => dest.PartitionConstruction, opt => opt.ResolveUsing(src => src.Partition.Name))
.ForMember(dest => dest.PartitionIsAdiabatic, opt => opt.MapFrom(src => src.IsPartitionAdiabatic))
.ForMember(dest => dest.PartitionIsAdiabatic, opt => opt.Ignore())
.ForMember(dest => dest.RoofConstruction, opt => opt.ResolveUsing(src => src.Roof.Name))
.ForMember(dest => dest.RoofIsAdiabatic, opt => opt.MapFrom(src => src.IsRoofAdiabatic))
.ForMember(dest => dest.RoofIsAdiabatic, opt => opt.Ignore())
.ForMember(dest => dest.SlabConstruction, opt => opt.ResolveUsing(src => src.Slab.Name))
.ForMember(dest => dest.SlabIsAdiabatic, opt => opt.MapFrom(src => src.IsSlabAdiabatic));
.ForMember(dest => dest.SlabIsAdiabatic, opt => opt.Ignore())
.ForMember(dest => dest.DaylightMeshResolution, opt => opt.Ignore())
.ForMember(dest => dest.DaylightWorkplaneHeight, opt => opt.Ignore())
.ForMember(dest => dest.SurfaceConvectionModelInside, opt => opt.Ignore())
.ForMember(dest => dest.SurfaceConvectionModelOutside, opt => opt.Ignore())
.ForMember(dest => dest.ZonePriority, opt => opt.Ignore())
.ForMember(dest => dest.InternalMassConstruction, opt => opt.Ignore())
.ForMember(dest => dest.InternalMassExposedAreaPerArea, opt => opt.Ignore())
;
Mapper
.CreateMap<Core.ZoneVentilation, ArchsimLib.ZoneVentilation>()
.IncludeBase<Core.LibraryComponent, ArchsimLib.LibraryComponent>()
.ForMember(dest => dest.AFN, opt => opt.MapFrom(src => src.Afn))
.ForMember(dest => dest.BuoyancyDrivenIsOn, opt => opt.MapFrom(src => src.IsBuoyancyOn))
.ForMember(dest => dest.InfiltrationAch, opt => opt.MapFrom(src => src.Infiltration))
.ForMember(dest => dest.InfiltrationIsOn, opt => opt.MapFrom(src => src.IsInfiltrationOn))
.ForMember(dest => dest.InfiltrationModel, opt => opt.Ignore())
.ForMember(dest => dest.NatVentIsOn, opt => opt.MapFrom(src => src.IsNatVentOn))
.ForMember(dest => dest.NatVentMaxOutAirTemp, opt => opt.MapFrom(src => src.NatVentMaxOutdoorAirTemp))
.ForMember(dest => dest.NatVentMaxRelHum, opt => opt.MapFrom(src => src.NatVentMaxRelHumidity))
Expand All @@ -104,12 +126,7 @@ static Conversion()
Mapper
.CreateMap<Core.ZoneDefinition, ArchsimLib.ZoneDefinition>()
.IncludeBase<Core.LibraryComponent, ArchsimLib.LibraryComponent>()
.ForMember(dest => dest.SurfaceConvectionModelInside, opt => opt.Ignore())
.ForMember(dest => dest.SurfaceConvectionModelOutside, opt => opt.Ignore())
.ForMember(dest => dest.ZoneMultiplier, opt => opt.Ignore())
.ForMember(dest => dest.ZonePriority, opt => opt.Ignore())
.ForMember(dest => dest.InternalMassConstruction, opt => opt.ResolveUsing(zone => zone.InternalMassConstruction.Name))
.ForMember(dest => dest.InternalMassExposedAreaPerArea, opt => opt.MapFrom(src => src.InternalMassExposedPerFloorArea))
.ForMember(dest => dest.DomHotWater, opt => opt.MapFrom(src => src.DomesticHotWater))
.ForMember(dest => dest.Materials, opt => opt.MapFrom(src => src.Constructions));

Expand All @@ -125,7 +142,14 @@ static Conversion()
.ForMember(dest => dest.ShadingSystemSetPoint, opt => opt.MapFrom(src => src.ShadingSystemSetpoint))
.ForMember(dest => dest.ShadingSystemType, opt => opt.ResolveUsing(src => Enum.Parse(typeof(ArchsimLib.ShadingType), src.ShadingSystemType.ToString(), ignoreCase: true)))
.ForMember(dest => dest.ZoneMixingAvailibilitySchedule, opt => opt.ResolveUsing(src => src.ZoneMixingAvailabilitySchedule.Name))
.ForMember(dest => dest.ZoneMixingIsOn, opt => opt.MapFrom(src => src.IsZoneMixingOn));
.ForMember(dest => dest.ZoneMixingIsOn, opt => opt.MapFrom(src => src.IsZoneMixingOn))
.ForMember(dest => dest.FrameWidth, opt => opt.Ignore())
.ForMember(dest => dest.FrameProjection, opt => opt.Ignore())
.ForMember(dest => dest.FrameConductance, opt => opt.Ignore())
.ForMember(dest => dest.DividerWidth, opt => opt.Ignore())
.ForMember(dest => dest.InsideSillRevealDepth, opt => opt.Ignore())
.ForMember(dest => dest.HasFrame, opt => opt.Ignore())
;

Mapper.AssertConfigurationIsValid();
}
Expand Down Expand Up @@ -214,8 +238,12 @@ public static ArchsimLib.DaySchedule Convert(Core.DaySchedule day) =>
public static ArchsimLib.DomHotWater Convert(Core.DomesticHotWaterSettings dhw) =>
Mapper.Map<ArchsimLib.DomHotWater>(dhw);

public static ArchsimLib.GasMaterial Convert(Core.GasMaterial gas) =>
Mapper.Map<ArchsimLib.GasMaterial>(gas);
public static ArchsimLib.GasMaterial Convert(Core.GasMaterial gas)
{
var type = default(ArchsimLib.GasTypes);
Enum.TryParse<ArchsimLib.GasTypes>(gas.Name, ignoreCase: true, result: out type);
return new ArchsimLib.GasMaterial(type);
}

public static ArchsimLib.GlazingConstruction Convert(Core.WindowConstruction window, Func<Core.WindowMaterialBase, ArchsimLib.WindowMaterialBase> getArchsimMat)
{
Expand Down Expand Up @@ -250,6 +278,10 @@ public static ArchsimLib.GlazingMaterial Convert(Core.GlazingMaterial glazing) =
public static ArchsimLib.OpaqueConstruction Convert(Core.OpaqueConstruction c, Func<Core.OpaqueMaterial, ArchsimLib.OpaqueMaterial> getArchsimMat)
{
var res = Mapper.Map<ArchsimLib.OpaqueConstruction>(c);
var type = default(ArchsimLib.ConstructionTypes);
var typeString = c.Category.Replace(" ", String.Empty);
Enum.TryParse<ArchsimLib.ConstructionTypes>(typeString, ignoreCase: true, result: out type);
res.Type = type;
res.Layers =
c
.Layers
Expand Down Expand Up @@ -306,8 +338,13 @@ public static ArchsimLib.YearSchedule Convert(Core.YearSchedule year, Func<Core.
return res;
}

public static ArchsimLib.ZoneDefinition Convert(Core.ZoneDefinition zone) =>
Mapper.Map<ArchsimLib.ZoneDefinition>(zone);
public static ArchsimLib.ZoneDefinition Convert(Core.ZoneDefinition zone)
{
var res = Mapper.Map<ArchsimLib.ZoneDefinition>(zone);
res.Materials.InternalMassExposedAreaPerArea = zone.InternalMassExposedPerFloorArea;
res.Materials.InternalMassConstruction = zone.InternalMassConstruction?.Name;
return res;
}

public static void VerifyZoneConstructions(ArchsimLib.Library lib)
{
Expand Down
2 changes: 1 addition & 1 deletion AssemblyInfoCommon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
[assembly: AssemblyCopyright("Copyright © Massachusetts Institute of Technology 2015-2016")]
[assembly: AssemblyProduct("Basilisk")]

[assembly: AssemblyVersion("1.0.3")]
[assembly: AssemblyVersion("2.0.0")]

0 comments on commit 6fc4967

Please sign in to comment.