Skip to content

Commit 0210bf7

Browse files
committed
Merge branch 'revert-47062803' into 'main'
Revert "Add additional information for missing material parameters" See merge request hepplestone/heatflow-mk2!53
2 parents 4706280 + 361815a commit 0210bf7

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

src/inputs.f90

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -526,13 +526,10 @@ subroutine read_mat(unit)
526526
character(1024) :: buffer
527527
integer :: reason, j
528528
integer, dimension(8) :: readvarmat
529-
character(24), dimension(8) :: readvarmatident
530529
integer :: i, index
531530

532531
i=0
533532
readvarmat(:) = 0
534-
readvarmatident = [character(len=24)::"heat_capacity","h_conv","kappa","kappa3D","rho","sound_speed","tau","em"]
535-
536533
read: do
537534
read(unit,'(A)',iostat=Reason) buffer ! read the buffer
538535
if(Reason.ne.0) exit read ! if the buffer is empty exit the read loop
@@ -549,12 +546,8 @@ subroutine read_mat(unit)
549546
! If 0 reset readvar and check for missing parameters
550547
if(index .eq. 0) then
551548
! Check for missing parameters after the loop
552-
if (any(readvarmat .ne. 1)) then
553-
do j = 1, 8
554-
if (readvarmat(j) .eq. 0) then
555-
write(6,*) "Error: A material is missing a parameter, ", readvarmatident(j)
556-
end if
557-
end do
549+
if (any(readvarmat .ne. 1)) then
550+
write(6,*) "Error in parameters : material ", readvarmat
558551
stop
559552
end if
560553
readvarmat(:) = 0
@@ -589,7 +582,6 @@ subroutine read_mat(unit)
589582
end if
590583
end do
591584

592-
593585

594586
allocate(input_materials(i))
595587
input_materials(1:i) = dum_mat(1:i)

0 commit comments

Comments
 (0)