Skip to content

Commit

Permalink
first release
Browse files Browse the repository at this point in the history
  • Loading branch information
raphidoc committed Jun 28, 2024
1 parent 81ddc7b commit 611d7d7
Show file tree
Hide file tree
Showing 162 changed files with 333 additions and 71 deletions.
Binary file removed 6sV2.1/AATSR.o
Binary file not shown.
Binary file removed 6sV2.1/ABSTRA.o
Binary file not shown.
Binary file removed 6sV2.1/AEROPROF.o
Binary file not shown.
Binary file removed 6sV2.1/AEROSO.o
Binary file not shown.
Binary file removed 6sV2.1/AKTOOL.o
Binary file not shown.
Binary file removed 6sV2.1/ALI.o
Binary file not shown.
Binary file removed 6sV2.1/ASTER.o
Binary file not shown.
Binary file removed 6sV2.1/ATMREF.o
Binary file not shown.
Binary file removed 6sV2.1/AVHRR.o
Binary file not shown.
Binary file removed 6sV2.1/BBM.o
Binary file not shown.
Binary file removed 6sV2.1/BDM.o
Binary file not shown.
Binary file removed 6sV2.1/BRDFGRID.o
Binary file not shown.
Binary file removed 6sV2.1/CAVIS.o
Binary file not shown.
Binary file removed 6sV2.1/CHAND.o
Binary file not shown.
Binary file removed 6sV2.1/CLEARW.o
Binary file not shown.
Binary file removed 6sV2.1/CSALBR.o
Binary file not shown.
Binary file removed 6sV2.1/DICA1.o
Binary file not shown.
Binary file removed 6sV2.1/DICA2.o
Binary file not shown.
Binary file removed 6sV2.1/DICA3.o
Binary file not shown.
Binary file removed 6sV2.1/DISCOM.o
Binary file not shown.
Binary file removed 6sV2.1/DISCRE.o
Binary file not shown.
Binary file removed 6sV2.1/DMC.o
Binary file not shown.
Binary file removed 6sV2.1/DUST.o
Binary file not shown.
Binary file removed 6sV2.1/ENVIRO.o
Binary file not shown.
Binary file removed 6sV2.1/EQUIVWL.o
Binary file not shown.
Binary file removed 6sV2.1/ETM.o
Binary file not shown.
Binary file removed 6sV2.1/GAUSS.o
Binary file not shown.
Binary file removed 6sV2.1/GLI.o
Binary file not shown.
Binary file removed 6sV2.1/GOES.o
Binary file not shown.
Binary file removed 6sV2.1/HAPKALBE.o
Binary file not shown.
Binary file removed 6sV2.1/HAPKBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/HRV.o
Binary file not shown.
Binary file removed 6sV2.1/HYPBLUE.o
Binary file not shown.
Binary file removed 6sV2.1/IAPIALBE.o
Binary file not shown.
Binary file removed 6sV2.1/IAPIBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/IAPITOOLS.o
Binary file not shown.
Binary file removed 6sV2.1/INTERP.o
Binary file not shown.
Binary file removed 6sV2.1/ISO.o
Binary file not shown.
Binary file removed 6sV2.1/KERNEL.o
Binary file not shown.
Binary file removed 6sV2.1/KERNELPOL.o
Binary file not shown.
Binary file removed 6sV2.1/LAKEW.o
Binary file not shown.
Binary file removed 6sV2.1/LDCM.o
Binary file not shown.
Binary file removed 6sV2.1/MAS.o
Binary file not shown.
Binary file removed 6sV2.1/MERIS.o
Binary file not shown.
Binary file removed 6sV2.1/METEO.o
Binary file not shown.
Binary file removed 6sV2.1/METH1.o
Binary file not shown.
Binary file removed 6sV2.1/METH2.o
Binary file not shown.
Binary file removed 6sV2.1/METH3.o
Binary file not shown.
Binary file removed 6sV2.1/METH4.o
Binary file not shown.
Binary file removed 6sV2.1/METH5.o
Binary file not shown.
Binary file removed 6sV2.1/METH6.o
Binary file not shown.
Binary file removed 6sV2.1/MIDSUM.o
Binary file not shown.
Binary file removed 6sV2.1/MIDWIN.o
Binary file not shown.
Binary file removed 6sV2.1/MIE.o
Binary file not shown.
Binary file removed 6sV2.1/MINNALBE.o
Binary file not shown.
Binary file removed 6sV2.1/MINNBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/MOCA1.o
Binary file not shown.
Binary file removed 6sV2.1/MOCA2.o
Binary file not shown.
Binary file removed 6sV2.1/MOCA3.o
Binary file not shown.
Binary file removed 6sV2.1/MOCA4.o
Binary file not shown.
Binary file removed 6sV2.1/MOCA5.o
Binary file not shown.
Binary file removed 6sV2.1/MOCA6.o
Binary file not shown.
Binary file removed 6sV2.1/MODIS.o
Binary file not shown.
Binary file removed 6sV2.1/MODIS1km.o
Binary file not shown.
Binary file removed 6sV2.1/MODISALBE.o
Binary file not shown.
Binary file removed 6sV2.1/MODISBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/MODISBRDFFOS.o
Binary file not shown.
Binary file removed 6sV2.1/MSS.o
Binary file not shown.
21 changes: 10 additions & 11 deletions 6sV2.1/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,24 @@ CFLAGS = -Ae $(EXTRA)
FC = gfortran -std=legacy -ffixed-line-length-none -ffpe-summary=none $(FFLAGS)
CC = cc $(CFLAGS)

OBJECTS0 = AATSR.o ABSTRA.o AEROSO.o AKTOOL.o ATMREF.o AVHRR.o BBM.o BDM.o BRDFGRID.o \
OBJECTS0 = AATSR.o ABSTRA.o AEROPROF.o AEROSO.o AKTOOL.o ALI.o ASTER.o ATMREF.o AVHRR.o BBM.o BDM.o BRDFGRID.o \
CAVIS.o CHAND.o CLEARW.o CSALBR.o DICA1.o DICA2.o DICA3.o DISCOM.o \
DISCRE.o DUST.o ENVIRO.o EQUIVWL.o GAUSS.o GLI.o GOES.o HAPKALBE.o \
DMC.o HAPKBRDF.o HRV.o IAPIALBE.o IAPIBRDF.o IAPITOOLS.o INTERP.o ISO.o \
DISCRE.o DUST.o ENVIRO.o EQUIVWL.o ETM.o GAUSS.o GLI.o GOES.o HAPKALBE.o \
DMC.o HAPKBRDF.o HRV.o HYPBLUE.o IAPIALBE.o IAPIBRDF.o IAPITOOLS.o INTERP.o ISO.o \
KERNEL.o KERNELPOL.o LAKEW.o LDCM.o MAS.o MERIS.o METEO.o METH1.o METH2.o METH3.o METH4.o \
METH5.o METH6.o MIDSUM.o MIDWIN.o MIE.o MINNALBE.o MINNBRDF.o \
MOCA1.o MOCA2.o MOCA3.o MOCA4.o MOCA5.o MOCA6.o MODIS.o MODIS1km.o MSS.o NIOX1.o \
MODISBRDF.o MODISALBE.o MODISBRDFFOS.o \
MOCA1.o MOCA2.o MOCA3.o MOCA4.o MOCA5.o MOCA6.o MODIS.o MODIS1km.o MODISALBE.o MODISBRDF.o MODISBRDFFOS.o \
MSS.o NIOX1.o \
NIOX2.o NIOX3.o NIOX4.o NIOX5.o NIOX6.o OCEA.o OCEAALBE.o OCEABRDF.o OCEABRDFFAST.o\
OCEATOOLS.o ODA550.o ODRAYL.o OS.o OSPOL.o OSSURF.o OXYG3.o OXYG4.o OXYG5.o OXYG6.o \
OZON1.o PLANPOL.o POLDER.o POSGE.o POSGW.o POSLAN.o POSMTO.o POSNOA.o POSSOL.o POSSPO.o \
POLGLIT.o POLNAD.o \
OZON1.o PLANPOL.o POLDER.o POLGLIT.o POLNAD.o POSGE.o POSGW.o POSLAN.o POSMTO.o POSNOA.o POSSOL.o POSSPO.o \
PRESPLANE.o PRESSURE.o PRINT_ERROR.o RAHMALBE.o RAHMBRDF.o RAHMBRDFFOS.o ROUJALBE.o \
ROUJBRDF.o SAND.o SCATRA.o SEAWIFS.o SOLIRR.o SOOT.o SPECINTERP.o SPLIE2.o \
ROSSLIMAIGNANBRDF.o ROSSLIMAIGNANALBE.o ROSSLIMAIGNANBRDFFOS.o\
ROUJBRDF.o ROSSLIMAIGNANBRDF.o ROSSLIMAIGNANALBE.o ROSSLIMAIGNANBRDFFOS.o \
SAND.o SCATRA.o SEAWIFS.o SOLIRR.o SOOT.o SPECINTERP.o SPLIE2.o \
SPLIN2.o SPLINE.o SPLINT.o STM.o SUBSUM.o SUBWIN.o TM.o TROPIC.o \
TRUNCA.o US62.o VARSOL.o VEGETA.o VERSALBE.o VERSBRDF.o VERSTOOLS.o \
TRUNCA.o US62.o VARSOL.o VEGETA.o VERSALBE.o VERSBRDF.o VERSTOOLS.o VGT.o VIIRS.o \
WALTALBE.o WALTBRDF.o WATE.o WAVA1.o WAVA2.o WAVA3.o WAVA4.o WAVA5.o \
WAVA6.o AEROPROF.o ALI.o ASTER.o ETM.o HYPBLUE.o VGT.o VIIRS.o
WAVA6.o

OBJECTS1= main.o

Expand Down
Binary file removed 6sV2.1/NIOX1.o
Binary file not shown.
Binary file removed 6sV2.1/NIOX2.o
Binary file not shown.
Binary file removed 6sV2.1/NIOX3.o
Binary file not shown.
Binary file removed 6sV2.1/NIOX4.o
Binary file not shown.
Binary file removed 6sV2.1/NIOX5.o
Binary file not shown.
Binary file removed 6sV2.1/NIOX6.o
Binary file not shown.
Binary file removed 6sV2.1/OCEA.o
Binary file not shown.
Binary file removed 6sV2.1/OCEAALBE.o
Binary file not shown.
Binary file removed 6sV2.1/OCEABRDF.o
Binary file not shown.
Binary file removed 6sV2.1/OCEABRDFFAST.o
Binary file not shown.
Binary file removed 6sV2.1/OCEATOOLS.o
Binary file not shown.
Binary file removed 6sV2.1/ODA550.o
Binary file not shown.
Binary file removed 6sV2.1/ODRAYL.o
Binary file not shown.
Binary file removed 6sV2.1/OS.o
Binary file not shown.
Binary file removed 6sV2.1/OSPOL.o
Binary file not shown.
Binary file removed 6sV2.1/OSSURF.o
Binary file not shown.
Binary file removed 6sV2.1/OXYG3.o
Binary file not shown.
Binary file removed 6sV2.1/OXYG4.o
Binary file not shown.
Binary file removed 6sV2.1/OXYG5.o
Binary file not shown.
Binary file removed 6sV2.1/OXYG6.o
Binary file not shown.
Binary file removed 6sV2.1/OZON1.o
Binary file not shown.
Binary file removed 6sV2.1/PLANPOL.o
Binary file not shown.
Binary file removed 6sV2.1/POLDER.o
Binary file not shown.
Binary file removed 6sV2.1/POLGLIT.o
Binary file not shown.
Binary file removed 6sV2.1/POLNAD.o
Binary file not shown.
Binary file removed 6sV2.1/POSGE.o
Binary file not shown.
Binary file removed 6sV2.1/POSGW.o
Binary file not shown.
Binary file removed 6sV2.1/POSLAN.o
Binary file not shown.
Binary file removed 6sV2.1/POSMTO.o
Binary file not shown.
Binary file removed 6sV2.1/POSNOA.o
Binary file not shown.
Binary file removed 6sV2.1/POSSOL.o
Binary file not shown.
Binary file removed 6sV2.1/POSSPO.o
Binary file not shown.
Binary file removed 6sV2.1/PRESPLANE.o
Binary file not shown.
Binary file removed 6sV2.1/PRESSURE.o
Binary file not shown.
Binary file removed 6sV2.1/PRINT_ERROR.o
Binary file not shown.
Binary file removed 6sV2.1/RAHMALBE.o
Binary file not shown.
Binary file removed 6sV2.1/RAHMBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/RAHMBRDFFOS.o
Binary file not shown.
Binary file removed 6sV2.1/ROSSLIMAIGNANALBE.o
Binary file not shown.
Binary file removed 6sV2.1/ROSSLIMAIGNANBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/ROSSLIMAIGNANBRDFFOS.o
Binary file not shown.
Binary file removed 6sV2.1/ROUJALBE.o
Binary file not shown.
Binary file removed 6sV2.1/ROUJBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/SAND.o
Binary file not shown.
Binary file removed 6sV2.1/SCATRA.o
Binary file not shown.
Binary file removed 6sV2.1/SEAWIFS.o
Binary file not shown.
Binary file removed 6sV2.1/SOLIRR.o
Binary file not shown.
Binary file removed 6sV2.1/SOOT.o
Binary file not shown.
Binary file removed 6sV2.1/SPECINTERP.o
Binary file not shown.
Binary file removed 6sV2.1/SPLIE2.o
Binary file not shown.
Binary file removed 6sV2.1/SPLIN2.o
Binary file not shown.
Binary file removed 6sV2.1/SPLINE.o
Binary file not shown.
Binary file removed 6sV2.1/SPLINT.o
Binary file not shown.
Binary file removed 6sV2.1/STM.o
Binary file not shown.
Binary file removed 6sV2.1/SUBSUM.o
Binary file not shown.
Binary file removed 6sV2.1/SUBWIN.o
Binary file not shown.
Binary file removed 6sV2.1/TM.o
Binary file not shown.
Binary file removed 6sV2.1/TROPIC.o
Binary file not shown.
Binary file removed 6sV2.1/TRUNCA.o
Binary file not shown.
Binary file removed 6sV2.1/US62.o
Binary file not shown.
Binary file removed 6sV2.1/VARSOL.o
Binary file not shown.
Binary file removed 6sV2.1/VEGETA.o
Binary file not shown.
Binary file removed 6sV2.1/VERSALBE.o
Binary file not shown.
Binary file removed 6sV2.1/VERSBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/VERSTOOLS.o
Binary file not shown.
Binary file removed 6sV2.1/VGT.o
Binary file not shown.
Binary file removed 6sV2.1/VIIRS.o
Binary file not shown.
Binary file removed 6sV2.1/WALTALBE.o
Binary file not shown.
Binary file removed 6sV2.1/WALTBRDF.o
Binary file not shown.
Binary file removed 6sV2.1/WATE.o
Binary file not shown.
Binary file removed 6sV2.1/WAVA1.o
Binary file not shown.
Binary file removed 6sV2.1/WAVA2.o
Binary file not shown.
Binary file removed 6sV2.1/WAVA3.o
Binary file not shown.
Binary file removed 6sV2.1/WAVA4.o
Binary file not shown.
Binary file removed 6sV2.1/WAVA5.o
Binary file not shown.
Binary file removed 6sV2.1/WAVA6.o
Binary file not shown.
Binary file removed 6sV2.1/main.o
Binary file not shown.
Binary file removed 6sV2.1/mainlutaero.o
Binary file not shown.
Binary file removed 6sV2.1/sixsV2.1
Binary file not shown.
Binary file removed 6sV2.1/sixsV2.1-lutaero
Binary file not shown.
154 changes: 151 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# CMake build scripts for 6SV
#
# Created 10/07/2014 by Pete Bunting ([email protected])
#
# Modified 2024-05-27 by Raphael Mabit ([email protected])
# - Support 6sV2.1
###############################################################################

###############################################################################
Expand Down Expand Up @@ -59,7 +60,154 @@ endif (Fortran_COMPILER_NAME MATCHES "gfortran.*")


# BUILD EXE
add_executable(sixs ./src/main.f ./src/AATSR.f ./src/ABSTRA.f ./src/AEROPROF.f ./src/AEROSO.f ./src/AKTOOL.f ./src/ALI.f ./src/ASTER.f ./src/ATMREF.f ./src/AVHRR.f ./src/BBM.f ./src/BDM.f ./src/BRDFGRID.f ./src/CHAND.f ./src/CLEARW.f ./src/CSALBR.f ./src/DICA1.f ./src/DICA2.f ./src/DICA3.f ./src/DISCOM.f ./src/DISCRE.f ./src/DUST.f ./src/ENVIRO.f ./src/EQUIVWL.f ./src/ETM.f ./src/GAUSS.f ./src/GLI.f ./src/GOES.f ./src/HAPKALBE.f ./src/HAPKBRDF.f ./src/HRV.f ./src/HYPBLUE.f ./src/IAPIALBE.f ./src/IAPIBRDF.f ./src/IAPITOOLS.f ./src/INTERP.f ./src/ISO.f ./src/KERNEL.f ./src/KERNELPOL.f ./src/LAKEW.f ./src/MAS.f ./src/MERIS.f ./src/METEO.f ./src/METH1.f ./src/METH2.f ./src/METH3.f ./src/METH4.f ./src/METH5.f ./src/METH6.f ./src/MIDSUM.f ./src/MIDWIN.f ./src/MIE.f ./src/MINNALBE.f ./src/MINNBRDF.f ./src/MOCA1.f ./src/MOCA2.f ./src/MOCA3.f ./src/MOCA4.f ./src/MOCA5.f ./src/MOCA6.f ./src/MODIS.f ./src/MODISALBE.f ./src/MODISBRDF.f ./src/MSS.f ./src/NIOX1.f ./src/NIOX2.f ./src/NIOX3.f ./src/NIOX4.f ./src/NIOX5.f ./src/NIOX6.f ./src/OCEA.f ./src/OCEAALBE.f ./src/OCEABRDF.f ./src/OCEABRDFFAST.f ./src/OCEATOOLS.f ./src/ODA550.f ./src/ODRAYL.f ./src/OS.f ./src/OSPOL.f ./src/OXYG3.f ./src/OXYG4.f ./src/OXYG5.f ./src/OXYG6.f ./src/OZON1.f ./src/PLANPOL.f ./src/POLDER.f ./src/POLGLIT.f ./src/POLNAD.f ./src/POSGE.f ./src/POSGW.f ./src/POSLAN.f ./src/POSMTO.f ./src/POSNOA.f ./src/POSSOL.f ./src/POSSPO.f ./src/PRESPLANE.f ./src/PRESSURE.f ./src/PRINT_ERROR.f ./src/RAHMALBE.f ./src/RAHMBRDF.f ./src/ROUJALBE.f ./src/ROUJBRDF.f ./src/SAND.f ./src/SCATRA.f ./src/SEAWIFS.f ./src/SOLIRR.f ./src/SOOT.f ./src/SPECINTERP.f ./src/SPLIE2.f ./src/SPLIN2.f ./src/SPLINE.f ./src/SPLINT.f ./src/STM.f ./src/SUBSUM.f ./src/SUBWIN.f ./src/TM.f ./src/TROPIC.f ./src/TRUNCA.f ./src/US62.f ./src/VARSOL.f ./src/VEGETA.f ./src/VERSALBE.f ./src/VERSBRDF.f ./src/VERSTOOLS.f ./src/VGT.f ./src/VIIRS.f ./src/WALTALBE.f ./src/WALTBRDF.f ./src/WATE.f ./src/WAVA1.f ./src/WAVA2.f ./src/WAVA3.f ./src/WAVA4.f ./src/WAVA5.f ./src/WAVA6.f)
add_executable(
sixs
./6sV2.1/main.f
./6sV2.1/AATSR.f
./6sV2.1/ABSTRA.f
./6sV2.1/AEROPROF.f
./6sV2.1/AEROSO.f
./6sV2.1/AKTOOL.f
./6sV2.1/ALI.f
./6sV2.1/ASTER.f
./6sV2.1/ATMREF.f
./6sV2.1/AVHRR.f
./6sV2.1/BBM.f
./6sV2.1/BDM.f
./6sV2.1/BRDFGRID.f
./6sV2.1/CAVIS.f # This is new in 6SV 2.1
./6sV2.1/CHAND.f
./6sV2.1/CLEARW.f
./6sV2.1/CSALBR.f
./6sV2.1/DICA1.f
./6sV2.1/DICA2.f
./6sV2.1/DICA3.f
./6sV2.1/DISCOM.f
./6sV2.1/DISCRE.f
./6sV2.1/DUST.f
./6sV2.1/ENVIRO.f
./6sV2.1/EQUIVWL.f
./6sV2.1/ETM.f
./6sV2.1/GAUSS.f
./6sV2.1/GLI.f
./6sV2.1/GOES.f
./6sV2.1/HAPKALBE.f
./6sV2.1/DMC.f
./6sV2.1/HAPKBRDF.f
./6sV2.1/HRV.f
./6sV2.1/HYPBLUE.f
./6sV2.1/IAPIALBE.f
./6sV2.1/IAPIBRDF.f
./6sV2.1/IAPITOOLS.f
./6sV2.1/INTERP.f
./6sV2.1/ISO.f
./6sV2.1/KERNEL.f
./6sV2.1/KERNELPOL.f
./6sV2.1/LAKEW.f
./6sV2.1/LDCM.f
./6sV2.1/MAS.f
./6sV2.1/MERIS.f
./6sV2.1/METEO.f
./6sV2.1/METH1.f
./6sV2.1/METH2.f
./6sV2.1/METH3.f
./6sV2.1/METH4.f
./6sV2.1/METH5.f
./6sV2.1/METH6.f
./6sV2.1/MIDSUM.f
./6sV2.1/MIDWIN.f
./6sV2.1/MIE.f
./6sV2.1/MINNALBE.f
./6sV2.1/MINNBRDF.f
./6sV2.1/MOCA1.f
./6sV2.1/MOCA2.f
./6sV2.1/MOCA3.f
./6sV2.1/MOCA4.f
./6sV2.1/MOCA5.f
./6sV2.1/MOCA6.f
./6sV2.1/MODIS.f
./6sV2.1/MODIS1km.f
./6sV2.1/MODISALBE.f
./6sV2.1/MODISBRDF.f
./6sV2.1/MODISBRDFFOS.f
./6sV2.1/MSS.f
./6sV2.1/NIOX1.f
./6sV2.1/NIOX2.f
./6sV2.1/NIOX3.f
./6sV2.1/NIOX4.f
./6sV2.1/NIOX5.f
./6sV2.1/NIOX6.f
./6sV2.1/OCEA.f
./6sV2.1/OCEAALBE.f
./6sV2.1/OCEABRDF.f
./6sV2.1/OCEABRDFFAST.f
./6sV2.1/OCEATOOLS.f
./6sV2.1/ODA550.f
./6sV2.1/ODRAYL.f
./6sV2.1/OS.f
./6sV2.1/OSPOL.f
./6sV2.1/OSSURF.f
./6sV2.1/OXYG3.f
./6sV2.1/OXYG4.f
./6sV2.1/OXYG5.f
./6sV2.1/OXYG6.f
./6sV2.1/OZON1.f
./6sV2.1/PLANPOL.f
./6sV2.1/POLDER.f
./6sV2.1/POLGLIT.f
./6sV2.1/POLNAD.f
./6sV2.1/POSGE.f
./6sV2.1/POSGW.f
./6sV2.1/POSLAN.f
./6sV2.1/POSMTO.f
./6sV2.1/POSNOA.f
./6sV2.1/POSSOL.f
./6sV2.1/POSSPO.f
./6sV2.1/PRESPLANE.f
./6sV2.1/PRESSURE.f
./6sV2.1/PRINT_ERROR.f
./6sV2.1/RAHMALBE.f
./6sV2.1/RAHMBRDF.f
./6sV2.1/RAHMBRDFFOS.f
./6sV2.1/ROUJALBE.f
./6sV2.1/ROUJBRDF.f
./6sV2.1/ROSSLIMAIGNANBRDF.f
./6sV2.1/ROSSLIMAIGNANALBE.f
./6sV2.1/ROSSLIMAIGNANBRDFFOS.f
./6sV2.1/SAND.f
./6sV2.1/SCATRA.f
./6sV2.1/SEAWIFS.f
./6sV2.1/SOLIRR.f
./6sV2.1/SOOT.f
./6sV2.1/SPECINTERP.f
./6sV2.1/SPLIE2.f
./6sV2.1/SPLIN2.f
./6sV2.1/SPLINE.f
./6sV2.1/SPLINT.f
./6sV2.1/STM.f
./6sV2.1/SUBSUM.f
./6sV2.1/SUBWIN.f
./6sV2.1/TM.f
./6sV2.1/TROPIC.f
./6sV2.1/TRUNCA.f
./6sV2.1/US62.f
./6sV2.1/VARSOL.f
./6sV2.1/VEGETA.f
./6sV2.1/VERSALBE.f
./6sV2.1/VERSBRDF.f
./6sV2.1/VERSTOOLS.f
./6sV2.1/VGT.f
./6sV2.1/VIIRS.f
./6sV2.1/WALTALBE.f
./6sV2.1/WALTBRDF.f
./6sV2.1/WATE.f
./6sV2.1/WAVA1.f
./6sV2.1/WAVA2.f
./6sV2.1/WAVA3.f
./6sV2.1/WAVA4.f
./6sV2.1/WAVA5.f
./6sV2.1/WAVA6.f
)

# INSTALL
install (TARGETS sixs DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install (TARGETS sixs DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2024 Raphaël Mabit

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
The 6S code but with JSON output for easier parsing.

# Packaging reminder

## PyPi
Build the package with the following command:

```bash
Expand All @@ -12,4 +14,23 @@ Check it's content in the archive and then upload it to PyPi with the following

```bash
twine upload -r pypi dist/*
```

## Conda
Build the package with the following command:

```bash
conda build .
```

convert it to other platforms with the following command:

```bash
conda convert --platform all <path_to_package> -o ~/output
```

upload it to the conda channel with the following command:

```bash
anaconda upload <path_to_package>
```
17 changes: 17 additions & 0 deletions bld.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
set FFLAGS="-ffpe-summary=none"

set PATH=%PATH:C:\Program Files\Git\usr\bin;=%

:: Configure.
cmake -G "MSYS Makefiles" -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% %SRC_DIR%
if errorlevel 1 exit 1

:: Build.
make
if errorlevel 1 exit 1

:: Install.
make install
if errorlevel 1 exit 1

%PYTHON% -m pip install .
15 changes: 6 additions & 9 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#!/bin/bash

# Navigate to the Fortran code directory
cd 6sV2.1
export FFLAGS=$(echo "${FFLAGS}" | sed "s/-fopenmp//g")

# Use the Makefile to compile the Fortran code
make
cmake ${CMAKE_ARGS} -D CMAKE_INSTALL_PREFIX=$PREFIX $SRC_DIR

## Navigate back to the root directory
#cd ..
#
## Build the Python package
#python -m build
make -j${CPU_COUNT}
make install

$PYTHON -m pip install .
1 change: 0 additions & 1 deletion make.bash

This file was deleted.

28 changes: 24 additions & 4 deletions meta.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,43 @@
package:
name: sixs_json
version: 0.1.4.1
version: 0.1.4.62

source:
path: .

requirements:
build:
- {{ compiler('fortran') }}
- cmake
- make
- {{ compiler('fortran') }} # [unix]
- {{ compiler('m2w64_fortran') }} # [win]
- {{ compiler('c') }} # [unix]
- {{ compiler('cxx') }} # [unix]
- {{ compiler('m2w64_c') }} # [win]
- posix # [win]
host:
- python
- setuptools
- wheel
- pip
run:
- m2w64-gcc-libgfortran # [win]
- python

test:
imports:
- sixs_json
commands:
- pip check
requires:
- pip
files:
- test_params.txt

about:
home: https://github.com/raphidoc/sixs_json
license: GPL
summary: 'The 6S atmospheric radiative transfer model modified with JSON output and a python wrapper'
license: MIT
summary: 'The 6S atmospheric radiative transfer model modified with JSON output'

extra:
recipe-maintainers:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "sixs_json"
version = "0.1.4.1"
version = "0.1.4.62"
description = "The 6S atmospheric radiative transfer model modified with JSON output and a python wrapper"
readme = "README.md"
license = { text = "GPL" }
Expand Down
1 change: 1 addition & 0 deletions run_test.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sixs < test_params.txt
1 change: 1 addition & 0 deletions run_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sixs < test_params.txt
Loading

0 comments on commit 611d7d7

Please sign in to comment.