-
Notifications
You must be signed in to change notification settings - Fork 337
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Glads gl #648
base: devel
Are you sure you want to change the base?
Glads gl #648
Conversation
channels and sheet system).
…nverting Weertman to Coulomb coefficients
…omb sliding law to SSAMaterials
See new notes at start of GroundedSolver.F90 for usage.
grounded mask and GMcheck options.
improve documentation CovarianceUtils
…and-running again (more to come over the following weeks)
…4th dimension, assumed to be pressure)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi
Haven't looked at the ElmerIce changes, but a few small comments regarding the elmer solver library changes below.
This change to "MeshUtils.F90": maybe you could search for the space
in the mesh path instead of assuming "." and hence index 2 ?
ELSE
DO s=1,Model % NumberOfSolvers
!Need to only look at solvers that are going to run on this mesh
TargetMesh = ListGetString(Model % Solvers(s) % Values, 'Mesh', GotIt)
DO i=1,6
DO j=1,10
inDofs(j,i) = MAX(Indofs(j,i),MAXVAL(Model % Solvers(s) % Def_Dofs(j,:,i)))
IF(GotIt) THEN
!This assumes your meshes all start '. '
IF (LEN_TRIM(Model % Solvers(s) % Mesh % Name) > 0) THEN
IF(TRIM(Model % Solvers(s) % Mesh % Name) .NE. TRIM(TargetMesh(2:))) THEN
CYCLE
END IF
END IF
ELSE
inDofs(j,i) = MAX(Indofs(j,i),MAXVAL(Model % Solvers(s) % Def_Dofs(j,:,i)))
END IF
END DO
END DO
SolverUtils.F90:
IF ( .NOT. ASSOCIATED( Solver % Matrix ) .OR. &
.NOT. ASSOCIATED( Solver % Variable % Values ) ) RETURN
.NOT. ASSOCIATED( Solver % Variable ) ) RETURN
Maybe add
IF(.NOT. ASSOCIATED(Solver % Variable Values) ) RETURN
after the changed line ?
Br, Juha
In response to Juha's comments on Rupert's merge.
In response to Juha's comments on Rupert's merge commit.
The last change in SolverUtils.F90 does not compile. |
Deleted the unfortunate space that broke everything
OK, so it's Solver % Values, not VariableValues....
I can't see anything left in the statement at l.9795 that should cause it not to compile?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Calving3D test fails for me. Output
Backtrace for this error:
#0 0x7fa570f125af in ???
#0 0x7f5710e885af in ???
#1 0x7fa540d92cd3 in _calvinggeometry_MOD_getdomainedge
at /home/zwinger/Source/Elmer_devel/elmerfem/elmerice/Solvers/CalvingGeometry.F90:2424
#2 0x7fa540ddba97 in frontadvance3d
at /home/zwinger/Source/Elmer_devel/elmerfem/elmerice/Solvers/CalvingFrontAdvance3D.F90:197
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tzwinger can you confirm that this test passes for you on devel branch? For me, on my laptop, it fails on both devel and glads_gl.
Requesting merge of glads_gl into devel
I ran the full ctest on my laptop. Same results for glads_gl and devel. 94% success.