Changeset 3015 for trunk

Timestamp:

Jul 25, 2023, 9:56:32 AM (16 months ago)

Author:

emillour

Message:

Mars PCM:
Code cleanup in diffusion, turn variables from diffusion.h into module
variables in moldiff_red.F90 (turn it into a module in the process).
Also turn moldiffcoeff_red.F and thermosphere.F into modules.
EM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/aeronomars/diffusion.h (deleted)
• libf/aeronomars/moldiff_red.F90 (modified) (28 diffs)
• libf/aeronomars/moldiffcoeff_red.F (modified) (3 diffs)
• libf/aeronomars/thermosphere.F (modified) (3 diffs)
• libf/phymars/physiq_mod.F (modified) (1 diff)

trunk/LMDZ.MARS/changelog.txt

@@ -4132 +4132 @@
 and then broadcast the result to all cores.
 While at it, also turned nltecool.F and nlte_tcool.F into modules.
+
+== 25/07/2023 == EM
+Code cleanup in diffusion, turn variables from diffusion.h into module 
+variables in moldiff_red.F90 (turn it into a module in the process).
+Also turn moldiffcoeff_red.F and thermosphere.F into modules.
+

trunk/LMDZ.MARS/libf/aeronomars/moldiff_red.F90

@@ +1 @@
+MODULE moldiff_red_mod
+
+  real*8,parameter :: Pdiff=15. ! pressure (Pa) below which diffusion is computed
+  real*8,parameter :: tdiffmin=5d0
+  real*8,parameter :: dzres=2d0 ! grid resolution (km) for diffusion
+  
+CONTAINS
+
 subroutine moldiff_red(ngrid,nlayer,nq,pplay,pplev,pt,pdt,pq,pdq,&
                        ptimestep,zzlay,pdteuv,pdtconduc,pdqdiff,&
@@ -7 +15 @@
 use planetwide_mod, only: planetwide_sumval
 USE mod_phys_lmdz_para, only: is_master,bcast
+use moldiffcoeff_red_mod, only: moldiffcoeff_red
 
 implicit none
-
-include "diffusion.h"
 
 ! July 2014 JYC ADD BALISTIC Transport coupling to compute wup for H and H2
@@ -320 +327 @@
 
 ! The number of diffusion layers is variable 
-! and fixed by the resolution (dzres) specified in diffusion.h
+! and fixed by the resolution (dzres) specified as module variable
 ! I fix a minimum  number of layers 40 
 
@@ -397 +404 @@
 !       enddo
 
-! The diffusion is computed above il0 computed from Pdiff in diffusion.h
+! The diffusion is computed above il0 computed from Pdiff
+! (defined above as module variable)
 ! No change below il0
         
@@ -674 +682 @@
        if (i_d.ne.1000) call planetwide_sumval(PhiauxD,PhiEscD)
 
-      return
-      end
+
+end subroutine moldiff_red
 
 !    ********************************************************************
@@ -780 +788 @@
       enddo
 
-      end
+      end subroutine tridagbloc
 
       subroutine tridag(a,b,c,r,u,n)
@@ -802 +810 @@
         u(j)=u(j)-gam(j+1)*u(j+1)
 12    continue
-      return
-      end
+
+      end subroutine tridag
 
 !    ********************************************************************
@@ -841 +849 @@
         B(I)=SUM/A(I,I)
 14    CONTINUE
-      RETURN
-      END
+
+      END SUBROUTINE LUBKSB
 
 !    ********************************************************************
@@ -927 +935 @@
       IF(A(N,N).EQ.0.)A(N,N)=TINY
       ierr =0
-      RETURN
-      END
+
+      END SUBROUTINE LUDCMP
 
         SUBROUTINE TMNEW(T1,DT1,DT2,DT3,T2,dtime,nl,ig)
@@ -948 +956 @@
 
         ENDDO
-        END
+        END SUBROUTINE TMNEW
 
         SUBROUTINE QMNEW(Q1,DQ,Q2,dtime,nl,nq,gc,ig)
@@ -967 +975 @@
         ENDDO
         ENDDO
-        END
+        END SUBROUTINE QMNEW
 
         SUBROUTINE HSCALE(p,hp,nl)
@@ -983 +991 @@
         hp(l)=-log(P(l+1)/P(l-1))
         ENDDO
-        END
+        END SUBROUTINE HSCALE
 
         SUBROUTINE MMOY(massemoy,mmol,qq,gc,nl,nq)
@@ -1000 +1008 @@
         enddo
 
-        END
+        END SUBROUTINE MMOY
 
         SUBROUTINE DMMOY(M,H,DM,nl)
@@ -1014 +1022 @@
         enddo
 
-        END
+        END SUBROUTINE DMMOY
 
         SUBROUTINE ZVERT(P,T,M,Z,nl,ig)
@@ -1045 +1053 @@
         enddo
 
-        END
+        END SUBROUTINE ZVERT
 
         SUBROUTINE RHOTOT(P,T,M,qq,rhoN,rhoK,nl,nq)
@@ -1065 +1073 @@
         enddo
 
-        END
+        END SUBROUTINE RHOTOT
 
         SUBROUTINE UPPER_RESOL(P,T,Z,M,R,Rk,                            &
@@ -1156 +1164 @@
         Praf(nl)=Nraf(nl)*kbolt*Traf(nl)
         Mraf(nl)=1D0/sum(Qraf(nl,:)/dble(mmol(gc(:))))
-        END
+        END SUBROUTINE UPPER_RESOL
 
         SUBROUTINE CORRMASS(qq,qint,FacMass,nl,nq)
@@ -1169 +1177 @@
         enddo
 
-        END     
+        END SUBROUTINE CORRMASS
 
 
@@ -1199 +1207 @@
         D(l)=(1D0-Nk(l,nn)/N(l))/interm
         enddo
-        END
+        END SUBROUTINE DCOEFF
  
         SUBROUTINE HSCALEREAL(nn,Nk,Dz,H,nl,nq)
@@ -1228 +1236 @@
 !       enddo
 
-        END
+        END SUBROUTINE HSCALEREAL
        
         SUBROUTINE VELVERT(nn,T,H,D,Dz,masse,W,nl)
@@ -1259 +1267 @@
 !       enddo
 
-        END
+        END SUBROUTINE VELVERT
 
         SUBROUTINE TIMEDIFF(nn,H,W,TIME,nl)
@@ -1273 +1281 @@
         ENDDO
 
-        END
+        END SUBROUTINE TIMEDIFF
 
 
@@ -1337 +1345 @@
 !       stop
 
-        END
+        END SUBROUTINE DIFFPARAM
 
 
@@ -1373 +1381 @@
 
 
-        END
+        END SUBROUTINE MATCOEFF
 
         SUBROUTINE Checkmass(X,Y,nl,nn)
@@ -1388 +1396 @@
         print*,'no conservation for mass',Xtot,Ytot,nn
         endif
-        END
+        END SUBROUTINE Checkmass
 
         SUBROUTINE Checkmass2(qold,qnew,P,il,nl,nn,nq)
@@ -1410 +1418 @@
         ENDIF
 
-        END
+        END SUBROUTINE Checkmass2
 
         SUBROUTINE GCMGRID_P(Z,P,Q,T,Nk,Rk,qq,qnew,tt,tnew,             &
@@ -1511 +1519 @@
         enddo
 
-        END
+        END SUBROUTINE GCMGRID_P
 
         SUBROUTINE GCMGRID_P2(Z,P,Q,T,Nk,Rk,qq,qnew,tt,tnew             &
@@ -1613 +1621 @@
         enddo
 
-        END
+        END SUBROUTINE GCMGRID_P2
         
+
+END MODULE moldiff_red_mod

trunk/LMDZ.MARS/libf/aeronomars/moldiffcoeff_red.F

@@ +1 @@
+      MODULE moldiffcoeff_red_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+
       subroutine moldiffcoeff_red(dij,indic,gcmind,ncompdiff2)
 
@@ -12 +18 @@
 c
 c=======================================================================
-#include "callkeys.h"
-#include "diffusion.h"
+      include "callkeys.h"
 
 c-----------------------------------------------------------------------
@@ -294 +299 @@
       endif
 
-
-      return   
-      end 
+      end subroutine moldiffcoeff_red
       
+      END MODULE moldiffcoeff_red_mod

trunk/LMDZ.MARS/libf/aeronomars/thermosphere.F

@@ +1 @@
+      MODULE thermosphere_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       subroutine thermosphere(ngrid,nlayer,nq,
      &     pplev,pplay,dist_sol,
@@ -6 +12 @@
      $     PhiEscH,PhiEscH2,PhiEscD)
 
+      use moldiff_red_mod, only: moldiff_red
       use conc_mod, only: rnew, cpnew
       USE comcstfi_h, only: r, cpp
@@ -82 +89 @@
       endif
 
-      end
+      end subroutine thermosphere
 
+      END MODULE thermosphere_mod
 

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -26 +26 @@
       use nltecool_mod, only: nltecool
       use nlte_tcool_mod, only: nlte_tcool
+      use thermosphere_mod, only: thermosphere
       use tracer_mod, only: noms, mmol, igcm_co2, igcm_n2, igcm_co2_ice,
      &                      igcm_co, igcm_o, igcm_h2o_vap, igcm_h2o_ice,