Changeset 848 for trunk/LMDZ.GENERIC

Timestamp:

Nov 18, 2012, 7:35:44 PM (12 years ago)

Author:

aslmd

Message:

LMDZ.GENERIC. Corrected makegcm_ifort to cope with ciclad and gnome specifities. Corrected an out-of-bounds in calc_rayleigh when using too few spectral bands. Also some files have been moved to LMDZ.UNIVERSAL hence are now deleted from LMDZ.GENERIC.

Location:

trunk/LMDZ.GENERIC

Files:

• deftank/gray_lmdz.generic_lmdz5 (deleted)
• libf/phystd/calc_rayleigh.F90 (modified) (1 diff)
• libf/phystd/for_lmdz5 (deleted)
• makegcm_ifort (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/phystd/calc_rayleigh.F90

@@ -144 +144 @@
       end do
 
-      print*,'At 1 atm and lambda = ',WAVEV(L_NSPECTV-6),' um'
-      print*,'tau_R = ',TAURAY(L_NSPECTV-6)*1013.25
-      print*,'sig_R = ',TAURAY(L_NSPECTV-6)*g*mugaz*1.67e-27*100, &
-             'cm^2 molecule^-1'
+      IF (L_NSPECTV > 6) THEN
+        print*,'At 1 atm and lambda = ',WAVEV(L_NSPECTV-6),' um'
+        print*,'tau_R = ',TAURAY(L_NSPECTV-6)*1013.25
+        print*,'sig_R = ',TAURAY(L_NSPECTV-6)*g*mugaz*1.67e-27*100, &
+               'cm^2 molecule^-1'
+      ENDIF
 
     end subroutine calc_rayleigh

trunk/LMDZ.GENERIC/makegcm_ifort

@@ -26 +26 @@
 #setenv LMDGCM "/san/home/rdword/gcm/LMDZ.GENERIC"
 setenv LIBOGCM $LMDGCM/libo
-# NetCDF, what is below is OK on Gnome
-setenv NCDFLIB /usr/local/lib
-setenv NCDFINC /usr/local/include
+## NetCDF, what is below is OK on Gnome
+if ( `hostname` == n201 ) then
+    echo "GNOME cluster"
+    setenv NCDFLIB /usr/local/lib
+    setenv NCDFINC /usr/local/include
+endif
 # NetCDF, on LMD farm:
 #setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_ifort/lib
@@ -183 +186 @@
    set optim90=" -O2 -ip -mkl=sequential -align all -static "
    set optimtru90=" -O2 -ip -mkl=sequential -align all -static "
+   if ( `hostname` == ciclad1.ipsl.jussieu.fr ) then
+       echo "YOU ARE ON CICLAD CLUSTER"
+       set opt_link=" -L$NCDFLIB -lnetcdf"  # this is necessary on ciclad
+   endif
    set mod_loc_dir=$LIBOGCM
    set mod_suffix=mod