Changeset 46

Timestamp:

07/28/12 05:17:34 (12 years ago)

Author:

dubos

Message:

Removed duplicate write_field
Solved compilation issues with cpp on Bluefire (use GNU cpp)
Tested : Test case 3 with nbp=20 and interpolation to lat-lon.

Location:

codes/icosagcm/trunk

Files:

• arch/arch-SP6_BLUEFIRE.README (modified) (1 diff)
• arch/arch-SP6_BLUEFIRE.fcm (modified) (2 diffs)
• arch/arch-SP6_BLUEFIRE.path (modified) (1 diff)
• src/timeloop_gcm.f90 (modified) (2 diffs)

codes/icosagcm/trunk/arch/arch-SP6_BLUEFIRE.README

@@ -11 +11 @@
 
 export TERM=xterm
-export PATH=${HOME}/bin:$PATH
+export PATH=${HOME}/bin:/usr/local/bin/:$PATH
 
-# FCM needs GNU make. A workaround is to create ~/bin
-# and symlink /usr/local/gmake to ~/bin/make :
-# ln -s /usr/local/bin/gmake ~/bin/make 
+# NB : The above PATH lets FCM find GNU make and GNU cpp
+# which are in /usr/local/bin. 

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

@@ -5 +5 @@
 %FPP_FLAGS           
 %FPP_DEF             
-%BASE_FFLAGS         -qlanglvl=2003pure -u -qintsize=4 -qrealsize=8 -I$NETCDF/include
+%BASE_FFLAGS         -qlanglvl=2003pure -u -qintsize=4 -qrealsize=8
 %PROD_FFLAGS         -O3
 %DEV_FFLAGS          -p -g -O3 -traceback -fp-stack-check -ftrapuv
@@ -11 +11 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          
-%BASE_LD             -qintsize=4 -qrealsize=8 -L$LIB_NETCDF -lnetcdf -lnetcdff
+%BASE_LD             -qintsize=4 -qrealsize=8
 %MPI_LD
 %OMP_LD

codes/icosagcm/trunk/arch/arch-SP6_BLUEFIRE.path

@@ -1 @@
-NETCDF_LIBDIR="$LIB_NETCDF -lnetcdff"
-NETCDF_INCDIR=$NETCDF
+NETCDF_LIBDIR="-L$LIB_NETCDF -lnetcdff"
+NETCDF_INCDIR="-I$NETCDF/include"
 IOIPSL_INCDIR=$LMDGCM/../../lib
 IOIPSL_LIBDIR=$LMDGCM/../../lib

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -102 +102 @@
   CALL etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
   
-  CALL writefield('ps',f_ps)
-  CALL writefield('theta_rhodz',f_theta_rhodz)
-  
   DO it=0,itaumax
     PRINT *,"It No :",It,"   t :",dt*It
@@ -133 +130 @@
     END SELECT
 
-    
-    IF ( itau_out>0 .AND. MOD(it,itau_out)==0) THEN
-      CALL writefield("q",f_q)
-      CALL writefield("ps",f_ps)
-    ENDIF
-
-  ENDDO
+ ENDDO
   
   CONTAINS