Skip to content

Commit baedb3e

Browse files
pmoczpmocz
committed
resolving conflicts
2 parents 59f71c5 + 2e632e8 commit baedb3e

File tree

1,650 files changed

+6814
-24101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,650 files changed

+6814
-24101
lines changed

‎.github/actions/install-mesa/action.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,4 @@ runs:
115115
sed -i 's/use_cache_for_eos = .true./use_cache_for_eos = .false./g' $MESA_DIR/eos/public/eos_def.f90
116116
sed -i 's/use_cache = .true./use_cache = .false./g' $MESA_DIR/star/private/star_private_def.f90
117117
./install
118-
if [ ! -f lib/libbinary.a ]; then
119-
exit 1
120-
fi
121118
shell: bash

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
data/version_number
33

44
## Compilation
5+
build/
56
build.log
67
.depend
78
.order

‎Makefile‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
.DELETE_ON_ERROR:
2+
.DEFAULT_GOAL := all
3+
.SHELLFLAGS := -eu -c
4+
5+
BUILD_SUBDIR := @$(MAKE) -C
6+
CHECK_SUBDIR := @$(MAKE) check -C
7+
MAKE_DIR := make
8+
9+
BUILD_DIR ?= build
10+
11+
include $(MAKE_DIR)/helpers.mk
12+
include $(MAKE_DIR)/subdirs.mk
13+
include $(MAKE_DIR)/setup-builddir.mk
14+
include $(MAKE_DIR)/version.mk
15+
include $(MAKE_DIR)/subdir-deps.mk
16+
17+
clean:
18+
@rm -rf $(BUILD_DIR_)
19+
20+
all: $(SUBDIRS) $(addsuffix -extract-data,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS))
21+
22+
.PHONY: all $(SUBDIRS) $(addsuffix -extract-data,$(SUBDIRS)) $(addsuffix -check,$(SUBDIRS)) $(addsuffix -install,$(SUBDIRS)) clean install

‎adipls/Makefile‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
include ../make/defaults-module.mk
2+
3+
FFLAGS += -fno-check=bounds
4+
5+
# Build
6+
7+
MODULE_NAME := adipls
8+
SRCS := adipack.c/adipls/adipls.c.d.f \
9+
adipack.c/adipls/adirhs.c.d.f \
10+
adipack.c/adipls/anldet.d.f \
11+
adipack.c/adipls/cmparr.d.f \
12+
adipack.c/adipls/danorm.d.f \
13+
adipack.c/adipls/decicd.d.f \
14+
adipack.c/adipls/delta1.d.f \
15+
adipack.c/adipls/delta2.d.f \
16+
adipack.c/adipls/delta3.d.f \
17+
adipack.c/adipls/dmpgsm.d.f \
18+
adipack.c/adipls/dmpmde.d.f \
19+
adipack.c/adipls/dmpsum.d.f \
20+
adipack.c/adipls/dump_obs.c.d.f \
21+
adipack.c/adipls/geninh.d.f \
22+
adipack.c/adipls/gm1ker.n.d.f \
23+
adipack.c/adipls/gravpo.n.d.f \
24+
adipack.c/adipls/kiner.n.d.f \
25+
adipack.c/adipls/mchcff.d.f \
26+
adipack.c/adipls/mchsol.n.d.f \
27+
adipack.c/adipls/nrkint.c.d.f \
28+
adipack.c/adipls/nrkm.d.f \
29+
adipack.c/adipls/nrtssl.d.f \
30+
adipack.c/adipls/order.d.f \
31+
adipack.c/adipls/rdfrqr.d.f \
32+
adipack.c/adipls/readml.n.d.f \
33+
adipack.c/adipls/readsm.d.f \
34+
adipack.c/adipls/res_adimod.c.d.f \
35+
adipack.c/adipls/res_adipar.c.d.f \
36+
adipack.c/adipls/rotker.c.d.f \
37+
adipack.c/adipls/rsnfit.n.d.f \
38+
adipack.c/adipls/sclasl.c.d.f \
39+
adipack.c/adipls/setbcs.n.d.f \
40+
adipack.c/adipls/setobs_st.c.d.f \
41+
adipack.c/adipls/set_rotation.c.d.f \
42+
adipack.c/adipls/setssm.n.d.f \
43+
adipack.c/adipls/setsum.d.f \
44+
adipack.c/adipls/setups_adi.c.d.f \
45+
adipack.c/adipls/shtint.c.d.f \
46+
adipack.c/adipls/sigint.n.d.f \
47+
adipack.c/adipls/sigitc.c.d.f \
48+
adipack.c/adipls/sigitr.n.d.f \
49+
adipack.c/adipls/signew.n.d.f \
50+
adipack.c/adipls/sigout.c.d.f \
51+
adipack.c/adipls/sigscn.c.d.f \
52+
adipack.c/adipls/sigsol.c.d.f \
53+
adipack.c/adipls/sph.d.f \
54+
adipack.c/adipls/stevft.n.d.f \
55+
adipack.c/adipls/sumout.d.f \
56+
adipack.c/adipls/takata.d.f \
57+
adipack.c/adipls/trnmod.n.d.f \
58+
adipack.c/adipls/uhx.d.f \
59+
adipack.c/adipls/user_adi.c.d.f \
60+
adipack.c/adipls/varfrq.n.d.f \
61+
adipack.c/adipls/xlmult.d.f \
62+
adipack.c/gensr/aramax.d.f \
63+
adipack.c/gensr/blstio.f \
64+
adipack.c/gensr/cpycom.f \
65+
adipack.c/gensr/craysub.d.f \
66+
adipack.c/gensr/derive.d.f \
67+
adipack.c/gensr/derivk.new.d.f \
68+
adipack.c/gensr/eiginh.d.f \
69+
adipack.c/gensr/getcas.f \
70+
adipack.c/gensr/intgpt.d.f \
71+
adipack.c/gensr/iprsgn.d.f \
72+
adipack.c/gensr/izero.f \
73+
adipack.c/gensr/length.f \
74+
adipack.c/gensr/leq.d.f \
75+
adipack.c/gensr/lininh4.d.f \
76+
adipack.c/gensr/lininh.new.d.f \
77+
adipack.c/gensr/lir.d.f \
78+
adipack.c/gensr/lirt.d.f \
79+
adipack.c/gensr/lsqpol.d.f \
80+
adipack.c/gensr/lstsqr.f \
81+
adipack.c/gensr/notwin.d.f \
82+
adipack.c/gensr/notwni.f \
83+
adipack.c/gensr/nrk.d.f \
84+
adipack.c/gensr/ofiles.c.f \
85+
adipack.c/gensr/ofiles.f \
86+
adipack.c/gensr/rdilst.f \
87+
adipack.c/gensr/rnmean.d.f \
88+
adipack.c/gensr/skpcom.f \
89+
adipack.c/gensr/sort.d.f \
90+
adipack.c/gensr/spline.d.f \
91+
adipack.c/gensr/squint.d.f \
92+
adipack.c/gensr/store.d.f \
93+
adipack.c/gensr/strcompr.f \
94+
adipack.c/gensr/vinta.d.f \
95+
adipack.c/gensr/vintk.new.d.f \
96+
adipack.c/gensr/zero.d.f \
97+
adipack.c/adiajobs/sr/inrnge.f \
98+
adipack.c/adiajobs/sr/intmdl.d.f \
99+
adipack.c/adiajobs/sr/rdamdl.n.d.f \
100+
adipack.c/adiajobs/sr/rdfreq.d.f \
101+
adipack.c/adiajobs/sr/rdfrqe.d.f \
102+
adipack.c/adiajobs/sr/rdfrqm.d.f \
103+
adipack.c/adiajobs/sr/rseta4.c.d.f \
104+
adipack.c/adiajobs/sr/setssm.d.f \
105+
adipack.c/adiajobs/sr/srdist.c.d.f \
106+
adipack.c/adiajobs/sr/wrfreq.d.f \
107+
108+
SRCS_CHECK :=
109+
INTERNAL_DEPENDS_ON := const
110+
EXTERNAL_DEPENDS_ON :=
111+
BINTYPE = static-lib
112+
INCLUDE_DIRS := -Iadipack.c/adipls
113+
114+
CHECK_RESULTS_GOLDEN :=
115+
116+
include $(MAKE_DIR)/Makefile

‎adipls/adipack.c/adiajobs/makefile‎

Lines changed: 0 additions & 187 deletions
This file was deleted.

‎adipls/adipack.c/adiajobs/sr/makefile‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎adipls/adipack.c/adipls/adipls.c.d.f‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ subroutine adipls(i_paramset, ierr_param, i_inout,
1313
c in case of error.
1414
c i_inout: If i_inout = 1 read model from file, as usual.
1515
c If i_inout = 0, model quantities must be provided in
16-
c x_arg(1:nn_arg), aa(arg(1:ivarmd,1:nn_arg), data_arg(1:8)
16+
c x_arg(1:nn_arg), aa_arg(1:ivarmd,1:nn_arg), data_arg(1:8)
1717
c If i_inout = -1, assume that model is already stored,
1818
c regardless of possible model parameters read in.
1919
c

‎adipls/adipack.c/adipls/delta1.d.f‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
subroutine delta1(x,y,del1,del1as,aa,omgrtp,sig,iy,ia,nn,el)
66

7-
IMPLICIT REAL*8 (a-h,o-z)
8-
INTEGER*4 v
7+
use const_def, only: dp
8+
IMPLICIT real(dp) (a-h,o-z)
9+
INTEGER(4) v
910
include 'adipls.c.d.incl'
1011
parameter(iwork=10*nnmax)
1112
REAL mass, rad, gconst, oms2, oms

0 commit comments

Comments
 (0)