Changeset 2980 for trunk/LMDZ.COMMON/libf/evolution/read_data_GCM.F90

Timestamp:

Jun 12, 2023, 4:38:28 PM (21 months ago)

Author:

romain.vande

Message:

Mars PEM :

Adapt PEM to 1d runs.
Cleaning of names and unused variables.
Correct minor errors.
Adapt and correct reshape_xios_output utilitary for 1d diagfi output.

RV

File:

• trunk/LMDZ.COMMON/libf/evolution/read_data_GCM.F90 (modified) (10 diffs)

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

@@ -1 @@
-!
-! $Id $
-!
 SUBROUTINE read_data_GCM(fichnom,timelen, iim_input,jjm_input,ngrid,nslope,vmr_co2_gcm_phys,ps_timeseries, & 
              min_co2_ice,min_h2o_ice,tsurf_ave,tsoil_ave,tsurf_gcm,tsoil_gcm,q_co2,q_h2o,co2_ice_slope, &
@@ -28 +25 @@
   CHARACTER(LEN=*), INTENT(IN) :: fichnom          !--- FILE NAME
   INTEGER, INTENT(IN) :: timelen                   ! number of times stored in the file
-  INTEGER :: iim_input,jjm_input,ngrid,nslope            ! number of points in the lat x lon dynamical grid, number of subgrid slopes
+  INTEGER :: iim_input,jjm_input,ngrid,nslope      ! number of points in the lat x lon dynamical grid, number of subgrid slopes
 ! Ouputs
   REAL, INTENT(OUT) ::  min_co2_ice(ngrid,nslope) ! Minimum of co2 ice  per slope of the year [kg/m^2]
@@ -105 +102 @@
      print *, "Downloading data for surface pressure done"
      print *, "nslope=", nslope
+
+if(nslope.gt.1) then
+
      print *, "Downloading data for co2ice_slope ..."
-
-if(nslope.gt.1) then
 
 DO islope=1,nslope
@@ -178 +176 @@
     call get_var3("tsurf", tsurf_gcm_dyn(:,:,1,:))
 #ifndef CPP_STD
-    call get_var3("watercap", watercap_slope(:,:,1,:))
+!    call get_var3("watercap", watercap_slope(:,:,1,:))
+  watercap_slope(:,:,1,:)=1.
 #endif
 
@@ -198 +197 @@
     tsurf_ave_dyn(:,:,:)=SUM(tsurf_gcm_dyn(:,:,:,:),4)/timelen
 
+#ifndef CPP_1D
   DO islope = 1,nslope
     DO t=1,timelen
@@ -203 +203 @@
     ENDDO
   ENDDO
+#endif
 
   if(soil_pem) then
@@ -213 +214 @@
 ! By definition, a density is positive, we get rid of the negative values
   DO i=1,iim+1
-    DO j = 1, jjm+1
+    DO j = 1, jjm_input+1
        DO islope=1,nslope
           if (min_co2_ice_dyn(i,j,islope).LT.0) then
@@ -226 +227 @@
 
   DO i=1,iim+1
-    DO j = 1, jjm+1
+    DO j = 1, jjm_input+1
       DO t = 1, timelen
          if (q_co2_dyn(i,j,t).LT.0) then
@@ -243 +244 @@
     ENDDO
   ENDDO
+
+#ifndef CPP_1D
 
      CALL gr_dyn_fi(timelen,iim_input+1,jjm_input+1,ngrid,vmr_co2_gcm,vmr_co2_gcm_phys)
@@ -269 +272 @@
      CALL gr_dyn_fi(nslope,iim_input+1,jjm_input+1,ngrid,tsurf_ave_dyn,tsurf_ave)
 
+#else
+
+  vmr_co2_gcm_phys(1,:)=vmr_co2_gcm(1,1,:)
+  ps_timeseries(1,:)=ps_GCM(1,1,:)
+  q_co2(1,:)=q_co2_dyn(1,1,:)
+  q_h2o(1,:)=q_h2o_dyn(1,1,:)
+  min_co2_ice(1,:)=min_co2_ice_dyn(1,1,:)
+  min_h2o_ice(1,:)=min_h2o_ice_dyn(1,1,:)
+  if(soil_pem) then
+    tsoil_ave(1,:,:)=tsoil_ave_dyn(1,1,:,:)
+    tsoil_gcm(1,:,:,:)=tsoil_gcm_dyn(1,1,:,:,:)
+    watersoil_density(1,:,:,:)=watersoil_density_dyn(1,1,:,:,:)
+  endif !soil_pem
+  tsurf_GCM(1,:,:)=tsurf_GCM_dyn(1,1,:,:)
+  co2_ice_slope(1,:,:)=co2_ice_slope_dyn(1,1,:,:)
+  tsurf_ave(1,:)=tsurf_ave_dyn(1,1,:)
+
+#endif
+
   CONTAINS