From dbd7b0872349e864e9cc65a09f5659c0d82a3748 Mon Sep 17 00:00:00 2001 From: kamischi <karl-michael.schindler@web.de> Date: Mon, 23 Jan 2023 17:11:35 +0100 Subject: [PATCH] fact: cleanup cleanup of an unsuccessfull merge and get everything working. ignore output files. --- source/f90/fcat-analysis/.gitignore | 2 + source/f90/fcat-analysis/Makefile | 67 ++++++------------- source/f90/fcat-analysis/boson_all-fcat.f90 | 53 +-------------- source/f90/fcat-analysis/boson_all.f90 | 53 +-------------- .../boson_all.f90.fcat-analysis.f90 | 2 +- source/f90/fcat-analysis/eels_all-fcat.f90 | 11 +++ source/f90/fcat-analysis/eels_all.f90 | 11 +++ .../eels_all.f90.fcat-analysis.f90 | 11 +++ 8 files changed, 59 insertions(+), 151 deletions(-) create mode 100644 source/f90/fcat-analysis/.gitignore diff --git a/source/f90/fcat-analysis/.gitignore b/source/f90/fcat-analysis/.gitignore new file mode 100644 index 0000000..5fe92b4 --- /dev/null +++ b/source/f90/fcat-analysis/.gitignore @@ -0,0 +1,2 @@ +eelsou +bosou diff --git a/source/f90/fcat-analysis/Makefile b/source/f90/fcat-analysis/Makefile index 29159c6..f798e83 100644 --- a/source/f90/fcat-analysis/Makefile +++ b/source/f90/fcat-analysis/Makefile @@ -15,55 +15,30 @@ endif # fcat tool FCAT = fcat -# the implicit rule for compiling for files -%.o: %-fcat.f90 ; $(FC) $(FFLAGS) -c $< -%_mod.mod: %.f90 ; $(FC) $(FFLAGS) -c $< +boson_all-fcat.f90: boson_all.f90 + $(FCAT) -count boson_all.f90 > boson_all-fcat.f90 +bosonf90: boson_all-fcat.f90 + $(FC) $(FFLAGS) -o bosonf90 boson_all-fcat.f90 -all: boson eels eels-boson pylibs +eels_all-fcat.f90: eels_all.f90 + $(FCAT) -count eels_all.f90 > eels_all-fcat.f90 +eelsf90: eels_all-fcat.f90 + $(FC) $(FFLAGS) -o eelsf90 eels_all-fcat.f90 -bosonmods = sicot_mod.mod sintr_mod.mod rcffi_mod.mod -doboson-fcat.f90: doboson.f90 - $(FCAT) -count doboson.f90 > doboson-fcat.f90 -doboson.o: doboson-fcat.f90 $(bosonmods) - -sicot_mod.mod: sintr_mod.mod - -bosonsubs = doboson.o respon.o sicot.o sintr.o rcffi.o o1.o o2.o -boson-fcat.f90: boson.f90 - $(FCAT) -count boson.f90 > boson-fcat.f90 -boson: boson-fcat.f90 change_working_dir.o $(bosonsubs) $(bosonmods) - $(FC) $(FFLAGS) -o bosonf90 boson-fcat.f90 change_working_dir.o $(bosonsubs) - -eelsmods = quanc8_mod.mod queels_mod.mod seteps_mod.mod -doeels-fcat.f90: doeels.f90 - $(FCAT) -count doeels.f90 > doeels-fcat.f90 -doeels.o: doeels-fcat.f90 $(eelsmods) - -queels_mod.mod: quanc8_mod.mod fint1_mod.mod fint2_mod.mod fint3_mod.mod -quanc8_mod.mod: fun_mod.mod -fint1_mod.mod: surlos_mod.mod -fint2_mod.mod: surlos_mod.mod -fint3_mod.mod: surlos_mod.mod - -eelssubs = doeels.o usurlo.o quanc8.o fun.o queels.o fint1.o fint2.o fint3.o surlos.o seteps.o phint.o qrat.o -eels-fcat.f90: eels.f90 - $(FCAT) -count eels.f90 > eels-fcat.f90 -eels: eels-fcat.f90 change_working_dir.o $(eelssubs) $(eelsmods) - $(FC) $(FFLAGS) -o eelsf90 eels-fcat.f90 change_working_dir.o $(eelssubs) - -fcat: eelsf90 bosonf90 +all: eelsf90 bosonf90 ./eelsf90 > eelsf90_fcat_output - fcat -count eels.f90 eelsf90_fcat_output + fcat -count eels_all.f90 eelsf90_fcat_output > eels_all.f90.fcat-analysis.f90 ./bosonf90 > bosonf90_fcat_output - fcat -count boson.f90 bosonf90_fcat_output + fcat -count boson_all.f90 bosonf90_fcat_output > boson_all.f90.fcat-analysis.f90 clean: - rm -f *.o - rm -rf *.dSYM - rm -rf *.mod - rm -rf *.so - rm -rf *-fcat.* - rm -f bosonf90 bosonf90.exe - rm -f eelsf90 eelsf90.exe - -.PHONY: all clean pylibs fcat + rm -f *.dSYM + rm -f *mod.mod + rm -f *_all-fcat.f90 + rm -f bosonf90 bosonf90.exe + rm -f eelsf90 eelsf90.exe + rm -f eelsou bosou + rm -f *f90_fcat_output + rm -f *_all.f90.fcat-analysis.f90 + +.PHONY: all clean diff --git a/source/f90/fcat-analysis/boson_all-fcat.f90 b/source/f90/fcat-analysis/boson_all-fcat.f90 index 19d8fe0..a0ca740 100644 --- a/source/f90/fcat-analysis/boson_all-fcat.f90 +++ b/source/f90/fcat-analysis/boson_all-fcat.f90 @@ -132,10 +132,7 @@ program boson stop call FCAT_boson_all_rep() end program boson -<<<<<<< HEAD -======= ->>>>>>> coverage subroutine change_working_dir() ! This routine gets the first argument of the commandline and takes it @@ -172,10 +169,7 @@ subroutine change_working_dir() call FCAT_boson_all(55) return end subroutine change_working_dir -<<<<<<< HEAD -======= ->>>>>>> coverage double precision function respon(w, width) !******************************************************************* @@ -214,12 +208,7 @@ double precision function respon(w, width) return call FCAT_boson_all_rep() end function respon -<<<<<<< HEAD - -======= -module sicot_mod -contains ->>>>>>> coverage + subroutine sicot(f, m, h, x0) ! ******************************************************************* @@ -248,11 +237,6 @@ subroutine sicot(f, m, h, x0) ! * * ! ******************************************************************* -<<<<<<< HEAD -======= - use sintr_mod - ->>>>>>> coverage implicit none double precision, intent(in out) :: f(*) @@ -265,7 +249,6 @@ subroutine sicot(f, m, h, x0) logical :: debug -<<<<<<< HEAD interface subroutine sintr(f, msign, h) double precision, intent(in out) :: f(*) @@ -274,8 +257,6 @@ subroutine sicot(f, m, h, x0) end subroutine sintr end interface -======= ->>>>>>> coverage call FCAT_boson_all(67) debug = .false. call FCAT_boson_all(68) @@ -377,13 +358,7 @@ subroutine sicot(f, m, h, x0) call FCAT_boson_all(109) return end subroutine sicot -<<<<<<< HEAD -======= -end module sicot_mod -module sintr_mod -contains ->>>>>>> coverage subroutine sintr(f, msign, h) ! ******************************************************************* @@ -718,13 +693,7 @@ subroutine sintr(f, msign, h) call FCAT_boson_all(246) return end subroutine sintr -<<<<<<< HEAD -======= -end module sintr_mod -module rcffi_mod -contains ->>>>>>> coverage subroutine rcffi(ar, ai, msign, h) ! ******************************************************************* @@ -1027,11 +996,7 @@ subroutine rcffi(ar, ai, msign, h) call FCAT_boson_all(367) return end subroutine rcffi -<<<<<<< HEAD -======= -end module rcffi_mod ->>>>>>> coverage subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, yout, nout) ! ******************************************************************* @@ -1056,13 +1021,6 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y ! * nout: Number of points of this computation * ! ******************************************************************* -<<<<<<< HEAD -======= - use rcffi_mod - use sicot_mod - use sintr_mod - ->>>>>>> coverage implicit none double precision, intent(in) :: t, width, gauss, asym, emin, emax, wmin @@ -1088,7 +1046,6 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y logical :: debug -<<<<<<< HEAD interface subroutine rcffi(ar, ai, msign, h) double precision, intent(in out) :: ar(*) @@ -1109,8 +1066,6 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y end subroutine sintr end interface -======= ->>>>>>> coverage ! remark : the two arrays r1 and r2 are used for fourier ! transforming the user-supplied instrumental response of the ! spectrometer that has to be coded in the external routine @@ -1617,10 +1572,7 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y call FCAT_boson_all(596) return end subroutine doboson -<<<<<<< HEAD -======= ->>>>>>> coverage double precision function o1(u) implicit none @@ -1636,10 +1588,7 @@ double precision function o1(u) call FCAT_boson_all(599) return end function o1 -<<<<<<< HEAD -======= ->>>>>>> coverage double precision function o2(u) implicit none diff --git a/source/f90/fcat-analysis/boson_all.f90 b/source/f90/fcat-analysis/boson_all.f90 index 7f6c59a..62313ed 100644 --- a/source/f90/fcat-analysis/boson_all.f90 +++ b/source/f90/fcat-analysis/boson_all.f90 @@ -83,10 +83,7 @@ program boson deallocate (xout, yout) stop end program boson -<<<<<<< HEAD -======= ->>>>>>> coverage subroutine change_working_dir() ! This routine gets the first argument of the commandline and takes it @@ -112,10 +109,7 @@ subroutine change_working_dir() return end subroutine change_working_dir -<<<<<<< HEAD -======= ->>>>>>> coverage double precision function respon(w, width) !******************************************************************* @@ -142,12 +136,7 @@ double precision function respon(w, width) endif return end function respon -<<<<<<< HEAD - -======= -module sicot_mod -contains ->>>>>>> coverage + subroutine sicot(f, m, h, x0) ! ******************************************************************* @@ -176,11 +165,6 @@ subroutine sicot(f, m, h, x0) ! * * ! ******************************************************************* -<<<<<<< HEAD -======= - use sintr_mod - ->>>>>>> coverage implicit none double precision, intent(in out) :: f(*) @@ -193,7 +177,6 @@ subroutine sicot(f, m, h, x0) logical :: debug -<<<<<<< HEAD interface subroutine sintr(f, msign, h) double precision, intent(in out) :: f(*) @@ -202,8 +185,6 @@ subroutine sicot(f, m, h, x0) end subroutine sintr end interface -======= ->>>>>>> coverage debug = .false. if (m == 0) then f(1) = 0.0d0 @@ -260,13 +241,7 @@ subroutine sicot(f, m, h, x0) call sintr(f, msign, h) return end subroutine sicot -<<<<<<< HEAD -======= -end module sicot_mod -module sintr_mod -contains ->>>>>>> coverage subroutine sintr(f, msign, h) ! ******************************************************************* @@ -463,13 +438,7 @@ subroutine sintr(f, msign, h) f(1) = 0.0d0 return end subroutine sintr -<<<<<<< HEAD -======= -end module sintr_mod -module rcffi_mod -contains ->>>>>>> coverage subroutine rcffi(ar, ai, msign, h) ! ******************************************************************* @@ -650,11 +619,7 @@ subroutine rcffi(ar, ai, msign, h) enddo return end subroutine rcffi -<<<<<<< HEAD -======= -end module rcffi_mod ->>>>>>> coverage subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, yout, nout) ! ******************************************************************* @@ -679,13 +644,6 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y ! * nout: Number of points of this computation * ! ******************************************************************* -<<<<<<< HEAD -======= - use rcffi_mod - use sicot_mod - use sintr_mod - ->>>>>>> coverage implicit none double precision, intent(in) :: t, width, gauss, asym, emin, emax, wmin @@ -711,7 +669,6 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y logical :: debug -<<<<<<< HEAD interface subroutine rcffi(ar, ai, msign, h) double precision, intent(in out) :: ar(*) @@ -732,8 +689,6 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y end subroutine sintr end interface -======= ->>>>>>> coverage ! remark : the two arrays r1 and r2 are used for fourier ! transforming the user-supplied instrumental response of the ! spectrometer that has to be coded in the external routine @@ -1009,10 +964,7 @@ subroutine doboson(t, width, gauss, asym, emin, emax, wmin, wmax, np, p, xout, y deallocate (p2) return end subroutine doboson -<<<<<<< HEAD -======= ->>>>>>> coverage double precision function o1(u) implicit none @@ -1025,10 +977,7 @@ double precision function o1(u) return end function o1 -<<<<<<< HEAD -======= ->>>>>>> coverage double precision function o2(u) implicit none diff --git a/source/f90/fcat-analysis/boson_all.f90.fcat-analysis.f90 b/source/f90/fcat-analysis/boson_all.f90.fcat-analysis.f90 index 12427b0..f5b5ef7 100644 --- a/source/f90/fcat-analysis/boson_all.f90.fcat-analysis.f90 +++ b/source/f90/fcat-analysis/boson_all.f90.fcat-analysis.f90 @@ -136,7 +136,7 @@ double precision function respon(w, width) *> endif *> return end function respon - + subroutine sicot(f, m, h, x0) ! ******************************************************************* diff --git a/source/f90/fcat-analysis/eels_all-fcat.f90 b/source/f90/fcat-analysis/eels_all-fcat.f90 index 69f447c..ef3f9b3 100644 --- a/source/f90/fcat-analysis/eels_all-fcat.f90 +++ b/source/f90/fcat-analysis/eels_all-fcat.f90 @@ -298,6 +298,7 @@ double precision function usurlo(dq, wn) call FCAT_eels_all(106) return end function usurlo + double precision function surlos(dk, eps, thick, layers, nper) ! ****************************************************************** @@ -571,6 +572,7 @@ double precision function surlos(dk, eps, thick, layers, nper) call FCAT_eels_all(221) enddo end function surlos + double precision function phint(phi, a, u) ! ****************************************************************** @@ -685,6 +687,7 @@ double precision function phint(phi, a, u) call FCAT_eels_all(265) return end function phint + double precision function fint1(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -782,6 +785,7 @@ double precision function fint1(u, eps, thick, layers, nper, eps_size) call FCAT_eels_all(292) return end function fint1 + double precision function fint2(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -884,6 +888,7 @@ double precision function fint2(u, eps, thick, layers, nper, eps_size) call FCAT_eels_all(323) return end function fint2 + double precision function fint3(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -972,6 +977,7 @@ double precision function fint3(u, eps, thick, layers, nper, eps_size) call FCAT_eels_all(347) return end function fint3 + double precision function fun(phi) ! ****************************************************************** @@ -1001,6 +1007,7 @@ double precision function fun(phi) call FCAT_eels_all(350) return end function fun + subroutine quanc8(fun, a, b, abserr, relerr, result, errest, nofun, flag, eps, thick, layers, nper) ! estimate the integral of fun(x) from a to b @@ -1337,6 +1344,7 @@ subroutine quanc8(fun, a, b, abserr, relerr, result, errest, nofun, flag, eps, t call FCAT_eels_all(466) return end subroutine quanc8 + subroutine queels(x, f, aerr, rerr, facru, eps, thick, layers, nper) ! ****************************************************************** @@ -1502,6 +1510,7 @@ subroutine queels(x, f, aerr, rerr, facru, eps, thick, layers, nper) call FCAT_eels_all(509) return end subroutine queels + subroutine seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode) ! ****************************************************************** @@ -1624,6 +1633,7 @@ subroutine seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode) call FCAT_eels_all(547) return end subroutine seteps + subroutine doeels (e0, theta, phia, phib, wmin, wmax, dw, comment, comment_size, & layers, neps, nper, name, name_size, thick, epsinf, nos, osc, osc_size,& contrl, mode, wn_array, f_array, wn_array_size) @@ -2024,6 +2034,7 @@ subroutine doeels (e0, theta, phia, phib, wmin, wmax, dw, comment, comment_size, call FCAT_eels_all(691) 130 format(2x, f5.1, 3x, f11.3, d14.5) end subroutine doeels + subroutine change_working_dir() ! This routine gets the first argument of the commandline and takes it diff --git a/source/f90/fcat-analysis/eels_all.f90 b/source/f90/fcat-analysis/eels_all.f90 index 7c7eab5..99598ed 100644 --- a/source/f90/fcat-analysis/eels_all.f90 +++ b/source/f90/fcat-analysis/eels_all.f90 @@ -186,6 +186,7 @@ double precision function usurlo(dq, wn) usurlo = 1.0d0 return end function usurlo + double precision function surlos(dk, eps, thick, layers, nper) ! ****************************************************************** @@ -344,6 +345,7 @@ double precision function surlos(dk, eps, thick, layers, nper) endif enddo end function surlos + double precision function phint(phi, a, u) ! ****************************************************************** @@ -414,6 +416,7 @@ double precision function phint(phi, a, u) endif return end function phint + double precision function fint1(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -484,6 +487,7 @@ double precision function fint1(u, eps, thick, layers, nper, eps_size) endif return end function fint1 + double precision function fint2(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -555,6 +559,7 @@ double precision function fint2(u, eps, thick, layers, nper, eps_size) endif return end function fint2 + double precision function fint3(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -619,6 +624,7 @@ double precision function fint3(u, eps, thick, layers, nper, eps_size) endif return end function fint3 + double precision function fun(phi) ! ****************************************************************** @@ -645,6 +651,7 @@ double precision function fun(phi) (1.0d0 + sinpsi * sinphi)) return end function fun + subroutine quanc8(fun, a, b, abserr, relerr, result, errest, nofun, flag, eps, thick, layers, nper) ! estimate the integral of fun(x) from a to b @@ -865,6 +872,7 @@ subroutine quanc8(fun, a, b, abserr, relerr, result, errest, nofun, flag, eps, t endif return end subroutine quanc8 + subroutine queels(x, f, aerr, rerr, facru, eps, thick, layers, nper) ! ****************************************************************** @@ -986,6 +994,7 @@ subroutine queels(x, f, aerr, rerr, facru, eps, thick, layers, nper) f = (2 / 3.141592653589793238d0)**2 * f return end subroutine queels + subroutine seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode) ! ****************************************************************** @@ -1070,6 +1079,7 @@ subroutine seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode) endif return end subroutine seteps + subroutine doeels (e0, theta, phia, phib, wmin, wmax, dw, comment, comment_size, & layers, neps, nper, name, name_size, thick, epsinf, nos, osc, osc_size,& contrl, mode, wn_array, f_array, wn_array_size) @@ -1326,6 +1336,7 @@ subroutine doeels (e0, theta, phia, phib, wmin, wmax, dw, comment, comment_size, 120 format(40x, f10.2, d12.4, f10.2) 130 format(2x, f5.1, 3x, f11.3, d14.5) end subroutine doeels + subroutine change_working_dir() ! This routine gets the first argument of the commandline and takes it diff --git a/source/f90/fcat-analysis/eels_all.f90.fcat-analysis.f90 b/source/f90/fcat-analysis/eels_all.f90.fcat-analysis.f90 index 1feb9ef..a276938 100644 --- a/source/f90/fcat-analysis/eels_all.f90.fcat-analysis.f90 +++ b/source/f90/fcat-analysis/eels_all.f90.fcat-analysis.f90 @@ -186,6 +186,7 @@ double precision function usurlo(dq, wn) *> usurlo = 1.0d0 *> return end function usurlo + double precision function surlos(dk, eps, thick, layers, nper) ! ****************************************************************** @@ -344,6 +345,7 @@ double precision function surlos(dk, eps, thick, layers, nper) 23090 endif 23090 enddo end function surlos + double precision function phint(phi, a, u) ! ****************************************************************** @@ -414,6 +416,7 @@ double precision function phint(phi, a, u) 41010 endif 41010 return end function phint + double precision function fint1(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -484,6 +487,7 @@ double precision function fint1(u, eps, thick, layers, nper, eps_size) 14272 endif 14272 return end function fint1 + double precision function fint2(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -555,6 +559,7 @@ double precision function fint2(u, eps, thick, layers, nper, eps_size) 10758 endif 10758 return end function fint2 + double precision function fint3(u, eps, thick, layers, nper, eps_size) ! ****************************************************************** @@ -619,6 +624,7 @@ double precision function fint3(u, eps, thick, layers, nper, eps_size) 15126 endif 15126 return end function fint3 + double precision function fun(phi) ! ****************************************************************** @@ -645,6 +651,7 @@ double precision function fun(phi) (1.0d0 + sinpsi * sinphi)) *> return end function fun + subroutine quanc8(fun, a, b, abserr, relerr, result, errest, nofun, flag, eps, thick, layers, nper) ! estimate the integral of fun(x) from a to b @@ -865,6 +872,7 @@ subroutine quanc8(fun, a, b, abserr, relerr, result, errest, nofun, flag, eps, t 978 endif 978 return end subroutine quanc8 + subroutine queels(x, f, aerr, rerr, facru, eps, thick, layers, nper) ! ****************************************************************** @@ -986,6 +994,7 @@ subroutine queels(x, f, aerr, rerr, facru, eps, thick, layers, nper) 326 f = (2 / 3.141592653589793238d0)**2 * f 326 return end subroutine queels + subroutine seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode) ! ****************************************************************** @@ -1070,6 +1079,7 @@ subroutine seteps(neps, nos, osc, epsinf, wn, name, eps, layers, mode) *> endif 326 return end subroutine seteps + subroutine doeels (e0, theta, phia, phib, wmin, wmax, dw, comment, comment_size, & layers, neps, nper, name, name_size, thick, epsinf, nos, osc, osc_size,& contrl, mode, wn_array, f_array, wn_array_size) @@ -1326,6 +1336,7 @@ subroutine doeels (e0, theta, phia, phib, wmin, wmax, dw, comment, comment_size, *> 120 format(40x, f10.2, d12.4, f10.2) *> 130 format(2x, f5.1, 3x, f11.3, d14.5) end subroutine doeels + subroutine change_working_dir() ! This routine gets the first argument of the commandline and takes it -- GitLab