Changeset 44 for codes

Timestamp:

07/28/12 02:23:44 (12 years ago)

Author:

dubos

Message:

Small fixes to enable compilation on MacOSX
Introduced key CPP_NETCDF4 (netcdf_mod.F90) to enable NetCDF4 with sequential version.

Tested : test case 3 with nbp=20 on MacOSX, sequential, gfortran 4.5.4, NetCDF4.2

Location:

codes/icosagcm/trunk

Files:

• arch/arch-X64_OSX.fcm (modified) (1 diff)
• src/caldyn_sw.f90 (modified) (1 diff)
• src/dissip_sw.f90 (modified) (1 diff)
• src/netcdf_mod.F90 (moved) (moved from codes/icosagcm/trunk/src/nectdf_mod.F90) (3 diffs)
• src/transfert_mpi.f90 (modified) (2 diffs)

codes/icosagcm/trunk/arch/arch-X64_OSX.fcm

@@ -4 +4 @@
 %MAKE                gmake
 %FPP_FLAGS           -P -traditional
-%FPP_DEF             NONE
+%FPP_DEF             KEY_NONE CPP_NETCDF4
 %BASE_FFLAGS         -I /opt/local/include -fdefault-real-8
 %PROD_FFLAGS         -O3 

codes/icosagcm/trunk/src/caldyn_sw.f90

@@ -1 +1 @@
 MODULE caldyn_sw_mod
   USE icosa
+  USE transfert_mpi_mod, ONLY : t_request
   PRIVATE
   TYPE(t_field),POINTER,SAVE :: f_Fe(:)

codes/icosagcm/trunk/src/dissip_sw.f90

@@ -1 +1 @@
 MODULE dissip_sw_mod
   USE icosa
-
+  USE transfert_mpi_mod, ONLY : t_request
   TYPE(t_field),POINTER,SAVE :: f_gradrot(:)
   TYPE(t_request),POINTER :: req_dissip(:) 

codes/icosagcm/trunk/src/netcdf_mod.F90

@@ -2 +2 @@
   USE netcdf
 
-!#ifndef CPP_USING_MPI
+#ifndef CPP_NETCDF4
   INTEGER ::  NF90_NETCDF4
   INTEGER ::  NF90_MPIIO
@@ -9 +9 @@
   INTEGER,EXTERNAL :: NF90_CREATE_PAR
   INTEGER,EXTERNAL :: NF90_DEF_VAR_CHUNKING 
-!#endif
+#endif
 
 END MODULE netcdf_mod
 
-!#ifndef CPP_USING_MPI
+#ifndef CPP_NETCDF4
    SUBROUTINE NF90_CREATE_PAR
    END
@@ -19 +19 @@
    SUBROUTINE NF90_DEF_VAR_CHUNKING
    END
-!#endif
-  
+#endif

codes/icosagcm/trunk/src/transfert_mpi.f90

@@ -446 +446 @@
      DO irecv=1,req%nrecv
        ireq=ireq+1
-       CALL MPI_ISEND(req%recv(irecv)%value,req%recv(irecv)%size,MPI_INTEGER,req%recv(irecv)%rank,req%recv(irecv)%domain,comm_icosa, mpi_req(ireq),ierr)
+       CALL MPI_ISEND(req%recv(irecv)%value,req%recv(irecv)%size,MPI_INTEGER,&
+            req%recv(irecv)%rank,req%recv(irecv)%domain,comm_icosa, mpi_req(ireq),ierr)
      ENDDO
      
@@ -452 +453 @@
        ireq=ireq+1
        ALLOCATE(req%send(isend)%value(req%send(isend)%size))
-       CALL MPI_IRECV(req%send(isend)%value,req%send(isend)%size,MPI_INTEGER,req%send(isend)%rank,ind_loc,comm_icosa, mpi_req(ireq),ierr)
+       CALL MPI_IRECV(req%send(isend)%value,req%send(isend)%size,MPI_INTEGER,&
+            req%send(isend)%rank,ind_loc,comm_icosa, mpi_req(ireq),ierr)
      ENDDO
    ENDDO