@@ -2084,30 +2084,41 @@ Subroutine Set_Diffusivity_Equation_Coefficients
20842084 Endif
20852085 Endif
20862086
2087- ra_constants(5 ) = nu_norm
2088- ra_functions(:,3 ) = nu(:)/ nu_norm
2089- ra_functions(:,11 ) = dlnu(:)
2087+ If (nu_type .ne. 3 ) Then
2088+ ! if the type is 3, the constant and function were set directly
2089+ ra_constants(5 ) = nu_norm
2090+ ra_functions(:,3 ) = nu(:)/ nu_norm
2091+ ra_functions(:,11 ) = dlnu(:)
2092+ Endif
20902093
2091- ra_constants(6 ) = kappa_norm
2092- ra_functions(:,5 ) = kappa(:)/ kappa_norm
2093- ra_functions(:,12 ) = dlnkappa(:)
2094-
2094+ If (kappa_type .ne. 3 ) Then
2095+ ra_constants(6 ) = kappa_norm
2096+ ra_functions(:,5 ) = kappa(:)/ kappa_norm
2097+ ra_functions(:,12 ) = dlnkappa(:)
2098+ Endif
2099+
20952100 If (magnetism) Then
2096- ra_constants(7 ) = eta_norm
2097- ra_functions(:,7 ) = eta(:)/ eta_norm
2098- ra_functions(:,13 ) = dlneta(:)
2101+ If (eta_type .ne. 3 ) Then
2102+ ra_constants(7 ) = eta_norm
2103+ ra_functions(:,7 ) = eta(:)/ eta_norm
2104+ ra_functions(:,13 ) = dlneta(:)
2105+ Endif
20992106 Endif ! if no magnetism, all of the above are already zero
21002107
21012108 Do i = 1 , n_active_scalars
2102- ra_constants(12 + (i-1 )* 2 ) = kappa_chi_a_norm(i)
2103- ra_functions(:,15 + (i-1 )* 2 ) = kappa_chi_a(i,:)/ kappa_chi_a_norm(i)
2104- ra_functions(:,16 + (i-1 )* 2 ) = dlnkappa_chi_a(i,:)
2109+ If (kappa_chi_a_type(i) .ne. 3 ) Then
2110+ ra_constants(12 + (i-1 )* 2 ) = kappa_chi_a_norm(i)
2111+ ra_functions(:,15 + (i-1 )* 2 ) = kappa_chi_a(i,:)/ kappa_chi_a_norm(i)
2112+ ra_functions(:,16 + (i-1 )* 2 ) = dlnkappa_chi_a(i,:)
2113+ Endif
21052114 Enddo
21062115
21072116 Do i = 1 , n_passive_scalars
2108- ra_constants(12 + (n_active_scalars+ i-1 )* 2 ) = kappa_chi_p_norm(i)
2109- ra_functions(:,15 + (n_active_scalars+ i-1 )* 2 ) = kappa_chi_p(i,:)/ kappa_chi_p_norm(i)
2110- ra_functions(:,16 + (n_active_scalars+ i-1 )* 2 ) = dlnkappa_chi_p(i,:)
2117+ If (kappa_chi_p_type(i) .ne. 3 ) Then
2118+ ra_constants(12 + (n_active_scalars+ i-1 )* 2 ) = kappa_chi_p_norm(i)
2119+ ra_functions(:,15 + (n_active_scalars+ i-1 )* 2 ) = kappa_chi_p(i,:)/ kappa_chi_p_norm(i)
2120+ ra_functions(:,16 + (n_active_scalars+ i-1 )* 2 ) = dlnkappa_chi_p(i,:)
2121+ Endif
21112122 Enddo
21122123
21132124 End Subroutine Set_Diffusivity_Equation_Coefficients
0 commit comments