Reorganization and move to Fortran95 only

.github/workflows/docker-image.yml

@@ -0,0 +1,22 @@
+name: Publish to CANFAR
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build and Push the SSIM Docker image
+      run:  |
+        docker build --target deploy --build-arg VERSION=python -t ssim:python -f Dockerfile .
+        docker login --username ${{ secrets.IMAGES_CANFAR_LOGIN}} --password ${{ IMAGES_CANFAR_TOKEN}}
+        docker push ssim:python
+    -

.gitignore

@@ -1,13 +1,22 @@
 .idea
 __pycache__
+__version__.py
 build
 OSSOSv11/
 OSSOSv11.tgz
 .DS_Store
 *.log
-*.ipynb
-ossssim.egg-info
-SurveySubsF95.py
+.ipynb_checkpoints
+*.swp
 *.so
+*.o
+*.fpp
+*.mod
 *.icloud
 dist
+Rebound_Archive*.bin
+.python-version
+uv.lock
+bdir
+.vscode
+*.egg-info

Docker/Dockerfile

@@ -0,0 +1,79 @@
+# this builds a container that can be used to run the SurveySimulator (python and fortran)
+# This container is loaded into the canfar Science Portal for use/execution.
+# Can also be used directly with docker.
+FROM condaforge/miniforge3:latest as base
+# FROM jupyter/scipy-notebook as base
+# USER root
+# ENV DEBIAN_FRONTEND="noninteractive"
+RUN apt -y -q update 
+RUN apt -y -q install curl wget man man-db git build-essential zip unzip xdg-utils less emacs nano xterm vim rsync tree gfortran
+RUN apt -y install python3-numpy
+RUN apt -y -q install meson ninja-build
+
+
+
+# SKAHA system settings and permissions
+RUN apt install -y -q sssd libnss-sss libpam-sss
+COPY etc/nofiles.conf /etc/security/limits.d/
+COPY etc/nsswitch.conf /etc/
+## see https://bugzilla.redhat.com/show_bug.cgi?id=1773148
+RUN touch /etc/sudo.conf && echo "Set disable_coredump false" > /etc/sudo.conf
+# generate missing dbus uuid (issue #47)
+RUN dbus-uuidgen --ensure
+
+
+# setup this container for skaha launching
+COPY etc/startup.sh /skaha/startup.sh
+RUN chmod +x /skaha/startup.sh
+
+
+# setup a the needed python environment
+# RUN apt-get update && yes | apt-get install python3.11 pip
+# RUN yes | apt install python3.12-venv
+# RUN python3 -m venv /opt/SSim/venv
+RUN pip install jupyter
+RUN pip install cadctap
+RUN pip install vos
+RUN pip install scipy
+RUN pip install astropy
+RUN pip install astroquery
+RUN pip install matplotlib
+RUN pip install f90wrap
+# RUN pip install git+https://github.com/jameskermode/f90wrap
+RUN pip install rebound
+RUN pip3 install astroplan
+RUN pip install Deprecated
+RUN pip install canfar
+
+
+# Build the SSim
+RUN mkdir -p /opt/SSim/fortran
+COPY fortran /opt/SSim/fortran
+COPY python /opt/SSim/python
+WORKDIR /opt/SSim/fortran/F95
+
+# install Fortran based binary of SSim
+RUN make clean && make Driver GIMEOBJ=ReadModelFromFile
+RUN cp Driver /usr/local/bin/SSim
+# RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections 
+# RUN apt-get install -y ttf-mscorefonts-installer
+
+# install the Python based version of SSim
+FROM base as deploy
+WORKDIR /opt/SSim/python
+# RUN pip install .
+# RUN python setup.py install
+
+# Two build sets, deploy and test
+FROM base as test
+
+RUN mkdir -p /arc/home
+RUN groupadd -g 1001 testuser
+RUN useradd -u 1001 -g 1001 -s /bin/bash -d /arc/home/testuser -m testuser
+RUN chown -R testuser /opt/SSim
+WORKDIR /opt/SSim/python
+# RUN pip3 install -e .
+USER testuser
+WORKDIR /arc/home/testuser
+COPY etc/ReadModelFromFile.in ./
+ENTRYPOINT ["/skaha/startup.sh"]

Makefile → Docker/Makefile

@@ -2,7 +2,7 @@
 REPO = images.canfar.net
 PROJECT = uvickbos
 DEVNAME = ssim
-VERSION = python
+VERSION = 3.0
 
 NAME = $(REPO)/$(PROJECT)/$(DEVNAME)
 
@@ -14,6 +14,7 @@ deploy: production
 
 dev: dependencies Dockerfile
 	docker build --target test --build-arg VERSION=$(VERSION) -t $(NAME):$(VERSION) -f Dockerfile .
+	echo "docker run --rm -it -p 8888:8888 $(NAME):$(VERSION) bash"
 
 dependencies: 
 

fortran/F95/Driver.f95 → F95/Driver.f95

@@ -46,15 +46,16 @@ program Driver
 
   use gimeobjut
   use surveysub
+  use debug
 
   implicit none
 
-  integer, parameter :: n_obj_max = 10000, screen = 6, keybd = 5, verbose = 9
+  integer, parameter :: n_obj_max = 10000, screen = 6, keybd = 5
   integer :: lun_h, lun_t
   type(t_orb_m) :: o_m
 ! color array NEEDS to be length 10 or more!
   real (kind=8) :: h, epoch, m_int, d_ra, d_dec, r, delta, ra, dec, random, &
-       mt, color(10), gb, ph, period, amp, jday_p, m_rand, eff, rn_iter, &
+       mt, color(128), gb, ph, period, amp, jday_p, m_rand, eff, rn_iter, &
        eff_lim, h_rand
   integer :: n_hits, n_track, ierr, seed, flag, isur, ic, n_iter, &
        n_track_max, nchar, values(8), c_idx, i1, i2
@@ -69,6 +70,9 @@ program Driver
   lun_t = 11
   keep_going = .true.
 
+! setup debuging from CL args
+  call debug_init_from_args()
+
 ! Get arguments
 ! Seed for random number generator
   read (5, *, err=9999) seed
@@ -171,6 +175,7 @@ program Driver
 
 !        Determine if the object would be detected
      call Detos1 (o_m, epoch, h, color, gb, ph, period, amp, survey_dir, seed, &
+             debug_on, &
           flag, ra, dec, d_ra, d_dec, r, delta, m_int, m_rand, eff, isur, mt, &
           jday_p, ic, surna, h_rand, ierr)
 

F95/Makefile

@@ -0,0 +1,105 @@
+# Things that are needed fort the CLI (User interface)
+U	= modelutils GiMeObj 
+OBJU	= $(addsuffix .o,${U})
+SRCU	= $(addsuffix .f95,${U})
+FPPU	= $(addsuffix .fpp,${U})
+MODU	= $(addsuffix .mod,${U})
+
+# Things that should end up with python module access
+M   = datadec ioutils surveysub
+OBJM	= $(addsuffix .o,${M})
+SRCM	= $(addsuffix .f95,${M})
+FPPM	= $(addsuffix .fpp,${M})
+MODM	= $(addsuffix .mod,${M})
+F90M    = $(addsuffix .f90,${M})
+F90_WRAP_M    = $(addprefix f90wrap_,${F90M})
+
+# Things that should be in the library
+A   = parameters poly_dec datadec common_data debug poly_lib ioutils elemutils rot effut xvutils numutils getsur surveysub
+OBJA	= $(addsuffix .o,${A})
+SRCA	= $(addsuffix .f95,${A})
+FPPA	= $(addsuffix .fpp,${A})
+MODA	= $(addsuffix .mod,${A})
+
+# SSIM	= SurveySubsF95
+MODULE	?= SurveySubs
+GOBJ	= GiMeObjF95
+
+
+FC	= gfortran
+FPP	= gfortran -E -x f95-cpp-input -fPIC -DPYTHON
+# FPP_F90FLAGS = -x f95-cpp-input -fPIC
+
+
+FFLAGS	= -O3 -fPIC -x f95-cpp-input
+FFLAGP	= -O3
+CFLAGS  = 
+CPPFLAGS = 
+LIBTOOL = ar src
+BUILD_DIR = meson
+KIND_MAP = kind_map
+F2PYFLAGS = --build-dir $(BUILD_DIR) --fcompiler=gfortran
+
+
+.PHONY: all clean
+
+# TOPTARGETS := clean
+# use the GIMEOBJ from the command line or the default value of InnerHotModel
+GIMEOBJ ?= InnerHotModel
+
+# $(TOPTARGETS): $(SSIM)
+
+# .PHONY: $(SUBDIRS) 
+
+# $(SUBDIRS):
+# 	$(MAKE) -C $@ $(MAKECMDGOALS)
+
+all: $(MODULE)
+
+test: 
+	$(MAKE) -s -C tests test LANGUAGE=F95
+
+%.fpp :	%.f95
+	$(FPP) $< -o $@
+
+%.o : %.f95
+	$(FC) $(FFLAGS) -c $<
+
+.PHONY: clean
+
+clean: rmtmp
+	rm -f _$(MODULE)*.so _$(GOBJ)*.so  _$(IOBJ)*.so _$(ROBJ)*.so Driver GiMeObj.f95
+	rm -rf $(BUILD_DIR) libsrc.a
+
+rmtmp:
+	rm -f *~ *.o *.mod *.fpp f90wrap*f90 SimulDetect.dat SimulTrack.dat
+	rm -f $(IOBJ).py $(ROBJ).py $(MODULE).py $(GOBJ).py _$(MODULE)*.so
+	rm -f *.log LOG .f2py_f2cmap
+
+.PHONY: link
+
+link:
+	\rm -f GiMeObj.f95
+	\rm -f GiMeObj.o
+	ln -s $(GIMEOBJ).f95 GiMeObj.f95
+
+Driver: link Driver.f95 $(OBJA) $(OBJU) Makefile GiMeObj.f95
+	$(FC) $(FFLAGP) -o Driver $(OBJA) $(OBJU) Driver.f95
+
+magerr: link magerr.f95 $(OBJU) ${SRCM} Makefile
+	$(FC) $(FFLAGP) -o magerr $(OBJU) ${SRCM} magerr.f95
+	rm GiMeObj.f95
+
+libsrc.a: ${OBJA}
+	${LIBTOOL} $@ $?
+
+Modules: _$(MODULE).so Makefile 
+	echo "Modules have been built"
+
+$(MODULE): Makefile $(FPPM) libsrc.a
+	f90wrap -m $(MODULE) $(FPPM) -k $(KIND_MAP) -v -P > f90wrap.log 2>&1
+	mkdir -p $(BUILD_DIR) 
+	ln -s -f $(CURDIR)/*.mod $(BUILD_DIR)/
+	f2py-f90wrap $(F2PYFLAGS) -c -m _$(MODULE) $(F90_WRAP_M) -lsrc -L$(CURDIR)  > f2py_f90wrap.log 2>&1
+	\rm f90wrap*.f90 *.fpp *.o *.mod .f2py_f2cmap libsrc.a
+	\rm -r $(BUILD_DIR)