corrects AnalyticalResults ShearWave

targets/tests/NumericalTests/Simulations/ShearWave/AnalyticalResults/ShearWaveAnalyticalResults.cpp

@@ -18,9 +18,9 @@ void ShearWaveAnalyticalResults::calc(std::shared_ptr<SimulationResults> simResu
 		for (int j = 0; j < numberOfNodes; j++) {
 			vx.at(i).at(j) = (l0*u0) / xNodes;
 			vy.at(i).at(j) = (double)0.0;
-			vz.at(i).at(j) = (l0*v0*cos(((double)2.0 * M_PI*z.at(i).at(j)) / zNodes) * sin(((double)2.0 * M_PI*(x.at(i).at(j) + (l0*time.at(i)*u0) / xNodes)) / xNodes)) / (exp(time.at(i)*viscosity*(((double)4.0 * M_PI*M_PI) / xNodes*xNodes + ((double)4.0 * M_PI*M_PI) / zNodes*zNodes))*xNodes);
+			vz.at(i).at(j) = (l0*v0*cos(((double)2.0 * M_PI*z.at(i).at(j)) / zNodes)*sin(((double)2.0 * M_PI*(x.at(i).at(j) + (l0*time.at(i)*u0) / xNodes)) / xNodes)) / (exp(time.at(i)*viscosity*(((double)4.0 * pow(M_PI, (double)2.0)) / pow(xNodes, (double)2.0) + ((double)4.0 * pow(M_PI, (double)2.0)) / pow(zNodes, (double)2.0)))*xNodes);
 			press.at(i).at(j) = (double)0.0;
-			rho.at(i).at(j) = (l0*l0 * rho0*v0*sin(((double)2.0 * M_PI*z.at(i).at(j)) / zNodes) * ((double)-4.0 * exp(((double)4.0 * M_PI*M_PI * time.at(i)*viscosity*(xNodes*xNodes + zNodes*zNodes)) / (xNodes*xNodes * zNodes*zNodes))*u0*zNodes*cos(((double)2.0 * M_PI*(l0*time.at(i)*u0 + x.at(i).at(j)*xNodes)) / (xNodes*xNodes)) + v0*xNodes*sin(((double)2.0 * M_PI*(l0*time.at(i)*u0 + x.at(i).at(j)*xNodes)) / (xNodes*xNodes))*sin(((double)2.0 * M_PI*(l0*time.at(i)*u0 + x.at(i).at(j)*xNodes)) / (xNodes*xNodes)) * sin((2 * M_PI*z.at(i).at(j)) / zNodes))) / ((double)2.0 * exp(((double)8.0 * M_PI*M_PI * time.at(i)*viscosity*(xNodes*xNodes + zNodes*zNodes)) / (xNodes*xNodes * zNodes*zNodes))*xNodes*xNodes*xNodes);
+			rho.at(i).at(j) = (pow(l0, (double)2.0)*rho0*v0*sin(((double)2.0 * M_PI*z.at(i).at(j)) / zNodes)*(-(double)4.0 * exp(((double)4.0 * pow(M_PI, (double)2.0)*time.at(i)*viscosity*(pow(xNodes, (double)2.0) + pow(zNodes, (double)2.0))) / (pow(xNodes, (double)2.0)*pow(zNodes, (double)2.0)))*u0*zNodes*cos(((double)2.0 * M_PI*(l0*time.at(i)*u0 + x.at(i).at(j)*xNodes)) / pow(xNodes, (double)2.0)) + v0*xNodes*pow(sin(((double)2.0 * M_PI*(l0*time.at(i)*u0 + x.at(i).at(j)*xNodes)) / pow(xNodes, (double)2.0)), (double)2.0)*sin(((double)2.0 * M_PI*z.at(i).at(j)) / zNodes))) / ((double)2.0*exp(((double)8.0 * pow(M_PI, (double)2.0)*time.at(i)*viscosity*(pow(xNodes, (double)2.0) + pow(zNodes, (double)2.0))) / (pow(xNodes, (double)2.0)*pow(zNodes, (double)2.0)))*pow(xNodes, (double)3.0));
 		}
 	}
 	calculated = true;

targets/tests/NumericalTests/Simulations/ShearWave/SimulationParameter/ShearWaveSimulationParameter.cpp

@@ -29,7 +29,7 @@ ShearWaveSimulationParameter::ShearWaveSimulationParameter(std::string kernelNam
 	this->rho0 = parameterStruct->rho0;
 
 	std::ostringstream oss;
-	oss << parameterStruct->vtkFilePath << "/ShearWave/Viscosity" << viscosity << "/ux_" << ux << "_uz_" << uz << "/" << kernelName << "/grid" << lx;
+	oss << parameterStruct->vtkFilePath << "/ShearWave/Viscosity_" << viscosity << "/ux_" << ux << "_uz_" << uz << "/" << kernelName << "/grid" << lx;
 	generateFileDirectionInMyStystem(oss.str());
 	this->filePath = oss.str();
 }
\ No newline at end of file