diff -Nru elmerfem-csc-eg-8.4-0ppa0/debian/changelog elmerfem-csc-eg-8.4-0ppa0/debian/changelog --- elmerfem-csc-eg-8.4-0ppa0/debian/changelog 2020-09-18 18:03:03.000000000 +0000 +++ elmerfem-csc-eg-8.4-0ppa0/debian/changelog 2020-09-19 18:02:17.000000000 +0000 @@ -1,8 +1,8 @@ -elmerfem-csc-eg (8.4-0ppa0-202009181803~e45f4b84~ubuntu18.04.1) bionic; urgency=low +elmerfem-csc-eg (8.4-0ppa0-202009191802~7ce683c0~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Launchpad Package Builder Fri, 18 Sep 2020 18:03:03 +0000 + -- Launchpad Package Builder Sat, 19 Sep 2020 18:02:17 +0000 elmerfem-csc (8.4-0ppa0) bionic; urgency=low diff -Nru elmerfem-csc-eg-8.4-0ppa0/debian/git-build-recipe.manifest elmerfem-csc-eg-8.4-0ppa0/debian/git-build-recipe.manifest --- elmerfem-csc-eg-8.4-0ppa0/debian/git-build-recipe.manifest 2020-09-18 18:03:03.000000000 +0000 +++ elmerfem-csc-eg-8.4-0ppa0/debian/git-build-recipe.manifest 2020-09-19 18:02:17.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debversion}-202009181803~e45f4b84 -lp:~elmer-csc-ubuntu/elmercsc/+git/elmer-github-devel git-commit:e45f4b84367adc1b076c014ff2d13faded8cfdca +# git-build-recipe format 0.4 deb-version {debversion}-202009191802~7ce683c0 +lp:~elmer-csc-ubuntu/elmercsc/+git/elmer-github-devel git-commit:7ce683c00a922d82790e48e51bc5c822bdb44d56 nest-part packaging lp:~elmer-csc-ubuntu/elmercsc/+git/packaging-bionic-eg debian debian git-commit:e75c1dcfaa026eb0db6b0dc4b1198fdc81056068 diff -Nru elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics/CalcFields.F90 elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics/CalcFields.F90 --- elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics/CalcFields.F90 2020-09-18 18:02:32.000000000 +0000 +++ elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics/CalcFields.F90 2020-09-19 18:02:03.000000000 +0000 @@ -556,7 +556,7 @@ LOGICAL :: CSymmetry, HBCurve, LorentzConductivity, HasThinLines=.FALSE. REAL(KIND=dp) :: xcoord, grads_coeff, val TYPE(ValueListEntry_t), POINTER :: HBLst - REAL(KIND=dp) :: HarmPowerCoeff = 0.5_dp + REAL(KIND=dp) :: HarmPowerCoeff REAL(KIND=dp) :: line_tangent(3) INTEGER :: IOUnit @@ -570,8 +570,12 @@ dim = CoordinateSystemDimension() SolverParams => GetSolverParams() - IF (GetLogical(SolverParams, 'Calculate harmonic peak power', Found)) HarmPowerCoeff = 1.0_dp - + IF (GetLogical(SolverParams, 'Calculate harmonic peak power', Found)) THEN + HarmPowerCoeff = 1.0_dp + ELSE + HarmPowerCoeff = 0.5_dp + END IF + Pname = GetString(SolverParams, 'Potential Variable',Found) IF(.NOT. Found ) Pname = 'av' Found = .FALSE. diff -Nru elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics2D.F90 elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics2D.F90 --- elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics2D.F90 2020-09-18 18:02:32.000000000 +0000 +++ elmerfem-csc-eg-8.4-0ppa0/fem/src/modules/MagnetoDynamics2D.F90 2020-09-19 18:02:03.000000000 +0000 @@ -973,11 +973,8 @@ REAL(KIND=dp) :: dt !< Timestep size for time dependent simulations LOGICAL :: TransientSimulation !< Steady state or transient simulation !------------------------------------------------------------------------------ - IF( .NOT.ListCheckPresent( Solver % Values, 'Apply Mortar BCs') ) & - CALL ListAddLogical( Solver % Values, 'Apply Mortar BCs', .TRUE.) - - IF( .NOT.ListCheckPresent( Solver % Values, 'Linear System Complex') ) & - CALL ListAddLogical( Solver % Values, 'Linear System Complex', .TRUE.) + CALL ListAddNewLogical( Solver % Values, 'Apply Mortar BCs', .TRUE.) + CALL ListAddNewLogical( Solver % Values, 'Linear System Complex', .TRUE.) !------------------------------------------------------------------------------ END SUBROUTINE MagnetoDynamics2DHarmonic_Init0 !------------------------------------------------------------------------------ @@ -997,18 +994,11 @@ Params => GetSolverParams(Solver) CALL ListAddInteger( Params, 'Variable Dofs',2 ) - IF( .NOT. ListCheckPresent( Params,'Variable') ) THEN - CALL ListAddString( Params,'Variable',& - 'Potential[Potential re:1 Potential im:1]') - END IF + CALL ListAddNewString( Params,'Variable',& + 'Potential[Potential re:1 Potential im:1]') - IF(.NOT. ListCheckPresent( Params,'Apply Mortar BCs') ) THEN - CALL ListAddLogical( Params,'Apply Mortar BCs',.TRUE.) - END IF - - IF(.NOT. ListCheckPresent( Params,'Linear System Complex') ) THEN - CALL ListAddLogical( Params,'Linear System Complex',.TRUE.) - END IF + CALL ListAddNewLogical( Params,'Apply Mortar BCs',.TRUE.) + CALL ListAddNewLogical( Params,'Linear System Complex',.TRUE.) !------------------------------------------------------------------------------ END SUBROUTINE MagnetoDynamics2DHarmonic_Init @@ -1384,7 +1374,7 @@ CALL GetLocalSolution(POT, UElement=Element) POTC = POT(1,:) + im*POT(2,:) - Omega = GetAngularFrequency(Found=Found) + Omega = GetAngularFrequency() !Numerical integration: !---------------------- @@ -1451,9 +1441,10 @@ Material => GetMaterial(Element) - Omega = GetAngularFrequency(Found=Found) + Omega = GetAngularFrequency() + InPlaneProximity = .FALSE. - + CoilBody = .FALSE. CompParams => GetComponentParams( Element ) CoilType = '' @@ -1953,9 +1944,7 @@ LOGICAL :: Found SolverParams => GetSolverParams() - IF( .NOT. ListCheckPresent( SolverParams,'Variable') ) THEN - CALL ListAddString( SolverParams, 'Variable','-nooutput bsolver_temp' ) - END IF + CALL ListAddNewString( SolverParams, 'Variable','-nooutput bsolver_temp' ) IF( GetLogical( SolverParams,'Target Variable Complex',Found ) ) THEN CALL ListAddString( SolverParams,& NextFreeKeyword('Exported Variable',SolverParams),'B[B re:2 B im:2]')