Changeset 2399 for LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd

Timestamp:

Nov 20, 2015, 5:23:28 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Follow-up from commit 2395: get rid of rlon and rlat, longitude_deg and latitude_deg (from module geometry_mod) should be used instead. Longitudes and latitudes are no longer loaded from startphy.nc but inherited from dynamics (and compatibility with values in startphy.nc is checked). This will change bench results because of roundoffs differences between the two.
EM

Location:

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd

Files:

• etat0phys_netcdf.F90 (modified) (1 diff)
• init_ssrf_m.F90 (modified) (2 diffs)
• limit_netcdf.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/etat0phys_netcdf.F90

@@ -39 +39 @@
   USE conf_dat_m,         ONLY: conf_dat2d
   USE phys_state_var_mod, ONLY: zmea, zstd, zsig, zgam, zthe, zpic, zval, z0m, &
-    rlon, solsw, radsol, t_ancien, wake_deltat, wake_s,  rain_fall, qsol, z0h, &
-    rlat, sollw, rugoro, q_ancien, wake_deltaq, wake_pe, snow_fall, ratqs,w01, &
+          solsw, radsol, t_ancien, wake_deltat, wake_s,  rain_fall, qsol, z0h, &
+          sollw, rugoro, q_ancien, wake_deltaq, wake_pe, snow_fall, ratqs,w01, &
     sig1, ftsol, clwcon, fm_therm, wake_Cstar,  pctsrf,  entr_therm,radpas, f0,&
     zmax0,fevap, rnebcon,falb_dir, wake_fip,    agesno,  detr_therm, pbl_tke,  &

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/init_ssrf_m.F90

@@ -3 +3 @@
 !*******************************************************************************
 
-  USE indice_sol_mod
+  USE indice_sol_mod, ONLY: is_ter, is_oce, is_oce, is_lic, epsfra
   USE dimphy,             ONLY: klon, zmasq
-  USE phys_state_var_mod, ONLY: pctsrf, rlon, rlat
+  USE phys_state_var_mod, ONLY: pctsrf
+  USE geometry_mod, ONLY : longitude_deg, latitude_deg
   USE grid_atob_m,        ONLY: grille_m
   USE ioipsl,             ONLY: flininfo, flinopen, flinget, flinclo
@@ -45 +46 @@
 
 !--- Physical grid points coordinates
-  DO j=2,jjm; rlat((j-2)*iim+2:(j-1)*iim+1)=rlatu(j);    END DO
-  DO j=2,jjm; rlon((j-2)*iim+2:(j-1)*iim+1)=rlonv(1:im); END DO
-  rlat(1) = pi/2.; rlat(klon) = - pi/2.; rlat(:)=rlat(:)/deg2rad
-  rlon(1) = 0.0;   rlon(klon) = 0.0;     rlon(:)=rlon(:)/deg2rad
+  DO j=2,jjm; latitude_deg((j-2)*iim+2:(j-1)*iim+1)=rlatu(j);    END DO
+  DO j=2,jjm; longitude_deg((j-2)*iim+2:(j-1)*iim+1)=rlonv(1:im); END DO
+  latitude_deg(1) = pi/2.; latitude_deg(klon) = - pi/2.
+  latitude_deg(:)=latitude_deg(:)/deg2rad
+  longitude_deg(1) = 0.0;   longitude_deg(klon) = 0.0;
+  longitude_deg(:)=longitude_deg(:)/deg2rad
 
 ! Compute ground geopotential, sub-cells quantities and possibly the mask.

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/limit_netcdf.F90

@@ -22 +22 @@
   USE conf_dat_m,         ONLY: conf_dat2d, conf_dat3d
   USE dimphy,             ONLY: klon, zmasq
-  USE phys_state_var_mod, ONLY: pctsrf, rlon, rlat
-  USE control_mod
+  USE geometry_mod, ONLY: longitude_deg, latitude_deg
+  USE phys_state_var_mod, ONLY: pctsrf
+  USE control_mod, ONLY: anneeref
   USE init_ssrf_m,        ONLY: start_init_subsurf
 
@@ -113 +114 @@
     CALL start_init_orog0(rlonv,rlatu,phis,masque)
     CALL gr_dyn_fi(1,iip1,jjp1,klon,masque,zmasq)          !--- To physical grid
-    ALLOCATE(rlon(klon),rlat(klon),pctsrf(klon,nbsrf))
+    ALLOCATE(pctsrf(klon,nbsrf))
     CALL start_init_subsurf(.FALSE.)
   END IF
@@ -267 +268 @@
   CALL ncerr(NF90_PUT_VAR(nid,id_ALB ,phy_alb(:,:),[1,1],[klon,ndays]),fnam)
   CALL ncerr(NF90_PUT_VAR(nid,id_RUG ,phy_rug(:,:),[1,1],[klon,ndays]),fnam)
-  call nf95_put_var(nid, varid_longitude, rlon)
-  call nf95_put_var(nid, varid_latitude, rlat)
+  call nf95_put_var(nid, varid_longitude, longitude_deg)
+  call nf95_put_var(nid, varid_latitude, latitude_deg)
 
   CALL ncerr(NF90_CLOSE(nid),fnam)