Changeset 3105 for trunk/LMDZ.GENERIC

Timestamp:

Oct 26, 2023, 8:48:49 AM (13 months ago)

Author:

emillour

Message:

Generic PCM:
Some corrections on the 1D models to keep up with recent code changes:

• rcm1d: "noceanmx" no longer exists; slab size is always 2
• kcm1d: naerkind is now a variable, so aerosol(:,:) needs be allocated.

EM

Location:

trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Files:

• kcm1d.F90 (modified) (2 diffs)
• rcm1d.F (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90

@@ -80 +80 @@
 
   real dTstrat
-  real aerosol(llm,naerkind) ! aerosol tau (kg/kg)
+  real,allocatable :: aerosol(:,:) ! aerosol tau (kg/kg)
   real OLR_nu(1,L_NSPECTI)
   real OSR_nu(1,L_NSPECTV)
@@ -326 +326 @@
   !write(*,*) 1,llm,nq,0,86400.0,1,1.0,latitude,longitude,cell_area,rad,g,r,cpp
 
+  ! initialise naerkind (from callphys.def) and allocate aerosol(:,:)
+  naerkind=0 !default
+  call getin("naerkind",naerkind)
+  allocate(aerosol(llm,naerkind))
+  aerosol(:,:)=0
+
   do iq=1,nq
      do ilay=1,nlayer

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -15 +15 @@
       use phyredem, only: physdem0,physdem1
       use geometry_mod, only: init_geometry
-      use slab_ice_h, only: noceanmx
       use planete_mod, only: apoastr,periastr,year_day,peri_day,
      &         obliquit,nres,z0,lmixmin,emin_turb,coefvis,coefir,
@@ -136 +135 @@
 !     added by BC for ocean
       real rnat(1)
-      REAL tslab(1,noceanmx),tsea_ice(1),sea_ice(1)
+      REAL tslab(1,2),tsea_ice(1),sea_ice(1)
       real pctsrf_sic(1)