Changeset 3331 for LMDZ5/branches/IPSLCM5A2.1_ISO/libf/dyn3dmem

Timestamp:

May 22, 2018, 4:30:21 PM (7 years ago)

Author:

acozic

Message:

Add modification for isotopes

Location:

LMDZ5/branches/IPSLCM5A2.1_ISO/libf/dyn3dmem

Files:

• check_isotopes_loc.F (modified) (3 diffs)
• dynetat0_loc.f90 (modified) (3 diffs)

LMDZ5/branches/IPSLCM5A2.1_ISO/libf/dyn3dmem/check_isotopes_loc.F

@@ -12 +12 @@
 
         ! locals
-        integer ixt,phase,k,i,iq,iiso,izone,ieau,iqeau
+        integer ixt,phase,k,i,iq,iiso,izone,ieau,iqeau,ixt2,iq2
         real xtractot,xiiso
         real borne
@@ -24 +24 @@
         parameter (errmaxrel=1e-3)
         parameter (qmin=1e-11)
-        parameter (deltaDmax=200.0,deltaDmin=-999.9)
+        parameter (deltaDmax=1000.0,deltaDmin=-999.0)
         parameter (ridicule=1e-12)
         real deltaD
+        real dexcessmax,dexcessmin
+        parameter (dexcessmax=6000.0,dexcessmin=-100.0)
 
         if (ok_isotopes) then
@@ -134 +136 @@
           enddo ! do phase=1,nqo 
         endif !if (use_iso(2)) then
+
+        !write(*,*) 'check_isotopes 103'
+        ! verifier que dexcess est raisonable
+        if (use_iso(3).and.use_iso(2)) then
+          ixt=indnum_fn_num(3)
+          ixt2=indnum_fn_num(2)
+          do phase=1,nqo
+            iq=iqiso(ixt,phase)
+            iq2=iqiso(ixt2,phase)
+c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+            do k=1,llm
+            DO i = ijb,ije
+            if (q(i,k,iq).gt.qmin) then
+             deltaD=(q(i,k,iq2)/q(i,k,phase)/tnat(2)-1)*1000
+     &            -8.0*(q(i,k,iq)/q(i,k,phase)/tnat(3)-1)*1000
+             if ((deltaD.gt.dexcessmax).or.(deltaD.lt.dexcessmin)) then
+                  write(*,*) 'erreur detectee iso_verif_aberrant O18:'
+                  write(*,*) err_msg
+                  write(*,*) 'ixt,ixt2,phase=',ixt,ixt2,phase
+                  write(*,*) 'q,iq,i,k,=',q(i,k,phase),iq,i,k
+                  write(*,*) 'xt=',q(i,k,:)
+                  write(*,*) 'dexcess=',deltaD
+                  stop
+             endif !if ((deltaD.gt.deltaDmax).or.(deltaD.lt.deltaDmin)) then
+            endif !if (q(i,k,iq).gt.qmin) then
+            enddo !DO i = ijb,ije
+            enddo !do k=1,llm
+c$OMP END DO NOWAIT
+          enddo ! do phase=1,nqo 
+        endif !if (use_iso(2)) then
+
 
 

LMDZ5/branches/IPSLCM5A2.1_ISO/libf/dyn3dmem/dynetat0_loc.f90

@@ -153 +153 @@
   DO iq=1,nqtot
     var=tname(iq)
-#ifdef INCA
-    IF (var .eq. "O3" ) THEN 
-       IF(NF90_INQ_VARID(fID,var,vID) == NF90_NoErr) THEN
-          CALL get_var2(var,q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:); CYCLE
-       ELSE
-          WRITE(lunout,*) 'Tracer O3 is missing - it is initialized to OX'
-          IF(NF90_INQ_VARID(fID,"OX",vID) == NF90_NoErr) THEN
-             CALL get_var2("OX",q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:); CYCLE
-          ENDIF
-       ENDIF
-    ENDIF
-#endif
     IF(NF90_INQ_VARID(fID,var,vID)==NF90_NoErr) THEN
       CALL get_var2(var,q_glo); q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:); CYCLE
@@ -171 +159 @@
     WRITE(lunout,*)"         It is hence initialized to zero"
     q(ijb_u:ije_u,:,iq)=0.
+  END DO !DO iq=1,nqtot
+
    !--- CRisi: for isotops, theoretical initialization using very simplified
-   !           Rayleigh distillation las.
+   !           Rayleigh distillation.
+  DO iq=1,nqtot     
+    if (ok_iso_verif) then
+       write(*,*) 'dynetat0_loc 167: iq,iso_num(iq),iqpere(iq)=',iq,iso_num(iq),iqpere(iq)
+    endif
     IF(ok_isotopes.AND.iso_num(iq)>0) THEN
       IF(zone_num(iq)==0) q(:,:,iq)=q(:,:,iqpere(iq))*tnat(iso_num(iq))        &
@@ -178 +172 @@
       IF(zone_num(iq)==1) q(:,:,iq)=q(:,:,iqiso(iso_indnum(iq),phase_num(iq)))
     END IF
-  END DO
+  END DO !DO iq=1,nqtot
+
+  if (ok_iso_verif) then
+         call check_isotopes(q,ijb_u,ije_u,'dynetat0_loc 171')
+  endif !if (ok_iso_verif) then
+
   DEALLOCATE(q_glo)
   CALL err(NF90_CLOSE(fID),"close",fichnom)