Changeset 3179 for trunk/LMDZ.MARS/libf

Timestamp:

Jan 18, 2024, 5:23:14 PM (11 months ago)

Author:

jbclement

Message:

Mars PCM:
Improvement of the error message for tracers initialization with a 1D start file + update of "start1D.txt" in the deftank + small cleanings.
JBC

Location:

trunk/LMDZ.MARS/libf/phymars/dyn1d

Files:

• init_testphys1d_mod.F90 (modified) (5 diffs)
• testphys1d.F90 (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/dyn1d/init_testphys1d_mod.F90

@@ -406 +406 @@
         read(3,*) header, (qsurf(1,iq,j), j = 1,size(qsurf,3)), (q(1,ilayer,iq), ilayer = 1,nlayer)
         if (trim(tname(iq)) /= trim(header)) then
-            write(*,*) 'Tracer names not compatible for initialization with "'//trim(start1Dname)//'"!'
+            write(*,*) 'Tracer names between "traceur.def" and "'//trim(start1Dname)//'" do not match!'
+            write(*,*) 'Please, write the tracer names in the same order for both files.'
             error stop
         endif
@@ -498 +499 @@
 ! Initialize winds for first time step
 if (.not. therestart1D) then
-    u(:) = gru
-    v(:) = grv
+    u = gru
+    v = grv
 else
     read(3,*) header, (u(ilayer), ilayer = 1,nlayer)
@@ -542 +543 @@
 call init_vertical_layers(nlayer,preff,scaleheight,ap,bp,aps,bps,presnivs,pseudoalt)
 
-plev(:) = ap(:) + psurf*bp(:)
-play(:) = aps(:) + psurf*bps(:)
-zlay(:) = -200.*r*log(play(:)/plev(1))/g
+plev = ap + psurf*bp
+play = aps + psurf*bps
+zlay = -200.*r*log(play/plev(1))/g
 
 ! Initialize temperature profile
@@ -552 +553 @@
 ! Altitude in km in profile: divide zlay by 1000
 tmp1(0) = 0.
-tmp1(1:) = zlay(:)/1000.
+tmp1(1:) = zlay/1000.
 
 call profile(nlayer + 1,tmp1,tmp2)
@@ -609 +610 @@
 ! Initialize soil content
 ! -----------------
-if (.not. therestartfi) qsoil(:,:,:,:) = 0.
+if (.not. therestartfi) qsoil = 0.
 
 ! Initialize depths

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F90

@@ -187 +187 @@
     ! Compute geopotential
     ! ~~~~~~~~~~~~~~~~~~~~
-    s(:) = (aps(:)/psurf + bps(:))**rcp
-    h(:) = cpp*temp(:)/(pks*s(:))
+    s = (aps/psurf + bps)**rcp
+    h = cpp*temp/(pks*s)
 
     phi(1) = pks*h(1)*(1. - s(1))
@@ -203 +203 @@
         ! If atmospheric water is monitored
             if (atm_wat_tau < 0.) then ! Prescribed atm_wat_profile: wet if >0, dry if =0
-                q(1,:,igcm_h2o_vap) = min(zqsat(:),atm_wat_profile*g/psurf)
+                q(1,:,igcm_h2o_vap) = min(zqsat,atm_wat_profile*g/psurf)
                 q(1,:,igcm_h2o_ice) = 0. ! reset h2o ice
             else ! Relaxation towards the value atm_wat_profile with relaxation time atm_wat_tau
                 q(1,:,igcm_h2o_vap) = atm_wat_profile*g/psurf + (q(1,:,igcm_h2o_vap) - atm_wat_profile*g/psurf)*dexp(-dttestphys/atm_wat_tau)
-                q(1,:,igcm_h2o_vap) = min(zqsat(:),q(1,:,igcm_h2o_vap))
+                q(1,:,igcm_h2o_vap) = min(zqsat,q(1,:,igcm_h2o_vap))
                 q(1,:,igcm_h2o_ice) = 0. ! reset h2o ice
             endif
@@ -240 +240 @@
     ! For some tests: No coriolis force at equator
     !if (latitude(1) == 0.) then
-    du(:) = du(:) + (gru - u(:))/1.e4
-    dv(:) = dv(:) + (grv - v(:))/1.e4
+    du = du + (gru - u)/1.e4
+    dv = dv + (grv - v)/1.e4
     !endif
 
@@ -262 +262 @@
     ! -----------------------------------
     psurf = psurf + dttestphys*dpsurf(1) ! surface pressure change
-    plev(:) = ap(:) + psurf*bp(:)
-    play(:) = aps(:) + psurf*bps(:)
+    plev = ap + psurf*bp
+    play = aps + psurf*bps
 
     ! Increment tracers