Changeset 903

Timestamp:

Mar 13, 2013, 12:55:47 PM (12 years ago)

Author:

aslmd

Message:

LMDZ.GENERIC. Corrected a small bug in bilinearbig. Added support for ciclad in makegcm_ifort. Raised the value for capcal in case soil turned off.

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/bilinearbig.F90 (modified) (2 diffs)
• libf/phystd/physiq.F90 (modified) (1 diff)
• makegcm_ifort (modified) (1 diff)

trunk/LMDZ.GENERIC/README

@@ -912 +912 @@
   mass loss of tracer in the dynamics)
   
-
+== 13/03/2013 == AS + EM
+- corrected a bug in bilinearbig (found with debug mode)
+  not harmful but possible -1 index at first call

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

@@ -22 +22 @@
       y=y_in
 
-
    !! AS: important to optimize here because the array is quite large
    !! ... and actually calculations only need to be done once
-   !! --> Case 1 : we have not calculated yet
+   !! IF ind=-9999 we have not calculated yet
    if ( ind == -9999) then
       !1st check we're within the wavenumber range
       if ((x.lt.x_arr(2)).or.(x.gt.x_arr(nX-2))) then
-         f=0.0D+0
          ind=-1
       else
@@ -41 +39 @@
         end do
       endif
-   !! --> case 2 : we already saw we are out of wavenumber range
-   else if ( ind == -1) then 
+   endif
+
+   !! Either we already saw we are out of wavenumber range
+   !! ... and we just have to set f=0 and exit
+   if ( ind == -1) then 
       f=0.0D+0
       return
-   !! --> case 3 : we already determined a -- so we just proceed
+   !! Or we already determined ind -- so we just proceed
    else
       x1=x_arr(ind)

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

@@ -519 +519 @@
          else
             print*,'WARNING! Thermal conduction in the soil turned off'
-            capcal(:)=1.e6
+            capcal(:)=1.e16 !1.e6
             fluxgrd(:)=0.
             if(noradsurf)then

trunk/LMDZ.GENERIC/makegcm_ifort

@@ -31 +31 @@
     setenv NCDFLIB /usr/local/lib
     setenv NCDFINC /usr/local/include
+else if ( `hostname` == ciclad1.ipsl.jussieu.fr ) then
+    echo "CICLAD cluster"
+    setenv NCDFLIB /opt/netcdf/ifort/lib
+    setenv NCDFINC /opt/netcdf/ifort/include
 else
    # NetCDF, on LMD farm: