Changeset 2299 for LMDZ5/trunk/libf/phylmd

Timestamp:

Jun 15, 2015, 8:48:31 PM (10 years ago)

Author:

dcugnet

Message:

In dyn3d/:
etat0dyn_netcdf.F90: "startget_dyn3d" syntax slightly simplified.
dynredem.F90: Shortcut routines (put_var*, cre_var,
dynredem_write_*, dynredem_read_u)

modified to match dyn3dmem version and put in

module dyredem_mod.F90.
dynetat0.F90 -> *.f90: Few simplifications (no usage of NC_DOUBLE
needed => no precompilation)

Add tracers initialization in the isotope case

suppressed by accident.
dynredem_mod.F90: Created to mimic dyn3dmem equivalent.

In dyn3dmem/:
dynetat0_loc.F -> *.f90: Converted into fortran 90 to match the dyn3d
version.
dynredem_loc.F -> *.F90: Converted into fortran 90.
dynredem_mod.F90: Add some shortcut routines to match the dyn3d
version.

In phylmd/:
phyredem.F90: Bug fix: nsw instead of nsoilmx was used as
Tsoil second maximum index.

Bug fix: fevap instead of snow was saved for

"SNOW".
etat0phys_netcdf.F90: "filtreg_mod" module usage suppressed.

Local variable rugo computation removed (not

used).

In dynlonlat_phylonlat/:
grid_atob_m.F90 -> *.f90 DOUBLE PRECISION variables usage removed.

Precompilation o longer needed => .F90 extension.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• etat0phys_netcdf.F90 (modified) (4 diffs)
• phyredem.F90 (modified) (5 diffs)

LMDZ5/trunk/libf/phylmd/etat0phys_netcdf.F90

@@ -62 +62 @@
   REAL, SAVE :: deg2rad
   REAL, SAVE, ALLOCATABLE :: tsol(:)
-  REAL, SAVE, ALLOCATABLE :: rugo(:,:)  ! ??? COMPUTED BUT NOT USED ???
+!  REAL, SAVE, ALLOCATABLE :: rugo(:,:)  ! ??? COMPUTED BUT NOT USED ???
   INTEGER,            SAVE      :: iml_phys, jml_phys, llm_phys, ttm_phys, fid_phys
   REAL, ALLOCATABLE,  SAVE      :: lon_phys(:,:), lat_phys(:,:), levphys_ini(:)
@@ -86 +86 @@
   USE fonte_neige_mod
   USE pbl_surface_mod
-  USE filtreg_mod
   USE regr_lat_time_climoz_m, ONLY: regr_lat_time_climoz
   USE indice_sol_mod
@@ -335 +334 @@
 !===============================================================================
   USE conf_dat_m,  ONLY: conf_dat2d
-  USE grid_atob_m, ONLY: rugsoro
+!  USE grid_atob_m, ONLY: rugsoro
   USE grid_noro_m, ONLY: grid_noro
   IMPLICIT NONE
@@ -393 +392 @@
 
 !--- COMPUTE SURFACE ROUGHNESS
-  WRITE(lunout,*)
-  WRITE(lunout,*)'*** Compute surface roughness induced by the orography ***'
-  ALLOCATE(tmp_var(iml-1,jml))
-  CALL rugsoro(lon_rad, lat_rad, relief_hi, lon_in(1:iml-1), lat_in, tmp_var)
-  ALLOCATE(rugo(iml,jml)); rugo(1:iml-1,:)=tmp_var; rugo(iml,:)=tmp_var(1,:)
-  DEALLOCATE(relief_hi,tmp_var,lon_rad,lat_rad)
+!  WRITE(lunout,*)
+!  WRITE(lunout,*)'*** Compute surface roughness induced by the orography ***'
+!  ALLOCATE(tmp_var(iml-1,jml))
+!  CALL rugsoro(lon_rad, lat_rad, relief_hi, lon_in(1:iml-1), lat_in, tmp_var)
+!  ALLOCATE(rugo(iml,jml)); rugo(1:iml-1,:)=tmp_var; rugo(iml,:)=tmp_var(1,:)
+!  DEALLOCATE(tmp_var)
+  DEALLOCATE(relief_hi,lon_rad,lat_rad)
 
 !--- PUT QUANTITIES TO PHYSICAL GRID

LMDZ5/trunk/libf/phylmd/phyredem.F90

@@ -132 +132 @@
     PRINT*, "Trop de sous-surfaces"; CALL abort_gcm("phyredem", "", 1)
   END IF
+  IF(nsw>99) THEN
+    PRINT*, "Trop de bandes"; CALL abort_gcm("phyredem", "", 1)
+  END IF
 
   CALL put_field_srf1("TS","Temperature",ftsol(:,:))
@@ -149 +152 @@
   CALL put_field_srf1("EVAP", "Evaporation", fevap(:,:))
 
-  CALL put_field_srf1("SNOW", "Neige", fevap(:,:))
+  CALL put_field_srf1("SNOW", "Neige", snow(:,:))
 
   CALL put_field("RADS", "Rayonnement net a la surface", radsol)
@@ -302 +305 @@
   REAL,              INTENT(IN) :: field(:,:)
   CHARACTER(LEN=256) :: nm, lm, str
-  DO nsrf = 1, nbsrf
+  DO nsrf = 1, SIZE(field,2)
     WRITE(str, '(i2.2)') nsrf
     nm=TRIM(nam)//TRIM(str)
@@ -318 +321 @@
   REAL,              INTENT(IN) :: field(:,:,:)
   CHARACTER(LEN=256) :: nm, lm, str
-  DO nsrf = 1, nbsrf
-    DO isoil=1, nsw
+  DO nsrf = 1, SIZE(field,3)
+    DO isoil=1, SIZE(field,2)
       WRITE(str, '(i2.2,"srf",i2.2)')isoil,nsrf
 !      WRITE(lunout,*)"PHYREDEM ",TRIM(nam)//TRIM(str)
@@ -337 +340 @@
   REAL,              INTENT(IN) :: field(:,:,:)
   CHARACTER(LEN=256) :: nm, lm, str
-  DO nsrf = 1, nbsrf
+  DO nsrf = 1, SIZE(field,3)
     WRITE(str, '(i2.2)') nsrf
     nm=TRIM(nam)//TRIM(str)