Changeset 58 for trunk

Timestamp:

02/11/09 12:35:02 (15 years ago)

Author:

pinsard

Message:

fortran portability

Location:

trunk/src

Files:

• SIMULS_IRCAAM/prepare_olr_filtre_simulation.m (modified) (3 diffs)
• SIMULS_IRCAAM/progfiltrage_simulation.F90 (moved) (moved from trunk/src/SIMULS_IRCAAM/progfiltrage_simulation.f) (3 diffs)
• makefile (modified) (4 diffs)

trunk/src/SIMULS_IRCAAM/prepare_olr_filtre_simulation.m

@@ -54 +54 @@
 % $Id$
 %
+% - fplod 2009-02-10T15:54:57Z aedon.locean-ipsl.upmc.fr (Darwin)
+%
+%   * force output to be written using IEEE floating point 32 bits
+%
 % - fplod 2009-02-04T09:40:31Z aedon.locean-ipsl.upmc.fr (Darwin)
-%   * force output to be written using EEE floating point with little-endian byte 
-%     order
+%
+%   * force output to be written using IEEE floating point with little-endian 
+%     byte order
+%
 % - fplod 2009-02-02T13:45:57Z aedon.locean-ipsl.upmc.fr (Darwin)
 %
@@ -73 +79 @@
 global IRCAAM_OD;
 
-% force output to be written using EEE floating point with little-endian byte 
+% force output to be written using IEEE floating point with little-endian byte 
 % order
 machineformat='l' 
@@ -149 +155 @@
 fid=fopen(fullfilename,'w',machineformat);
 clear fullfilename;
-fwrite(fid,olr,'float');
+fwrite(fid,olr,'float32');
 fclose(fid);

trunk/src/SIMULS_IRCAAM/progfiltrage_simulation.F90

@@ -79 +79 @@
 C $Id$
 C
+C - fplod 2009-02-11T11:28:01Z aedon.locean-ipsl.upmc.fr (Darwin)
+C
+C   * bug fix for getenv using Nag compiler
+C
 C - fplod 2009-02-10T13:57:29Z aedon.locean-ipsl.upmc.fr (Darwin)
 C
@@ -99 +103 @@
 C-
 C
+#ifdef NAGf90Fortran
+      USE F90_UNIX_ENV
+#endif
+
       IMPLICIT NONE
 
@@ -164 +172 @@
 
       CALL GETENV('IRCAAM_ID',ircaam_id)
-C++      ircaam_id='/usr/temp/fplod/ircaam_d/'
       CALL GETENV('IRCAAM_OD',ircaam_od)
-C++      ircaam_od='/usr/temp/fplod/ircaam_d/'
 
       WRITE(fullfilename,'(A,A,A,A,A,A)')

trunk/src/makefile

@@ -15 +15 @@
 # EVOLUTIONS
 # ==========
+#
+# - fplod 2009-02-11T11:16:11Z aedon.locean-ipsl.upmc.fr (Darwin)
+#
+#   * main source renamed from .f to .F90
+#   * add gfortran
+#   * improve nag and g95 options
 #
 # - fplod 2009-02-05T15:22:33Z aedon.locean-ipsl.upmc.fr (Darwin)
@@ -41 +47 @@
 LD=g95
 
-FFLAGS=-g -O -fbounds-check \
+FFLAGS=-g -O -ffixed-form -fbounds-check \
 -Wimplicit-none -Wall \
 -Wextra -Wunused -Wuninitialized -Wprecision-loss \
@@ -65 +71 @@
 #FC=ifort
 #LD=ifort
-#FFLAGS=-g -inline_debug_info -fixed -stand f90 \
+#FFLAGS=-g -O0 -inline_debug_info -fixed -stand f90 \
 #-fpe:0 -ftz- -check all -warn all \
 #-convert little_endian
+#LDOPTS=-g -O0
 
 # 32 bits -fpe:0 -ftz-  -fpstkchk -check all -warn all \
+
+# !! -fconvert in gfortran only works for main program
+#FC=gfortran
+#LD=gfortran
+#FFLAGS=-g -ffixed-form -fbounds-check 
+#-std=f95 -fall-intrinsics -pedantic-errors -Wall \
+#-ffpe-trap=invalid,zero,overflow,underflow,precision,denormal \
+#-frange-check \
+#-fconvert=little-endian
+#LDOPTS=-g
 
 LDFLAGS=$(LDOPTS)
@@ -93 +110 @@
 
 progfiltrage_simulation.o: \
-$(DIRSRC)/SIMULS_IRCAAM/progfiltrage_simulation.f
+$(DIRSRC)/SIMULS_IRCAAM/progfiltrage_simulation.F90
         @$(FC) -c $(FFLAGS) -o $@ \
-        $(DIRSRC)/SIMULS_IRCAAM/progfiltrage_simulation.f
+        $(DIRSRC)/SIMULS_IRCAAM/progfiltrage_simulation.F90
 
 forfilter.o: \