Merge branch 'ma-MR-34375' into 'main' (e4483a6c) · Commits · codeaster / src

bibfor/algorith/mecgme.F90

+23 −11

Original line number	Diff line number	Diff line
		@@ -169,13 +169,10 @@ subroutine mecgme(stop, &
		end if

		! - Preparing input fields
		call prepGeneralFields(modelZ, caraElemZ, materFieldZ, matecoZ, &
		applySuiv, &
		timePrev, timeCurr, timeTheta, nharm, &
		call prepGeneralFields(modelZ, caraElemZ, matecoZ, &
		nharm, &
		varcCurr, dispPrev, dispCumuInst, &
		compor, strxPrev, viteCurr, acceCurr, &
		nbFieldIn, lpain, lchin)

		! - Computation
		if (l_first_matr) then
		do iLoad = 1, nbLoad
		@@ -186,16 +183,24 @@ subroutine mecgme(stop, &
		loadLigrel = loadPreObject(1:13)//'.LIGRE'

		if (loadNume .eq. 4) then
		call compLoadMatr(applyPilo, &
		call compLoadMatr(applyPilo, applySuiv, &
		iLoad, iMatr, loadNume, &
		modelZ, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadLigrel, loadPreObject, &
		stop, nbFieldIn, lpain, lchin, &
		ligrelCalc, jvBase, matrElemZ)

		call compLoadEvolMatr(timeCurr, jvBase, &
		applySuiv, iLoad, iMatr, loadPreObject, &
		loadLigrel, ligrelCalc, &
		applySuiv, iLoad, iMatr, &
		modelZ, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, ligrelCalc, &
		nbFieldIn, lpain, lchin, &
		matrElemZ)

		end if
		end do
		else
		@@ -209,14 +214,21 @@ subroutine mecgme(stop, &
		loadLigrel = loadPreObject(1:13)//'.LIGRE'

		if (loadNume .eq. 4) then
		call compLoadMatr(applyPilo, &
		call compLoadMatr(applyPilo, applySuiv, &
		iLoad, iMatr, loadNume, &
		modelZ, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadLigrel, loadPreObject, &
		stop, nbFieldIn, lpain, lchin, &
		ligrelCalc, jvBase, matrElemZ)

		call compLoadEvolMatr(timeCurr, jvBase, &
		applySuiv, iLoad, iMatr, loadPreObject, &
		loadLigrel, ligrelCalc, &
		applySuiv, iLoad, iMatr, &
		modelZ, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, ligrelCalc, &
		nbFieldIn, lpain, lchin, &
		matrElemZ)
		end if

bibfor/algorith/vecgme.F90

+14 −9

Original line number	Diff line number	Diff line
		@@ -156,11 +156,9 @@ subroutine vecgme(stop, &
		end if

		! - Preparing input fields
		call prepGeneralFields(modelZ, caraElemZ, materFieldZ, matecoZ, &
		applySuiv, &
		timePrev, timeCurr, timeTheta, nharm, &
		call prepGeneralFields(modelZ, caraElemZ, matecoZ, &
		nharm, &
		varcCurr, dispPrev, dispCumuInst, &
		compor, strxPrev, viteCurr, acceCurr, &
		nbFieldInGene, lpain, lchin)

		! - Computation
		@@ -173,17 +171,24 @@ subroutine vecgme(stop, &
		if (loadNume .eq. 4) then
		! --------- Standard dead Neumann loads
		call compLoadVect(applyPilo, applySuiv, &
		iLoad, loadNume, loadPreObject, loadLigrel, &
		iLoad, loadNume, &
		modelZ, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, &
		stop, nbFieldInGene, lpain, lchin, &
		ligrelCalc, jvBase, resuElem, vectElem)

		! --------- Composite dead Neumann loads (EVOL_CHAR)
		call compLoadEvolVect(modelZ, caraElemZ, timeCurr, jvBase, &
		applySuiv, iLoad, loadPreObject, &
		loadLigrel, ligrelCalc, &
		call compLoadEvolVect(modelZ, caraElemZ, materFieldZ, compor, &
		timeCurr, jvBase, &
		applySuiv, iLoad, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, ligrelCalc, &
		nbFieldInGene, lpain, lchin, &
		resuElem, vectElem, &
		dispPrev, dispCumuInst, strxPrev, viteCurr)
		dispPrev, dispCumuInst, &
		strxPrev, viteCurr, acceCurr)
		end if
		end do
		!

bibfor/algorith/vechme.F90

+15 −9

Original line number	Diff line number	Diff line
		@@ -152,11 +152,9 @@ subroutine vechme(stop, &
		end if

		! - Preparing input fields
		call prepGeneralFields(model, caraElemZ, materFieldZ, matecoZ, &
		applySuiv, &
		timePrev, timeCurr, timeTheta, nharm, &
		call prepGeneralFields(model, caraElemZ, matecoZ, &
		nharm, &
		varcCurr, dispPrev, dispCumuInst, &
		compor, strxPrev, viteCurr, acceCurr, &
		nbFieldInGene, lpain, lchin)

		! - Computation
		@@ -169,16 +167,24 @@ subroutine vechme(stop, &
		if ((loadNume .gt. 0 .and. loadNume .lt. 4) .or. (loadNume .eq. 55)) then
		! --------- Standard dead Neumann loads
		call compLoadVect(applyPilo, applySuiv, &
		iLoad, loadNume, loadPreObject, loadLigrel, &
		iLoad, loadNume, &
		model, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, &
		stop, nbFieldInGene, lpain, lchin, &
		ligrelCalc, jvBase, resuElem, vectElem)

		! --------- Composite dead Neumann loads (EVOL_CHAR)
		call compLoadEvolVect(modelZ, caraElemZ, timePrev, jvBase, &
		applySuiv, iLoad, loadPreObject, &
		loadLigrel, ligrelCalc, &
		call compLoadEvolVect(model, caraElemZ, materFieldZ, compor, &
		timePrev, jvBase, &
		applySuiv, iLoad, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, ligrelCalc, &
		nbFieldInGene, lpain, lchin, &
		resuElem, vectElem)
		resuElem, vectElem, &
		dispPrev, dispCumuInst, &
		strxPrev, viteCurr, acceCurr)
		end if
		end do
		!

bibfor/algorith/vefpme.F90

+12 −6

Original line number	Diff line number	Diff line
		@@ -147,11 +147,9 @@ subroutine vefpme(stop, &
		end if

		! - Preparing input fields
		call prepGeneralFields(model, caraElemZ, materFieldZ, matecoZ, &
		applySuiv, &
		timePrev, timeCurr, timeTheta, nharm, &
		call prepGeneralFields(model, caraElemZ, matecoZ, &
		nharm, &
		varcCurr, dispPrev, dispCumuInst, &
		compor, strxPrev, viteCurr, acceCurr, &
		nbFieldInGene, lpain, lchin)

		! - Computation
		@@ -165,7 +163,11 @@ subroutine vefpme(stop, &
		if ((loadNume .eq. 5) .or. (loadNume .eq. 8)) then
		applySuiv = ASTER_FALSE
		call compLoadVect(applyPilo, applySuiv, &
		iLoad, loadNume, loadPreObject, loadLigrel, &
		iLoad, loadNume, &
		model, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, &
		stop, nbFieldInGene, lpain, lchin, &
		ligrelCalc, jvBase, resuElem, vectElem)
		end if
		@@ -174,7 +176,11 @@ subroutine vefpme(stop, &
		if ((loadNume .eq. 9) .or. (loadNume .eq. 11)) then
		applySuiv = ASTER_TRUE
		call compLoadVect(applyPilo, applySuiv, &
		iLoad, loadNume, loadPreObject, loadLigrel, &
		iLoad, loadNume, &
		model, materFieldZ, compor, &
		strxPrev, viteCurr, acceCurr, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, &
		stop, nbFieldInGene, lpain, lchin, &
		ligrelCalc, jvBase, resuElem, vectElem)
		end if

bibfor/calculel/me2mme_evol.F90

+9 −8

Original line number	Diff line number	Diff line
		@@ -74,20 +74,21 @@ subroutine me2mme_evol(modelZ, caraElemZ, materFieldZ, matecoZ, nharm, jvBase, &
		compor = " "

		! - Preparing input fields
		call prepGeneralFields(modelZ, caraElemZ, materFieldZ, matecoZ, &
		applySuiv, &
		timePrev, timeCurr, timeTheta, nharm, &
		call prepGeneralFields(modelZ, caraElemZ, matecoZ, &
		nharm, &
		varcCurr, dispPrev, dispCumuInst, &
		compor, strxPrev, viteCurr, acceCurr, &
		nbFieldIn, lpain, lchin)

		! - Composite dead Neumann loads (EVOL_CHAR)
		loadPreObject = loadName(1:8)//'.CHME'
		loadLigrel = loadPreObject(1:13)//'.LIGRE'
		call compLoadEvolVect(modelZ, caraElemZ, timePrev, jvBase, &
		applySuiv, iLoad, loadPreObject, &
		loadLigrel, ligrelCalcZ, &
		call compLoadEvolVect(modelZ, caraElemZ, materFieldZ, compor, &
		timePrev, jvBase, &
		applySuiv, iLoad, &
		timePrev, timeCurr, timeTheta, &
		loadPreObject, loadLigrel, ligrelCalcZ, &
		nbFieldIn, lpain, lchin, &
		resuElem, vectElem)
		resuElem, vectElem, &
		dispPrev, dispCumuInst, strxPrev, viteCurr, acceCurr)
		!
		end subroutine