Changeset 2299 for LMDZ5/trunk/libf/dyn3d/dynetat0.f90

Timestamp:

Jun 15, 2015, 8:48:31 PM (9 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.

File:

• LMDZ5/trunk/libf/dyn3d/dynetat0.f90 (moved) (moved from LMDZ5/trunk/libf/dyn3d/dynetat0.F90) (6 diffs)

LMDZ5/trunk/libf/dyn3d/dynetat0.f90

@@ -109 +109 @@
   CALL get_var2("cv"   ,cv)
   CALL get_var2("aire" ,aire)
-  CALL get_var2("phisinit",phis)
   var="temps"
   IF(NF90_INQ_VARID(fID,var,vID)/=NF90_NoErr) THEN
@@ -117 +116 @@
   END IF
   CALL err(NF90_GET_VAR(fID,vID,time),"get",var)
+  CALL get_var2("phisinit",phis)
   CALL get_var3("ucov",ucov)
   CALL get_var3("vcov",vcov)
@@ -126 +126 @@
   DO iq=1,nqtot
     var=tname(iq)
-    IF(NF90_INQ_VARID(fID,var,vID)/=NF90_NoErr) THEN
-      WRITE(lunout,*)TRIM(modname)//": Tracer <"//TRIM(var)//"> is missing"
-      WRITE(lunout,*)"         It is hence initialized to zero"
-      q(:,:,:,iq)=0.
-    ELSE
-      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var)
+    IF(NF90_INQ_VARID(fID,var,vID)==NF90_NoErr) THEN
+      CALL err(NF90_GET_VAR(fID,vID,q(:,:,:,iq)),"get",var); CYCLE
+    END IF
+    WRITE(lunout,*)TRIM(modname)//": Tracer <"//TRIM(var)//"> is missing"
+    WRITE(lunout,*)"         It is hence initialized to zero"
+    q(:,:,:,iq)=0.
+   !--- CRisi: for isotops, theoretical initialization using very simplified
+   !           Rayleigh distillation las.
+    IF(ok_isotopes.AND.iso_num(iq)>0) THEN
+      IF(zone_num(iq)==0) q(:,:,:,iq)=q(:,:,:,iqpere(iq))*tnat(iso_num(iq))    &
+     &             *(q(:,:,:,iqpere(iq))/30.e-3)**(alpha_ideal(iso_num(iq))-1)
+      IF(zone_num(iq)==1) q(:,:,:,iq)=q(:,:,:,iqiso(iso_indnum(iq),phase_num(iq)))
     END IF
   END DO
@@ -158 +164 @@
 SUBROUTINE get_var1(var,v)
   CHARACTER(LEN=*), INTENT(IN)  :: var
-#ifdef NC_DOUBLE
-  DOUBLE PRECISION, INTENT(OUT) :: v(:)
-#else
   REAL,             INTENT(OUT) :: v(:)
-#endif
   CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
   CALL err(NF90_GET_VAR(fID,vID,v),"get",var)
@@ -170 +172 @@
 SUBROUTINE get_var2(var,v)
   CHARACTER(LEN=*), INTENT(IN)  :: var
-#ifdef NC_DOUBLE
-  DOUBLE PRECISION, INTENT(OUT) :: v(:,:)
-#else
   REAL,             INTENT(OUT) :: v(:,:)
-#endif
   CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
   CALL err(NF90_GET_VAR(fID,vID,v),"get",var)
@@ -182 +180 @@
 SUBROUTINE get_var3(var,v)
   CHARACTER(LEN=*), INTENT(IN)  :: var
-#ifdef NC_DOUBLE
-  DOUBLE PRECISION, INTENT(OUT) :: v(:,:,:)
-#else
   REAL,             INTENT(OUT) :: v(:,:,:)
-#endif
   CALL err(NF90_INQ_VARID(fID,var,vID),"inq",var)
   CALL err(NF90_GET_VAR(fID,vID,v),"get",var)