Changeset 2919

Timestamp:

Mar 22, 2023, 5:37:37 PM (21 months ago)

Author:

llange

Message:

PCM
Flux_geo is now correctled initialized (wasnot correctly read in the startfi) for the 3D and 1D
Minor fix in the pem (wrong name for a variable)
LL

Location:

trunk

Files:

• LMDZ.COMMON/libf/evolution/pem.F90 (modified) (1 diff)
• LMDZ.MARS/libf/phymars/comsoil_h.F90 (modified) (2 diffs)
• LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F (modified) (4 diffs)
• LMDZ.MARS/libf/phymars/phyetat0_mod.F90 (modified) (1 diff)
• LMDZ.MARS/libf/phymars/soil.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/soil_settings.F (modified) (1 diff)

trunk/LMDZ.COMMON/libf/evolution/pem.F90

@@ -858 +858 @@
 
       if (co2glaciersflow) then
-       call co2glaciers_evol(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,vmr_co2_pem_phys,ps_phys_timeseries,&
+       call co2glaciers_evol(timelen,ngrid,nslope,iflat,subslope_dist,def_slope_mean,vmr_co2_pem_phys,ps_timeseries,&
                          global_ave_press_GCM,global_ave_press_new,co2ice_slope,flag_co2flow,flag_co2flow_mesh)
       endif

trunk/LMDZ.MARS/libf/phymars/comsoil_h.F90

@@ -25 +25 @@
   real,save,allocatable :: beta(:,:,:)        ! beta_k coefficients
   real,save :: mu
-  real,save,allocatable :: flux_geo(:)       ! Geothermal Flux (W/m^2)
+  real,save,allocatable :: flux_geo(:,:)       ! Geothermal Flux (W/m^2)
 
 !$OMP THREADPRIVATE(tsoil,mthermdiff,thermdiff,coefq,coefd,alph,beta,mu,flux_geo)
@@ -48 +48 @@
     allocate(alph(ngrid,nsoilmx-1,nslope))
     allocate(beta(ngrid,nsoilmx-1,nslope))
-    allocate(flux_geo(ngrid))
+    allocate(flux_geo(ngrid,nslope))
  
   end subroutine ini_comsoil_h

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -6 +6 @@
       use mod_grid_phy_lmdz, only : regular_lonlat
       use infotrac, only: nqtot, tname, nqperes,nqfils
-      use comsoil_h, only: volcapa, layer, mlayer, inertiedat, nsoilmx
+      use comsoil_h, only: volcapa, layer, mlayer, inertiedat, nsoilmx,flux_geo
       use comgeomfi_h, only: sinlat, ini_fillgeom
       use surfdat_h, only: albedodat, z0_default, emissiv, emisice,
@@ -144 +144 @@
       logical :: present
 
+c   LL: Subsurface geothermal flux
+      real :: flux_geo_tmp
 c=======================================================================
 
@@ -626 +628 @@
 
 
+
 ! Initialize soil properties and temperature
 ! ------------------------------------------
@@ -634 +637 @@
       ENDDO
 
+      call getin("flux_geo",flux_geo_tmp)
+      flux_geo(:,:) = flux_geo_tmp
+
+
+
+
+flux_geo
 ! Initialize depths
 ! -----------------

trunk/LMDZ.MARS/libf/phymars/phyetat0_mod.F90

@@ -732 +732 @@
   call soil_settings(nid_start,ngrid,nsoil,tsurf,tsoil,indextime)
 else
-    flux_geo(:) = 0.
+    flux_geo(:,:) = 0.
 endif ! of if (startphy_file)
 

trunk/LMDZ.MARS/libf/phymars/soil.F

@@ -161 +161 @@
         beta(ig,nsoil-1,islope)=coefq(nsoil-1)*tsoil(ig,nsoil,islope)
      &      /(coefq(nsoil-1)+coefd(ig,nsoil-1,islope))
-     &      +flux_geo(ig)/(coefq(nsoil-1) + coefd(ig,nsoil-1,islope))
+     &      +flux_geo(ig,islope)/
+     &      (coefq(nsoil-1) + coefd(ig,nsoil-1,islope))
       enddo
    

trunk/LMDZ.MARS/libf/phymars/soil_settings.F

@@ -454 +454 @@
            write(*,*) "soil_settings: Failed loading <flux_geo>"
            write(*,*) "soil_settings: Will put  <flux_geo> to 0."
-           flux_geo(:) = 0.
+           flux_geo(:,:) = 0.
       endif