Merge branch 'master' of github.com:cpinte/mcfost

src/Makefile

@@ -162,8 +162,13 @@ ifeq ($(RELEASE), yes)
     FFLAGS += $(ARCH)
     CCFLAGS += $(ARCH)
 else
-    FFLAGS += -march=native
-    CCFLAGS += -march=native
+    ifeq ($(SYSTEM), gfortran)
+	FFLAGS += -march=native
+        CCFLAGS += -march=native
+    else
+	FFLAGS += -xHOST #-march=native
+        CCFLAGS += -xHOST #-march=native
+    endif
 endif
 
 ifeq ($(DEBUG), yes)
@@ -175,13 +180,13 @@ ifeq ($(PROFILING), yes)
     FFLAGS+= -g3
 endif
 
-
 ifeq ($(DEV), yes)
     FFLAGS:= $(FFLAGS:-O3=-O1)
 endif
 
 ifeq ($(OPENMP), yes)
     FFLAGS+= ${FOMPFLAGS}
+    CCLAGS+= ${FOMPFLAGS}
 endif
 
 ifeq ($(IPO), yes)

src/spherical_grid.f90

@@ -206,7 +206,7 @@ subroutine cross_spherical_cell(x0,y0,z0, u,v,w,  cell, previous_cell, x1,y1,z1,
     ! et ne pas etre pile-poil dessus
     correct_moins = 1.0_dp - prec_grille_sph
     correct_plus = 1.0_dp + prec_grille_sph
-    precision = 1.0e-20_dp ! pour g95
+    precision = 1.0e-15_dp ! pour g95
 
     uv = sqrt(u*u + v*v)
     ! end     ! Todo : can be calculated outside

test_suite/get_test_data.sh

@@ -1,3 +1,5 @@
-wget -nv https://ipag.osug.fr/~pintec/mcfost/test_data_b17a7fd4bce16a7c2befe713f6dd91773c057740.tar.gz
+wget -nv https://ipag.osug.fr/~pintec/mcfost/test_data_0c484a1a905c13bea4c3bc0494ba288daddbe779.tgz
 rm -rf test_data
-tar xzf test_data_b17a7fd4bce16a7c2befe713f6dd91773c057740.tar.gz
+tar xzf test_data_0c484a1a905c13bea4c3bc0494ba288daddbe779.tgz
+
+#test_data_b17a7fd4bce16a7c2befe713f6dd91773c057740.tar.gz

test_suite/test_mcfost.py

@@ -13,7 +13,7 @@
 
 # If running on CI, only test ref3.0
 if os.environ.get('CI', None) == 'true':
-    model_list = ["ref3.0","discF_00500"]#["ref3.0","ref3.0_multi","debris"]
+    model_list = ["ref3.0","debris","discF_00500"]
 
 wl_list = ["1.0","10","100","1000"]
 wl_list_pola = ["1.0","1000"]