Skip to content

Commit 0f7caa5

Browse files
authored
Merge pull request #1243 from danielpeter/devel
2 parents a2b578f + e98495b commit 0f7caa5

File tree

2 files changed

+385
-245
lines changed

2 files changed

+385
-245
lines changed

src/specfem2D/attenuation_model.f90

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,10 @@ subroutine decomposition_LU(a,i_min,n,indx,d)
567567

568568
end subroutine decomposition_LU
569569

570+
!
571+
!--------------------------------------------------------------------------------
572+
!
573+
570574
subroutine LUbksb(a,i_min,n,indx,b,m)
571575

572576
implicit none
@@ -608,6 +612,10 @@ subroutine LUbksb(a,i_min,n,indx,b,m)
608612

609613
end subroutine LUbksb
610614

615+
!
616+
!--------------------------------------------------------------------------------
617+
!
618+
611619
subroutine syst_LU(a,i_min,n,b,m)
612620

613621
implicit none
@@ -633,6 +641,10 @@ subroutine syst_LU(a,i_min,n,b,m)
633641

634642
end subroutine syst_LU
635643

644+
!
645+
!--------------------------------------------------------------------------------
646+
!
647+
636648
subroutine lfit_zener(x,y,sig,ndat,poids,ia,covar,chisq,ma,Qref,point)
637649
! ma = nombre de variable diffusive
638650
! ndat = m = K nombre d'abcisse freq_k
@@ -715,6 +727,10 @@ subroutine lfit_zener(x,y,sig,ndat,poids,ia,covar,chisq,ma,Qref,point)
715727

716728
end subroutine lfit_zener
717729

730+
!
731+
!--------------------------------------------------------------------------------
732+
!
733+
718734
subroutine func_zener(x,afunc,N,Qref,point)
719735

720736
implicit none
@@ -735,6 +751,10 @@ subroutine func_zener(x,afunc,N,Qref,point)
735751

736752
end subroutine func_zener
737753

754+
!
755+
!--------------------------------------------------------------------------------
756+
!
757+
738758
subroutine remplit_point(fmin,fmax,N,point)
739759

740760
use constants, only: TWO_PI
@@ -759,6 +779,10 @@ subroutine remplit_point(fmin,fmax,N,point)
759779

760780
end subroutine remplit_point
761781

782+
!
783+
!--------------------------------------------------------------------------------
784+
!
785+
762786
subroutine classical_linear_least_squares(Qref,poids,point,N,fmin,fmax)
763787

764788
use constants, only: TWO_PI
@@ -798,6 +822,10 @@ subroutine classical_linear_least_squares(Qref,poids,point,N,fmin,fmax)
798822

799823
end subroutine classical_linear_least_squares
800824

825+
!
826+
!--------------------------------------------------------------------------------
827+
!
828+
801829
! Calcul des coefficients par optimization non-lineaire avec contraintes
802830

803831
subroutine solvopt(n,x,f,fun,flg,grad,options,flfc,func,flgc,gradc,Qref,Kopt,theta_min,theta_max,f_min,f_max)
@@ -2052,6 +2080,10 @@ subroutine solvopt(n,x,f,fun,flg,grad,options,flfc,func,flgc,gradc,Qref,Kopt,the
20522080

20532081
end subroutine solvopt
20542082

2083+
!
2084+
!--------------------------------------------------------------------------------
2085+
!
2086+
20552087
subroutine soptions(default)
20562088
! SOPTIONS returns the default values for the optional parameters
20572089
! used by SolvOpt.
@@ -2076,6 +2108,10 @@ subroutine soptions(default)
20762108

20772109
end subroutine soptions
20782110

2111+
!
2112+
!--------------------------------------------------------------------------------
2113+
!
2114+
20792115
subroutine func_objective(x,res,freq,Qref,N,Nopt)
20802116

20812117
implicit none
@@ -2097,6 +2133,10 @@ subroutine func_objective(x,res,freq,Qref,N,Nopt)
20972133

20982134
end subroutine func_objective
20992135

2136+
!
2137+
!--------------------------------------------------------------------------------
2138+
!
2139+
21002140
subroutine func_mini(x,res,Qref,N,Nopt,K,f_min,f_max)
21012141

21022142
! Nopt = 2*N : nombre de coefficients a optimiser
@@ -2124,6 +2164,10 @@ subroutine func_mini(x,res,Qref,N,Nopt,K,f_min,f_max)
21242164

21252165
end subroutine func_mini
21262166

2167+
!
2168+
!--------------------------------------------------------------------------------
2169+
!
2170+
21272171
subroutine grad_func_mini(x,grad,Qref,N,Nopt,K,f_min,f_max)
21282172

21292173
use constants, only: TWO_PI
@@ -2180,6 +2224,10 @@ subroutine grad_func_mini(x,grad,Qref,N,Nopt,K,f_min,f_max)
21802224

21812225
end subroutine grad_func_mini
21822226

2227+
!
2228+
!--------------------------------------------------------------------------------
2229+
!
2230+
21832231
subroutine max_residu(x,res,N,Nopt,theta_min,theta_max)
21842232

21852233
implicit none
@@ -2203,6 +2251,10 @@ subroutine max_residu(x,res,N,Nopt,theta_min,theta_max)
22032251

22042252
end subroutine max_residu
22052253

2254+
!
2255+
!--------------------------------------------------------------------------------
2256+
!
2257+
22062258
subroutine grad_max_residu(x,grad,N,Nopt,theta_min,theta_max)
22072259

22082260
implicit none
@@ -2249,6 +2301,10 @@ subroutine grad_max_residu(x,grad,N,Nopt,theta_min,theta_max)
22492301

22502302
end subroutine grad_max_residu
22512303

2304+
!
2305+
!--------------------------------------------------------------------------------
2306+
!
2307+
22522308
subroutine nonlinear_optimization(N,Qref,f0,point,poids,f_min,f_max)
22532309

22542310
use shared_input_parameters, only: USE_SOLVOPT

0 commit comments

Comments
 (0)