Skip to content

Commit

Permalink
Update ThermoPower tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjoelund
sjoelund committed May 11, 2015
1 parent 2f9ab57 commit c5ab021
Show file tree
Hide file tree
Showing 9 changed files with 644 additions and 12,205 deletions.
20 changes: 10 additions & 10 deletions simulation/libraries/3rdParty/ThermoPower/Makefile
View file
Expand Up @@ -4,12 +4,12 @@ TESTFILES = \
Bug2537.mos \
ThermoPower.Test.DistributedParameterComponents.TestWaterFlow1DFV_B.mos \
ThermoPower.Examples.CISE.CISESim2States120501.mos \
ThermoPower.Test.DistributedParameterComponents.TestFlow1D2phC.mos \
ThermoPower.Test.DistributedParameterComponents.TestFlow1D2phChen.mos \
ThermoPower.Test.DistributedParameterComponents.TestFlow1D2phDB_hf.mos \
ThermoPower.Examples.RankineCycle.Simulators.ClosedLoop.mos \
ThermoPower.PowerPlants.SteamTurbineGroup.Tests.TestSTG_cc.mos \

# test that currently fail. Move up when fixed.
# test that currently fail. Move up when fixed.
# Run make testfailing
FAILINGTESTFILES= \

Expand All @@ -19,8 +19,8 @@ DEPENDENCIES = \
*.mo \
*.mos \
*.mat \
Makefile
Makefile


CLEAN = `ls | grep -w -v -f deps.tmp`

Expand All @@ -33,7 +33,7 @@ test :
@echo OPENMODELICAHOME=" $(OPENMODELICAHOME) "
@$(TEST) $(TESTFILES)

# Cleans all files that are not listed as dependencies
# Cleans all files that are not listed as dependencies
clean :
@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
@rm -f $(CLEAN)
Expand All @@ -42,14 +42,14 @@ clean :
# do it after cleaning and updating the folder
# then you can get a list of file names (which must be dependencies
# since you got them from repository + your own new files)
# then add them to the DEPENDENCIES. You can find the
# list in deps.txt
getdeps:
# then add them to the DEPENDENCIES. You can find the
# list in deps.txt
getdeps:
@echo $(DEPENDENCIES) | sed 's/ /\\|/g' > deps.tmp
@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt
@echo $(CLEAN) | sed -r 's/deps.txt|deps.tmp//g' | sed 's/ / \\\n/g' > deps.txt
@echo Dependency list saved in deps.txt.
@echo Copy the list from deps.txt and add it to the Makefile @DEPENDENCIES

failingtest :
@echo
@echo Running failing tests...
Expand Down
66 changes: 65 additions & 1 deletion simulation/libraries/3rdParty/ThermoPower/ThermoPower.Examples.CISE.CISESim2States120501.mos
View file
Expand Up @@ -3,7 +3,7 @@
// status: correct

// Test1
loadFile("TestOverdeterminedInitializationTotal.mo"); getErrorString();
loadModel(ThermoPower); getErrorString();
simulate(ThermoPower.Examples.CISE.CISESim2States120501); getErrorString();

// Result:
Expand All @@ -15,6 +15,66 @@ simulate(ThermoPower.Examples.CISE.CISESim2States120501); getErrorString();
// messages = ""
// end SimulationResult;
// "Warning: Alias set with several free start values
// * candidate: Plant.Pipe2Valve.heatTransfer.Tw[1](start = 500.0)
// * candidate: Plant.Pipe2ValveWall.int.T[1](start = Plant.Pipe2ValveWall.Tvolstart[1])
// => select value from Plant.Pipe2Valve.heatTransfer.Tw[1](start = 500.0) for variable: Plant.Pipe2Valve.heatTransfer.Tw[1]
// Warning: Alias set with different nominal values
// * candidate: Plant.Pipe2ValveWall.int.T[1](nominal = 300.0)
// * candidate: Plant.Pipe2Valve.wall.T[1](nominal = 300.0)
// * candidate: Plant.Pipe2Valve.heatTransfer.wall.T[1](nominal = 300.0)
// * candidate: Plant.Pipe2Valve.heatTransfer.Tw[1](nominal = 500.0)
// => select value from Plant.Pipe2Valve.heatTransfer.Tw[1](nominal = 500.0) for variable: Plant.Pipe2Valve.heatTransfer.Tw[1]
// Warning: Alias set with several free start values
// * candidate: Plant.SH.heatTransfer.Tw[4](start = 500.0)
// * candidate: Plant.SHWall.int.T[4](start = Plant.SHWall.Tvolstart[4])
// => select value from Plant.SH.heatTransfer.Tw[4](start = 500.0) for variable: Plant.SH.heatTransfer.Tw[4]
// Warning: Alias set with different nominal values
// * candidate: Plant.SHWall.int.T[4](nominal = 300.0)
// * candidate: Plant.SH.wall.T[4](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.wall.T[4](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.Tw[4](nominal = 500.0)
// => select value from Plant.SH.heatTransfer.Tw[4](nominal = 500.0) for variable: Plant.SH.heatTransfer.Tw[4]
// Warning: Alias set with several free start values
// * candidate: Plant.SH.heatTransfer.Tw[3](start = 500.0)
// * candidate: Plant.SHWall.int.T[3](start = Plant.SHWall.Tvolstart[3])
// => select value from Plant.SH.heatTransfer.Tw[3](start = 500.0) for variable: Plant.SH.heatTransfer.Tw[3]
// Warning: Alias set with different nominal values
// * candidate: Plant.SHWall.int.T[3](nominal = 300.0)
// * candidate: Plant.SH.wall.T[3](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.wall.T[3](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.Tw[3](nominal = 500.0)
// => select value from Plant.SH.heatTransfer.Tw[3](nominal = 500.0) for variable: Plant.SH.heatTransfer.Tw[3]
// Warning: Alias set with several free start values
// * candidate: Plant.SH.heatTransfer.Tw[2](start = 500.0)
// * candidate: Plant.SHWall.int.T[2](start = Plant.SHWall.Tvolstart[2])
// => select value from Plant.SH.heatTransfer.Tw[2](start = 500.0) for variable: Plant.SH.heatTransfer.Tw[2]
// Warning: Alias set with different nominal values
// * candidate: Plant.SHWall.int.T[2](nominal = 300.0)
// * candidate: Plant.SH.wall.T[2](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.wall.T[2](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.Tw[2](nominal = 500.0)
// => select value from Plant.SH.heatTransfer.Tw[2](nominal = 500.0) for variable: Plant.SH.heatTransfer.Tw[2]
// Warning: Alias set with several free start values
// * candidate: Plant.SH.heatTransfer.Tw[1](start = 500.0)
// * candidate: Plant.SHWall.int.T[1](start = Plant.SHWall.Tvolstart[1])
// => select value from Plant.SH.heatTransfer.Tw[1](start = 500.0) for variable: Plant.SH.heatTransfer.Tw[1]
// Warning: Alias set with different nominal values
// * candidate: Plant.SHWall.int.T[1](nominal = 300.0)
// * candidate: Plant.SH.wall.T[1](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.wall.T[1](nominal = 300.0)
// * candidate: Plant.SH.heatTransfer.Tw[1](nominal = 500.0)
// => select value from Plant.SH.heatTransfer.Tw[1](nominal = 500.0) for variable: Plant.SH.heatTransfer.Tw[1]
// Warning: Alias set with several free start values
// * candidate: Plant.Pipe2SH.heatTransfer.Tw[1](start = 500.0)
// * candidate: Plant.Pipe2SHWall.int.T[1](start = Plant.Pipe2SHWall.Tvolstart[1])
// => select value from Plant.Pipe2SH.heatTransfer.Tw[1](start = 500.0) for variable: Plant.Pipe2SH.heatTransfer.Tw[1]
// Warning: Alias set with different nominal values
// * candidate: Plant.Pipe2SHWall.int.T[1](nominal = 300.0)
// * candidate: Plant.Pipe2SH.wall.T[1](nominal = 300.0)
// * candidate: Plant.Pipe2SH.heatTransfer.wall.T[1](nominal = 300.0)
// * candidate: Plant.Pipe2SH.heatTransfer.Tw[1](nominal = 500.0)
// => select value from Plant.Pipe2SH.heatTransfer.Tw[1](nominal = 500.0) for variable: Plant.Pipe2SH.heatTransfer.Tw[1]
// Warning: Alias set with several free start values
// * candidate: Plant.DrumBoiler.p(start = Plant.DrumBoiler.pstart)
// * candidate: Plant.DrumBoiler.sat.psat(start = 5000000.0)
// * candidate: Plant.DrumBoiler.steam.p(start = 5000000.0)
Expand Down Expand Up @@ -85,6 +145,10 @@ simulate(ThermoPower.Examples.CISE.CISESim2States120501); getErrorString();
// * candidate: Plant.Valve.fluidState.h(start = 100000.0)
// * candidate: Plant.Pipe2Valve.infl.h_outflow(start = Plant.Pipe2Valve.hstartin)
// => select value from Plant.Pipe2Valve.htilde[1](start = Plant.Pipe2Valve.hstart[2]) for variable: Plant.Pipe2Valve.htilde[1]
// Warning: Alias set with different nominal values
// * candidate: Plant.Valve.fluidState.d(nominal = 500.0)
// * candidate: Plant.Valve.rho(nominal = 1000.0)
// => select value from Plant.Valve.rho(nominal = 1000.0) for variable: Plant.Valve.rho
// Warning: Alias set with several free start values
// * candidate: Plant.SH.htilde[4](start = Plant.SH.hstart[5])
// * candidate: Plant.SH.h[5](start = Plant.SH.hstart[5])
Expand Down

0 comments on commit c5ab021

Please sign in to comment.