From 6b17b7f9344088e1f664dae1c9179ac659cdbdc2 Mon Sep 17 00:00:00 2001 From: Katie Breivik Date: Tue, 5 May 2026 08:49:16 -0400 Subject: [PATCH 1/3] add recurse submodules to Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f4e96871..bec5ebc6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,6 @@ RUN apt-get -y update && apt-get -y install libopenmpi-dev openmpi-bin libhdf5-s RUN ln -s /usr/bin/python3 /usr/bin/python RUN pip install --upgrade pip RUN pip install meson -RUN git clone https://github.com/COSMIC-PopSynth/COSMIC.git /COSMIC +RUN git clone --recurse-submodules https://github.com/COSMIC-PopSynth/COSMIC.git /COSMIC RUN pip3 install /COSMIC CMD ["/usr/bin/cosmic-pop"] From 2aa587f238e5bf7ee2236d52b0c6f7650ab900b7 Mon Sep 17 00:00:00 2001 From: katiebreivik Date: Wed, 27 May 2026 14:58:33 -0400 Subject: [PATCH 2/3] Fix Makefile for debugging to include METISSE restructure --- src/cosmic/src/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/cosmic/src/Makefile b/src/cosmic/src/Makefile index 2275f9709..8a0f3bbdf 100644 --- a/src/cosmic/src/Makefile +++ b/src/cosmic/src/Makefile @@ -3,16 +3,19 @@ CMPLR = gfortran FFLAGS = -g -O0 -Wall -Wextra LFLAGS = const_bse.h zdata.h + .f.o: - $(CMPLR) -c $(FFLAGS) $< + $(CMPLR) -c $(FFLAGS) $< -o $@ + +.SUFFIXES: .f90 +.f90.o: + $(CMPLR) -c $(FFLAGS) $< -o $@ SRC = \ -test_bse.f hrdiag_remnant.f assign_remnant.f corerd.f comenv.f dgcore.f \ -evolv2.f gntage.f instar.f kick.f mix.f mrenv.f ran3.f rl.f \ -concatkstars.f comprad.f bpp_array.f checkstate.f deltat.f \ -mlwind.f hrdiag.f star.f zcnsts.f zfuncs.f +test_bse.f hrdiag_remnant.f assign_remnant.f int64.f corerd.f comenv.f dgcore.f evolv2.f gntage.f instar.f kick.f mix.f mrenv.f ran3.f rl.f hrdiag.f star.f concatkstars.f comprad.f bpp_array.f checkstate.f deltat.f mlwind.f zcnsts.f SSE/SSE_deltat.f SSE/SSE_mlwind.f SSE/SSE_hrdiag.f SSE/SSE_star.f SSE/SSE_zcnsts.f SSE/SSE_zfuncs.f SSE/SSE_gntage.f METISSE/src/track_support.f90 METISSE/src/c_m_interface.f90 METISSE/src/METISSE_gntage.f90 METISSE/src/METISSE_deltat.f90 METISSE/src/METISSE_mlwind.f90 METISSE/src/METISSE_hrdiag.f90 METISSE/src/METISSE_star.f90 METISSE/src/METISSE_zcnsts.f90 METISSE/src/z_support.f90 METISSE/src/sse_support.f90 METISSE/src/remnant_support.f90 METISSE/src/interp_support.f90 METISSE/src/comenv_lambda.f90 METISSE/src/METISSE_miscellaneous.f90 METISSE_utils.f90 -OBJT1 = $(SRC:.f=.o) +OBJT_TMP = $(SRC:.f=.o) +OBJT1 = $(OBJT_TMP:.f90=.o) test: $(OBJT1) $(LFLAGS) $(CMPLR) $(FFLAGS) $(OBJT1) -o test From 8ea1096473faa38701193d6c7242f25019d2941e Mon Sep 17 00:00:00 2001 From: katiebreivik Date: Tue, 9 Jun 2026 09:30:39 -0400 Subject: [PATCH 3/3] fix test_bse for debugging --- src/cosmic/src/test_bse.f | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/cosmic/src/test_bse.f b/src/cosmic/src/test_bse.f index ed03b9c89..983d70cb0 100644 --- a/src/cosmic/src/test_bse.f +++ b/src/cosmic/src/test_bse.f @@ -96,15 +96,15 @@ PROGRAM bse * OPEN(22,file='binary.in', status='old') READ(22,*)mass0(1),mass0(2),tphysf,tb,kstar(1),kstar(2),z,ecc - READ(22,*)neta,bwind,hewind,alpha1,lambdaf,windflag,rtmsflag - READ(22,*)ceflag,tflag,ifflag,wdflag,bhflag,remnantflag,mxns,idum - READ(22,*)pts1,pts2,pts3 + READ(22,*)neta,bwind,hewind,alpha1(1),alpha1(2),lambdaf,windflag + READ(22,*)rtmsflag,ceflag,tflag,ifflag,wdflag,bhflag,remnantflag + READ(22,*)mxns,idum,pts1,pts2,pts3 READ(22,*)sigma,beta,xi,acc2,epsnov,eddfac,gamma,kickflag READ(22,*)pisn,cekickflag,cehestarflag,grflag,bhms_coll_flag READ(22,*)wd_mass_lim,ecsn,ecsn_mlow,aic,ussn,sigmadiv,bhsigmafrac - READ(22,*)don_lim,acc_lim,bdecayfac,bconst,ck,qcflag,eddlimflag - READ(22,*)bhspinflag,bhspinmag,rejuv_fac,rejuvflag,htpmb,st_cr - READ(22,*)st_tide,rembar_massloss,zsun + READ(22,*)don_lim,acc_lim(1),acc_lim(2),bdecayfac,bconst,ck,qcflag + READ(22,*)eddlimflag,bhspinflag,bhspinmag,rejuv_fac,rejuvflag + READ(22,*)htpmb,st_cr,st_tide,rembar_massloss,zsun READ(22,*)natal_kick_array(1,1),natal_kick_array(1,2), &natal_kick_array(1,3),natal_kick_array(1,4),natal_kick_array(1,5) READ(22,*)natal_kick_array(2,1),natal_kick_array(2,2), @@ -122,9 +122,9 @@ PROGRAM bse else WRITE(*,*)mass0(1),mass0(2),tphysf,tb,kstar(1),kstar(2),z,ecc - WRITE(*,*)neta,bwind,hewind,alpha1,lambdaf,windflag,rtmsflag - WRITE(*,*)ceflag,tflag,ifflag,wdflag,bhflag,remnantflag,mxns,idum - WRITE(*,*)pts1,pts2,pts3 + WRITE(*,*)neta,bwind,hewind,alpha1(1),alpha1(2),lambdaf,windflag + WRITE(*,*)rtmsflag,ceflag,tflag,ifflag,wdflag,bhflag,remnantflag + WRITE(*,*)mxns,idum,pts1,pts2,pts3 WRITE(*,*)sigma,beta,xi,acc2,epsnov,eddfac,gamma * * Initialize the parameters. @@ -203,6 +203,8 @@ PROGRAM bse zsun = 0.014 kickflag = -1 using_cmc = 0 + using_SSE = 1 + using_METISSE = 0 endif