Changeset 368 for trunk/LMDZ.GENERIC

Timestamp:

Nov 9, 2011, 4:40:11 PM (13 years ago)

Author:

rwordsworth

Message:

.nc saves in physiq.F90 adapted to new diagfi.def format.
More info added to gases.def warnings.

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• hydrol.F90 (modified) (2 diffs)
• physiq.F90 (modified) (3 diffs)
• radinc_h.F90 (modified) (1 diff)
• su_gases.F90 (modified) (3 diffs)
• sugas_corrk.F90 (modified) (4 diffs)

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

@@ -46 +46 @@
       real albedoocean
       parameter (albedoocean=0.07)
-!      parameter (albedoocean=0.2)
       real albedoice
       save albedoice
@@ -101 +100 @@
 
       oceanbulkavg=.false.
-      activerunoff=.true.
+      activerunoff=.false.
       oceanalbvary=.false.
 

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

@@ -2005 +2005 @@
         call writediagfi(ngrid,"tsurf","Surface temperature","K",2,tsurf)
         call writediagfi(ngrid,"ps","Surface pressure","Pa",2,ps)
-
-        if(1.eq.2)then
         call writediagfi(ngrid,"temp","temperature","K",3,zt)
         call writediagfi(ngrid,"u","Zonal wind","m.s-1",3,zu)
@@ -2012 +2010 @@
         call writediagfi(ngrid,"w","Vertical wind","m.s-1",3,pw)
         call writediagfi(ngrid,'p','Pressure','Pa',3,pplay)
-        endif
 
 !     Total energy balance diagnostics
@@ -2036 +2033 @@
         !call writediagfi(ngrid,"vdifNC","H2O loss vdifc","kg m-2 s-1",2,vdifcncons)
         !call writediagfi(ngrid,"cadjNC","H2O loss convadj","kg m-2 s-1",2,cadjncons)
-        call writediagfi(ngrid,'rnat','Terrain type',' ',2,real(rnat))
+        !call writediagfi(ngrid,'rnat','Terrain type',' ',2,real(rnat))
         !call writediagfi(ngrid,'pphi','Geopotential',' ',3,pphi)
-        !print*,vdifcncons
-        !call abort
 
 !     Output aerosols
-!        call writediagfi(ngridmx,'CO2ice_reff','CO2ice_reff','m',3,reffrad(1,1,1))
-!        call writediagfi(ngridmx,'H2Oice_reff','H2Oice_reff','m',3,reffrad(1,1,2))
-!        call writediagfi(ngridmx,'CO2ice_reffcol','CO2ice_reffcol','um kg m^-2',2,reffcol(1,1))
-!        call writediagfi(ngridmx,'H2Oice_reffcol','H2Oice_reffcol','um kg m^-2',2,reffcol(1,2))
+        call writediagfi(ngridmx,'CO2ice_reff','CO2ice_reff','m',3,reffrad(1,1,1))
+        call writediagfi(ngridmx,'H2Oice_reff','H2Oice_reff','m',3,reffrad(1,1,2))
+        call writediagfi(ngridmx,'CO2ice_reffcol','CO2ice_reffcol','um kg m^-2',2,reffcol(1,1))
+        call writediagfi(ngridmx,'H2Oice_reffcol','H2Oice_reffcol','um kg m^-2',2,reffcol(1,2))
 
 !     Output tracers
        if (tracer) then
         do iq=1,nq
-!          call writediagfi(ngrid,noms(iq),noms(iq),'kg/kg',3,zq(1,1,iq))
+          call writediagfi(ngrid,noms(iq),noms(iq),'kg/kg',3,zq(1,1,iq))
 !          call writediagfi(ngridmx,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf',  & 
 !                          'kg m^-2',2,qsurf(1,iq) )

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

@@ -70 +70 @@
       integer, parameter :: L_NTREF   = 7
       integer, parameter :: L_REFVAR  = 7   ! earth / earlymars
-      ! CO2_H2Ovar / N2OCO2rich_H2Ovar / N2OCO2poor_H2Ovar
+!      ! CO2_H2Ovar / N2OCO2rich_H2Ovar / N2OCO2poor_H2Ovar
 !       integer, parameter :: L_REFVAR = 4    ! N2_CH4
 

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

@@ -34 +34 @@
              write(*,*) "sugases.F90: error, wrong number of gases:"
              write(*,*) "ngas=",ngas," whereas ngasmx=",ngasmx
+             write(*,*) "Check that the values in gases.def and gases.h match..."
              call abort
           endif
@@ -40 +41 @@
              read(90,*,iostat=ierr) gnom(igas)
              if (ierr.ne.0) then
-                write(*,*) 'sugases.F90: error reading gas names...'
+                write(*,*) 'sugases.F90: error reading gas names in gases.def...'
                 call abort
              endif
@@ -49 +50 @@
              read(90,*,iostat=ierr) gfrac(igas)
              if (ierr.ne.0) then
-                write(*,*) 'sugases.F90: error reading gas molar fractions...'
+                write(*,*) 'sugases.F90: error reading gas molar fractions in gases.def...'
                 call abort
              endif

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

@@ -60 +60 @@
          write(*,*)'The file ',file_path(1:LEN_TRIM(file_path))
          write(*,*)'was not found by sugas_corrk.F90, exiting.'
+         write(*,*)'Check that your path to datagcm in datafile.h is correct and that'
+         write(*,*)'the corrkdir you chose in callphys.def exists.'
          call abort
       endif
@@ -108 +110 @@
          print*,'The size of your radiative transfer mixing ratio array does '
          print*,'not match the value given in Q.dat, exiting.'
+         print*,'Check the value of L_NREFVAR in radinc_h.F90.'
          call abort
       endif
@@ -117 +120 @@
          print*,'Gas ',n,' is ',gnom(n)
          if(gnom(n).ne.gastype(n))then
-            print*,'Name of a gas in radiative transfer data (',gastype(n),') does not', &
-                 'match that in gases.def (',gnom(n),'), exiting.'
+            print*,'Name of a gas in radiative transfer data (',gastype(n),') does not ', &
+                 'match that in gases.def (',gnom(n),'), exiting. You should compare ', &
+                 'gases.def with Q.dat in your radiative transfer directory.' 
             call abort
          endif
@@ -143 +147 @@
          write(*,*)'The file ',file_path(1:LEN_TRIM(file_path))
          write(*,*)'was not found by sugas_corrk.F90, exiting.'
+         write(*,*)'Check that your path to datagcm in datafile.h is correct and that'
+         write(*,*)'the corrkdir you chose in callphys.def exists.'
          call abort
       endif